Created selector branch

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

340 files changed, 34989 insertions, 5503 deletions

diff --git a/cpp/LICENSE.txt b/cpp/LICENSE.txt
new file mode 100755
index 0000000000..6b0b1270ff
--- /dev/null
+++ b/cpp/LICENSE.txt
@@ -0,0 +1,203 @@
+
+                                 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/cpp/Makefile b/cpp/Makefile
deleted file mode 100644
index dd7551a648..0000000000
--- a/cpp/Makefile
+++ /dev/null
@@ -1,161 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-# 
-# See README for details.
-#
-
-include options.mk
-
-.PHONY: test all all-nogen generate unittest pythontest doxygen build-gentools
-
-test: unittest pythontest
-
-.PHONY: show-vars
-show-vars:
-	@echo APR_LDFLAGS=$(APR_LDFLAGS)
-	@echo APR_CFLAGS=$(APR_CFLAGS)
-	@echo CXXFLAGS=$(CXXFLAGS)
-	@echo LDFLAGS=$(LDFLAGS)
-	@echo CXX=$(CXX)
-
-# Must run two separate make processes to pick up generated files.
-all:
-	$(MAKE) generate
-	$(MAKE) all-nogen
-
-## Generaged code
-
-# Add all XML specs to be generated onto the following line
-SPECS       := $(SPEC_DIR)/amqp-8.0.xml # $(SPEC_DIR)/amqp-0.9.test.xml $(SPEC_DIR)/cluster-0.9.test.xml $(SPEC_DIR)/amqp-0.10.test.xml
-GENERATE    := java -cp $(GENTOOLS_DIR)/src org.apache.qpid.gentools.Main -c -o $(GENDIR)/qpid/framing -t $(GENTOOLS_DIR)/templ.cpp $(SPECS)
-generate: build-gentools $(GENDIR)/timestamp
-
-$(GENDIR)/timestamp: $(wildcard) $(SPECS)
-	@echo "---------- Generating code from $(SPECS) ----------"
-	@rm -rf $(GENDIR)
-	@mkdir -p $(GENDIR)/qpid/framing
-	@$(GENERATE)
-	@touch $(GENDIR)/timestamp
-	@echo "---------- Code generation complete ----------"
-
-#Build the code generator
-build-gentools: $(GENTOOLS_DIR)/src/org/apache/qpid/gentools/Main.class
-
-$(GENTOOLS_DIR)/src/org/apache/qpid/gentools/Main.class:
-	@echo "Gentools not built; building..."
-	@( cd $(GENTOOLS_DIR) && ./build )
-
-# Dependencies for existing generated files.
-GENFILES:=$(wildcard $(GENDIR)/qpid/*/*.cpp $(GENDIR)/qpid/*/*.h)
-ifdef GENFILES
-$(GENFILES): $(GENDIR)/timestamp
-endif
-
-$(BUILDDIRS):
-	mkdir -p $(BUILDDIRS)
-
-## Library rules
-
-LIB_common  := $(call LIBFILE,common,1.0)
-DIRS_common := qpid qpid/framing qpid/sys qpid/$(PLATFORM)
-$(LIB_common): $(call OBJECTS, $(DIRS_common))
-	$(LIB_COMMAND)
-
-LIB_client  := $(call LIBFILE,client,1.0)
-DIRS_client := qpid/client
-$(LIB_client): $(call OBJECTS,$(DIRS_client)) $(LIB_common)
-	$(LIB_COMMAND)
-
-LIB_broker  := $(call LIBFILE,broker,1.0)
-DIRS_broker := qpid/broker
-$(LIB_broker): $(call OBJECTS,$(DIRS_broker)) $(LIB_common)
-	$(LIB_COMMAND)
-
-## Daemon executable
-$(BINDIR)/qpidd: $(OBJDIR)/qpidd.o $(LIB_common) $(LIB_broker)
-	mkdir -p $(dir $@)
-	$(CXX) -o $@ $(CXXFLAGS) $(LDFLAGS) $^ 
-all-nogen: $(BINDIR)/qpidd
-
-## Unit tests.
-UNITTEST_SRC:=$(shell find test/unit -name *Test.cpp)
-UNITTEST_SRC:=$(filter-out test/unit/qpid/$(IGNORE)/%,$(UNITTEST_SRC))
-UNITTESTS:=$(UNITTEST_SRC:test/unit/%.cpp=$(TESTDIR)/%.so)
-
-unittest: all 
-	DllPlugInTester -c -b $(UNITTESTS:.cpp=.so)
-all-nogen: $(UNITTESTS)
-
-## Run python tests
-pythontest: all
-	$(BINDIR)/qpidd > qpidd.log 2>&1 &
-	cd ../python ; ./run-tests -v -I cpp_failing.txt	
-
-## Doxygen documentation.
-doxygen: generate build/html
-build/html: doxygen.cfg 
-	doxygen doxygen.cfg
-	touch $@
-
-## Implicit rules
-
-# C++ compile
-define CPPRULE
-$(OBJDIR)/%.o: $1/%.cpp
-	@mkdir -p $$(dir $$@)
-	$(CXX) $(CXXFLAGS) -c -o $$@ $$< 
-endef
-
-$(foreach dir,$(SRCDIRS),$(eval $(call CPPRULE,$(dir))))
-
-ifndef CPPUNIT_LDFLAGS
-  CPPUNIT_LDFLAGS := -lcppunit
-endif
-
-#  Unit test plugin libraries.
-$(TESTDIR)/%Test.so: test/unit/%Test.cpp $(LIB_common) $(LIB_broker)
-	mkdir -p $(dir $@)
-	$(CXX) -shared -o $@ $< $(CXXFLAGS)  -Itest/include $(LDFLAGS) $(CPPUNIT_LDFLAGS) $(LIB_common) $(LIB_broker)
-
-# Client test programs
-$(TESTDIR)/%: test/client/%.cpp $(LIB_common) $(LIB_client)
-	mkdir -p $(dir $@)
-	$(CXX) -o $@ $(CXXFLAGS) -Itest/include $(LDFLAGS) $^
-CLIENT_TEST_SRC := $(wildcard test/client/*.cpp)
-CLIENT_TEST_EXE := $(CLIENT_TEST_SRC:test/client/%.cpp=$(TESTDIR)/%)
-all-nogen: $(CLIENT_TEST_EXE)
-client: $(CLIENT_TEST_EXE)
-
-## include dependencies
-DEPFILES:=$(wildcard $(OBJDIR)/*.d $(OBJDIR)/*/*.d $(OBJDIR)/*/*/*.d)
-ifdef DEPFILES
--include $(DEPFILES)
-endif
-
-## Clean up
-
-# Just the current build.
-clean:
-	rm -rf build/$(BUILD)
-
-# Clean all builds
-spotless:
-	rm -rf build
-	-rm $(GENTOOLS_DIR)/src/org/apache/qpid/gentools/*.class
-
diff --git a/cpp/Makefile.am b/cpp/Makefile.am
new file mode 100644
index 0000000000..7e3316fce6
--- /dev/null
+++ b/cpp/Makefile.am
@@ -0,0 +1,10 @@
+AUTOMAKE_OPTIONS = 1.9.6 foreign
+ACLOCAL_AMFLAGS = -I m4
+
+EXTRA_DIST = DESIGN LICENSE.txt NOTICE.txt README.rhel3
+
+SUBDIRS = gen lib tests src
+
+# Update libtool, if needed.
+libtool: $(LIBTOOL_DEPS)
+	$(SHELL) ./config.status --recheck
diff --git a/cpp/NOTICE.txt b/cpp/NOTICE.txt
new file mode 100644
index 0000000000..105b88d56a
--- /dev/null
+++ b/cpp/NOTICE.txt
@@ -0,0 +1,21 @@
+=========================================================================
+==  NOTICE file corresponding to the section 4 d of                    ==
+==  the Apache License, Version 2.0,                                   ==
+==  in this case for the Apache Qpid distribution.                     ==
+=========================================================================
+
+This product includes software developed by the Apache Software Foundation
+(http://www.apache.org/).
+
+Please read the LICENSE.txt file present in the root directory of this
+distribution.
+
+
+Aside from contributions to the Apache Qpid project, this software also 
+includes (binary only):
+
+	- None.
+
+
+             
+
diff --git a/cpp/README b/cpp/README
deleted file mode 100644
index 7d394bf511..0000000000
--- a/cpp/README
+++ /dev/null
@@ -1,123 +0,0 @@
-= Developer guide to C++ codebase =
-
-== Prerequisites ==
-
-Required to build:
- * Apache Portable Runtime 1.2.7:  http://apr.apache.org
- * CppUnit 1.11.4: http://cppunit.sourceforge.net
- * boost 1.33.1: http://www.boost.org
-
-Optional: to generate documentation from source code comments you need:
- * doxygen 1.4.6: http://sourceforge.net/projects/doxygen/ 
- * graphviz 2.8: http://www.graphviz.org/
-
-If you use yum to install packages:
-
-# yum install apr apr-devel cppunit cppunit-devel boost boost-devel doxygen graphviz
-
-== Building ==
-
-You can have mutltiple builds in the same working copy. 
-For example for a release build using APR platform:
-
-  make USE_APR=1 RELEASE=1
-
-This will create build/apr-release containing the bin/ lib/ and test/ subdirs.
-
-You can set your preferred defaults in options-local.mk.
-
-Generated code goes in build/gen and is shared between all builds.
-
-All other build output is under build/<build name>/
- * bin/ lib/ - executables and libraries.
- * test/ - test executables, directories with unit test .so plugins.
- * obj/ - compiled .o files.
- * include - exported header files
-
-Main targets:
- * test: (default) build & run all tests
- * all: build all
- * usage: this message
- * unittest: run unit tests
- * pythontest: run python tests.
- * doxygen: generate documentation in build/html
- * clean: cleans the current build only. Does not clean generated code.
- * spotless: cleans up all build output and removes the build directory.
-
-=== Source Tree ===
-
-The source tree is structured as follows:
- * src/ - .h and .cpp source files, directories mirror namespaces.
-  * qpid/
-   * sys/ - system portability abstractions: threading, io etc.
-   * posix/ - posix implementations for sys
-   * apr/ - portable APR implementation for sys
-   * framing - encoding/decoding AMQP messages
-   * client - client classes.
-   * broker - broker classes.
- * etc/ - Non-c++ resources, e.g. stylesheets.
- * test/ 
-  * unit/ - unit tests (cppunit plugins), directories mirror namespaces.
-  * include/ - .h files used by tests
-  * client/ - sources for client test executables.
-
-Build system principles:
- * Single Makefile (see http://www.pcug.org.au/~millerp/rmch/recu-make-cons-harm.html)
- * Calculate sources from directories, no explicit source lists.
- * Corresponding .cpp and .h files in same directory for easy editing.
- * Source directory structure mirrors C++ namespaces.
-
-=== Portability ===
-
-All system calls are abstracted by classes in qpid/sys. This provides
-an object-oriented C++ API and contains platform-specific code.
-
-These wrappers should be mainlly inline by-value classes so they
-impose no run-time penalty compared do direct system calls.
-
-Initially we will have a full POSIX implementation and a portable 
-implementation suffcient for the client using the APR portability
-library. The implementations may change in future but the interface
-for qpid code outside the qpid/sys namespace should remain stable.
-
-
-=== Unit tests ===
-
-Unit tests are built as .so files containing CppUnit plugins. 
-
-DllPlugInTester is provided as part of cppunit. You can use it to run
-any subset of the unit tests. See Makefile for examples.
-
-NOTE: If foobar.so is a test plugin in the current directory then
-surprisingly this will fail with "can't load plugin":
- DllPluginTester foobar.so
-
-Instead you need to say:
- DllPluginTester ./foobar.so 
- 
-Reason: DllPluginTester uses dlopen() which searches for shlibs 
-in the standard places unless the filename contains a "/".  In
-that case it just tries to open the filename.
-
-=== System tests ===
-
-The Python test suite ../python/run_tests is the main set of broker
-system tests.
-
-There are some C++ client test executables built under client/test.
-
-== Doxygen ==
-
-Doxygen generates documentation in several formats from source code
-using special comments. You can use javadoc style comments if you know
-javadoc, if you don't or want to know the fully story on doxygen
-markup see http://www.stack.nl/~dimitri/doxygen/
-
-Even even if the code is completely uncommented, doxygen generates
-UML-esque dependency diagrams that are ''extremely'' useful in navigating
-around the code, especially for newcomers.
-
-To try it out "make doxygen" then open doxygen/html/index.html
-
-
-
diff --git a/cpp/README-dev b/cpp/README-dev
new file mode 100644
index 0000000000..0bad4ec8d5
--- /dev/null
+++ b/cpp/README-dev
@@ -0,0 +1,131 @@
+= Developer guide to C++ codebase =
+
+== Prerequisites ==
+
+As per README-dist plus:
+ * autoconf 2.59: http://www.gnu.org/software/autoconf
+ * automake 1.9.6: http://www.gnu.org/software/automake
+ * libtool 1.5: http://www.gnu.org/software/libtool
+ * CppUnit 1.10.2: http://cppunit.sourceforge.net
+
+Optional: to generate documentation from source code comments you need:
+ * doxygen 1.4.6: http://sourceforge.net/projects/doxygen/
+ * graphviz 2.8: http://www.graphviz.org/
+
+If you use yum to install packages, do the command from the README-dist then:
+
+# yum install apr-devel cppunit-devel boost-devel doxygen graphviz
+
+== Recent changes ==
+
+There have been two major changes on the C++ hierarchy:
+  - adds autoconf, automake, libtool support
+  - makes the hierarchy flatter and renames a few files (e.g., Queue.h,
+  Queue.cpp) that appeared twice, once under client/ and again under broker/.
+
+In the process, I've changed many #include directives, mostly
+to remove a qpid/ or qpid/framing/ prefix from the file name argument.
+Although most changes were to .cpp and .h files under qpid/cpp/, there
+were also several to template files under qpid/gentools, and even one
+to CppGenerator.java.
+
+Nearly all files are moved to a new position in the hierarchy.
+The new hierarchy looks like this:
+
+  src               # this is the new home of qpidd.cpp
+  tests             # all tests are here.  See Makefile.am.
+  gen               # As before, all generated files go here.
+  lib               # This is just a container for the 3 lib dirs:
+  lib/client
+  lib/broker
+  lib/common
+  lib/common/framing
+  lib/common/sys
+  lib/common/sys/posix
+  lib/common/sys/apr
+  build-aux
+  m4
+
+== Building ==
+
+As we smooth off the rough edges with the new build setup the steps
+for the most common development tasks will be scripted and/or
+simplified and this README will be updated accordingly.
+
+Before building a fresh checkout do:
+ ./bootstrap
+
+This generates config, makefiles and the like - check the script for
+details. You only need to do this once, "make" will keep everything up
+to date thereafter (including re-generating configuration & Makefiles
+if the automake templates change etc.)
+
+To build and test everything:
+  make
+  make check
+
+This builds in the source tree. You can have multiple builds in the
+same working copy with different configuration. For example you can do
+the following to build twice, once for debug, the other with
+optimization:
+
+  make distclean
+  mkdir .build-dbg .build-opt
+  (cd .build-opt
+   ../configure --enable-warnings --prefix=/tmp/x && make && make check)
+  (cd .build-dbg
+   ../configure --enable-warnings CXXFLAGS=-g --prefix=/tmp/x \
+     && make && make check)
+
+=== Portability ===
+
+All system calls are abstracted by classes under lib/common/sys. This
+provides an object-oriented C++ API and contains platform-specific
+code.
+
+These wrappers are mainly inline by-value classes so they impose no
+run-time penalty compared do direct system calls.
+
+Initially we will have a full linux implementation and a portable
+implementation sufficient for the client using the APR portability
+library. The implementations may change in future but the interface
+for qpid code outside the qpid/sys namespace should remain stable.
+
+
+=== Unit tests ===
+
+Unit tests are built as .so files containing CppUnit plugins.
+
+DllPlugInTester is provided as part of cppunit. You can use it to run
+any subset of the unit tests. See Makefile for examples.
+
+NOTE: If foobar.so is a test plugin in the current directory then
+surprisingly this will fail with "can't load plugin":
+ DllPluginTester foobar.so
+
+Instead you need to say:
+ DllPluginTester ./foobar.so
+
+Reason: DllPluginTester uses dlopen() which searches for shlibs
+in the standard places unless the filename contains a "/".  In
+that case it just tries to open the filename.
+
+=== System tests ===
+
+The Python test suite ../python/run_tests is the main set of broker
+system tests.
+
+There are some C++ client test executables built under client/test.
+
+== Doxygen ==
+
+Doxygen generates documentation in several formats from source code
+using special comments. You can use javadoc style comments if you know
+javadoc, if you don't or want to know the fully story on doxygen
+markup see http://www.stack.nl/~dimitri/doxygen/
+
+Even even if the code is completely uncommented, doxygen generates
+UML-esque dependency diagrams that are ''extremely'' useful in navigating
+around the code, especially for newcomers.
+
+To try it out "make doxygen" then open doxygen/html/index.html
diff --git a/cpp/README-dist b/cpp/README-dist
new file mode 100644
index 0000000000..133eb7da81
--- /dev/null
+++ b/cpp/README-dist
@@ -0,0 +1,26 @@
+
+This README describes how to build Qpid from a source distribution.
+
+== Prerequisites ==
+
+ * Apache Portable Runtime 1.2.2:  http://apr.apache.org
+ * boost 1.33.1: http://www.boost.org
+
+Optional: if you want to run the qpid unit tests:
+ * CppUnit 1.11.4: http://cppunit.sourceforge.net
+ 
+If you use yum to install packages you can do:
+
+  # yum install apr boost
+
+== Building ==
+
+Build and install with:
+ # ./configure
+ # make all
+ # make install
+
+TODO: add boilerplate README for standard autoconf/automake install.
+TODO: document special qpid configure options.
+ ./bootstrap
+
diff --git a/cpp/README.rhel3 b/cpp/README.rhel3
index 58d1ac765f..7e0c88512c 100644
--- a/cpp/README.rhel3
+++ b/cpp/README.rhel3
@@ -1,22 +1,23 @@
 Building on RHEL3 without access to root (i.e. no yum)
 ======================================================
 
-Install make-3.80 into ~/local/make-3.80
+Install or soft link the following:
 
-Install apr-1.2.7 into ~/local/apr-1.2.7.
+  make-3.80 into ~/local/make-3.80
+  apr-1.2.7 into ~/local/apr-1.2.7.
+  boost-1.33.1 into ~/local/boost-1.33.1
+  cppunit-1.11.4 into ~/local/cppunit-1.11.4
+  JDK 5.0 to ~/local/jdk-1.5
 
-Install boost-1.33.1 into ~/local/boost-1.33.1
-
-Install cppunit-1.11.4 into ~/local/cppunit-1.11.4
-
-Build using the following command:
+Build using the following command (builds release and debug profiles):
 
   $ ./build.rhel3
 
-Generate cppclient tarball:
+Generate cpp-client tarball (includes release and debug libs):
 
-  $ ./release.client.rhel3
+  $ ./release.client.rhel3      # will use the svn revision as release number
 
-or if you want to name the release:
+or if you want to explicitly name the release version:
 
   $ ./release.client.rhel3 1.0-RC1
+
diff --git a/cpp/bootstrap b/cpp/bootstrap
new file mode 100755
index 0000000000..e52b403700
--- /dev/null
+++ b/cpp/bootstrap
@@ -0,0 +1,31 @@
+#!/bin/sh
+set -e
+aclocal -I m4
+autoheader
+libtoolize --automake
+
+# These are needed only if you don't already have the gen/*.{h,cpp} files.
+: ${JAVA=java}
+: ${JAVAC=javac}
+export JAVA JAVAC
+
+# If we're building in the qpid tree, we can generate
+# some Makefile snippets:
+
+if test -d ../gentools && test -d ../specs; then
+  # Transform gen/Makefile.am, removing automake-constructs and the
+  # contents of the sole automake-else clause (the warning), then
+  # use the result to run the rules that create gen-src.mk, a file
+  # that must be created before we run automake.
+  (cd gen && rm -f gen-src.mk
+    perl -ne '/warning:|^(if|else|endif|include)\b/ or print' Makefile.am \
+	| make -f - srcdir=. gen-src.mk > /dev/null )
+fi
+
+# Generate (for automake) lots of repetitive parts of tests/Makefile.am.
+(cd tests && rm -f gen.mk
+  perl -ne '/^include / or print' Makefile.am \
+      | make -f - abs_srcdir=`dirname $(pwd)` gen.mk > /dev/null )
+
+automake
+autoconf
diff --git a/cpp/build-aux/compile b/cpp/build-aux/compile
new file mode 100755
index 0000000000..1b1d232169
--- /dev/null
+++ b/cpp/build-aux/compile
@@ -0,0 +1,142 @@
+#! /bin/sh
+# Wrapper for compilers which do not understand `-c -o'.
+
+scriptversion=2005-05-14.22
+
+# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
+# Written by Tom Tromey <tromey@cygnus.com>.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# This file is maintained in Automake, please report
+# bugs to <bug-automake@gnu.org> or send patches to
+# <automake-patches@gnu.org>.
+
+case $1 in
+  '')
+     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
+     exit 1;
+     ;;
+  -h | --h*)
+    cat <<\EOF
+Usage: compile [--help] [--version] PROGRAM [ARGS]
+
+Wrapper for compilers which do not understand `-c -o'.
+Remove `-o dest.o' from ARGS, run PROGRAM with the remaining
+arguments, and rename the output as expected.
+
+If you are trying to build a whole package this is not the
+right script to run: please start by reading the file `INSTALL'.
+
+Report bugs to <bug-automake@gnu.org>.
+EOF
+    exit $?
+    ;;
+  -v | --v*)
+    echo "compile $scriptversion"
+    exit $?
+    ;;
+esac
+
+ofile=
+cfile=
+eat=
+
+for arg
+do
+  if test -n "$eat"; then
+    eat=
+  else
+    case $1 in
+      -o)
+	# configure might choose to run compile as `compile cc -o foo foo.c'.
+	# So we strip `-o arg' only if arg is an object.
+	eat=1
+	case $2 in
+	  *.o | *.obj)
+	    ofile=$2
+	    ;;
+	  *)
+	    set x "$@" -o "$2"
+	    shift
+	    ;;
+	esac
+	;;
+      *.c)
+	cfile=$1
+	set x "$@" "$1"
+	shift
+	;;
+      *)
+	set x "$@" "$1"
+	shift
+	;;
+    esac
+  fi
+  shift
+done
+
+if test -z "$ofile" || test -z "$cfile"; then
+  # If no `-o' option was seen then we might have been invoked from a
+  # pattern rule where we don't need one.  That is ok -- this is a
+  # normal compilation that the losing compiler can handle.  If no
+  # `.c' file was seen then we are probably linking.  That is also
+  # ok.
+  exec "$@"
+fi
+
+# Name of file we expect compiler to create.
+cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
+
+# Create the lock directory.
+# Note: use `[/.-]' here to ensure that we don't use the same name
+# that we are using for the .o file.  Also, base the name on the expected
+# object file name, since that is what matters with a parallel build.
+lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d
+while true; do
+  if mkdir "$lockdir" >/dev/null 2>&1; then
+    break
+  fi
+  sleep 1
+done
+# FIXME: race condition here if user kills between mkdir and trap.
+trap "rmdir '$lockdir'; exit 1" 1 2 15
+
+# Run the compile.
+"$@"
+ret=$?
+
+if test -f "$cofile"; then
+  mv "$cofile" "$ofile"
+elif test -f "${cofile}bj"; then
+  mv "${cofile}bj" "$ofile"
+fi
+
+rmdir "$lockdir"
+exit $ret
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
diff --git a/cpp/build-aux/config.guess b/cpp/build-aux/config.guess
new file mode 100755
index 0000000000..c93201a4d2
--- /dev/null
+++ b/cpp/build-aux/config.guess
@@ -0,0 +1,1501 @@
+#! /bin/sh
+# Attempt to guess a canonical system name.
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+#   Inc.
+
+timestamp='2006-11-08'
+
+# This file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+# 02110-1301, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+
+# Originally written by Per Bothner <per@bothner.com>.
+# Please send patches to <config-patches@gnu.org>.  Submit a context
+# diff and a properly formatted ChangeLog entry.
+#
+# This script attempts to guess a canonical system name similar to
+# config.sub.  If it succeeds, it prints the system name on stdout, and
+# exits with 0.  Otherwise, it exits with 1.
+#
+# The plan is that this can be called by configure scripts if you
+# don't specify an explicit build system type.
+
+me=`echo "$0" | sed -e 's,.*/,,'`
+
+usage="\
+Usage: $0 [OPTION]
+
+Output the configuration name of the system \`$me' is run on.
+
+Operation modes:
+  -h, --help         print this help, then exit
+  -t, --time-stamp   print date of last modification, then exit
+  -v, --version      print version number, then exit
+
+Report bugs and patches to <config-patches@gnu.org>."
+
+version="\
+GNU config.guess ($timestamp)
+
+Originally written by Per Bothner.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+Free Software Foundation, Inc.
+
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+
+help="
+Try \`$me --help' for more information."
+
+# Parse command line
+while test $# -gt 0 ; do
+  case $1 in
+    --time-stamp | --time* | -t )
+       echo "$timestamp" ; exit ;;
+    --version | -v )
+       echo "$version" ; exit ;;
+    --help | --h* | -h )
+       echo "$usage"; exit ;;
+    -- )     # Stop option processing
+       shift; break ;;
+    - )	# Use stdin as input.
+       break ;;
+    -* )
+       echo "$me: invalid option $1$help" >&2
+       exit 1 ;;
+    * )
+       break ;;
+  esac
+done
+
+if test $# != 0; then
+  echo "$me: too many arguments$help" >&2
+  exit 1
+fi
+
+trap 'exit 1' 1 2 15
+
+# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
+# compiler to aid in system detection is discouraged as it requires
+# temporary files to be created and, as you can see below, it is a
+# headache to deal with in a portable fashion.
+
+# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
+# use `HOST_CC' if defined, but it is deprecated.
+
+# Portable tmp directory creation inspired by the Autoconf team.
+
+set_cc_for_build='
+trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
+trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
+: ${TMPDIR=/tmp} ;
+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+ { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
+ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
+ { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
+dummy=$tmp/dummy ;
+tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
+case $CC_FOR_BUILD,$HOST_CC,$CC in
+ ,,)    echo "int x;" > $dummy.c ;
+	for c in cc gcc c89 c99 ; do
+	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
+	     CC_FOR_BUILD="$c"; break ;
+	  fi ;
+	done ;
+	if test x"$CC_FOR_BUILD" = x ; then
+	  CC_FOR_BUILD=no_compiler_found ;
+	fi
+	;;
+ ,,*)   CC_FOR_BUILD=$CC ;;
+ ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
+esac ; set_cc_for_build= ;'
+
+# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
+# (ghazi@noc.rutgers.edu 1994-08-24)
+if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
+	PATH=$PATH:/.attbin ; export PATH
+fi
+
+UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
+UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
+UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
+UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
+
+# Note: order is significant - the case branches are not exclusive.
+
+case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+    *:NetBSD:*:*)
+	# NetBSD (nbsd) targets should (where applicable) match one or
+	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
+	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
+	# switched to ELF, *-*-netbsd* would select the old
+	# object file format.  This provides both forward
+	# compatibility and a consistent mechanism for selecting the
+	# object file format.
+	#
+	# Note: NetBSD doesn't particularly care about the vendor
+	# portion of the name.  We always set it to "unknown".
+	sysctl="sysctl -n hw.machine_arch"
+	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
+	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
+	case "${UNAME_MACHINE_ARCH}" in
+	    armeb) machine=armeb-unknown ;;
+	    arm*) machine=arm-unknown ;;
+	    sh3el) machine=shl-unknown ;;
+	    sh3eb) machine=sh-unknown ;;
+	    sh5el) machine=sh5le-unknown ;;
+	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
+	esac
+	# The Operating System including object format, if it has switched
+	# to ELF recently, or will in the future.
+	case "${UNAME_MACHINE_ARCH}" in
+	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
+		eval $set_cc_for_build
+		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
+			| grep __ELF__ >/dev/null
+		then
+		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
+		    # Return netbsd for either.  FIX?
+		    os=netbsd
+		else
+		    os=netbsdelf
+		fi
+		;;
+	    *)
+	        os=netbsd
+		;;
+	esac
+	# The OS release
+	# Debian GNU/NetBSD machines have a different userland, and
+	# thus, need a distinct triplet. However, they do not need
+	# kernel version information, so it can be replaced with a
+	# suitable tag, in the style of linux-gnu.
+	case "${UNAME_VERSION}" in
+	    Debian*)
+		release='-gnu'
+		;;
+	    *)
+		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+		;;
+	esac
+	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
+	# contains redundant information, the shorter form:
+	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
+	echo "${machine}-${os}${release}"
+	exit ;;
+    *:OpenBSD:*:*)
+	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
+	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
+	exit ;;
+    *:ekkoBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
+	exit ;;
+    *:SolidBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
+	exit ;;
+    macppc:MirBSD:*:*)
+	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
+	exit ;;
+    *:MirBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
+	exit ;;
+    alpha:OSF1:*:*)
+	case $UNAME_RELEASE in
+	*4.0)
+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
+		;;
+	*5.*)
+	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+		;;
+	esac
+	# According to Compaq, /usr/sbin/psrinfo has been available on
+	# OSF/1 and Tru64 systems produced since 1995.  I hope that
+	# covers most systems running today.  This code pipes the CPU
+	# types through head -n 1, so we only detect the type of CPU 0.
+	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
+	case "$ALPHA_CPU_TYPE" in
+	    "EV4 (21064)")
+		UNAME_MACHINE="alpha" ;;
+	    "EV4.5 (21064)")
+		UNAME_MACHINE="alpha" ;;
+	    "LCA4 (21066/21068)")
+		UNAME_MACHINE="alpha" ;;
+	    "EV5 (21164)")
+		UNAME_MACHINE="alphaev5" ;;
+	    "EV5.6 (21164A)")
+		UNAME_MACHINE="alphaev56" ;;
+	    "EV5.6 (21164PC)")
+		UNAME_MACHINE="alphapca56" ;;
+	    "EV5.7 (21164PC)")
+		UNAME_MACHINE="alphapca57" ;;
+	    "EV6 (21264)")
+		UNAME_MACHINE="alphaev6" ;;
+	    "EV6.7 (21264A)")
+		UNAME_MACHINE="alphaev67" ;;
+	    "EV6.8CB (21264C)")
+		UNAME_MACHINE="alphaev68" ;;
+	    "EV6.8AL (21264B)")
+		UNAME_MACHINE="alphaev68" ;;
+	    "EV6.8CX (21264D)")
+		UNAME_MACHINE="alphaev68" ;;
+	    "EV6.9A (21264/EV69A)")
+		UNAME_MACHINE="alphaev69" ;;
+	    "EV7 (21364)")
+		UNAME_MACHINE="alphaev7" ;;
+	    "EV7.9 (21364A)")
+		UNAME_MACHINE="alphaev79" ;;
+	esac
+	# A Pn.n version is a patched version.
+	# A Vn.n version is a released version.
+	# A Tn.n version is a released field test version.
+	# A Xn.n version is an unreleased experimental baselevel.
+	# 1.2 uses "1.2" for uname -r.
+	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+	exit ;;
+    Alpha\ *:Windows_NT*:*)
+	# How do we know it's Interix rather than the generic POSIX subsystem?
+	# Should we change UNAME_MACHINE based on the output of uname instead
+	# of the specific Alpha model?
+	echo alpha-pc-interix
+	exit ;;
+    21064:Windows_NT:50:3)
+	echo alpha-dec-winnt3.5
+	exit ;;
+    Amiga*:UNIX_System_V:4.0:*)
+	echo m68k-unknown-sysv4
+	exit ;;
+    *:[Aa]miga[Oo][Ss]:*:*)
+	echo ${UNAME_MACHINE}-unknown-amigaos
+	exit ;;
+    *:[Mm]orph[Oo][Ss]:*:*)
+	echo ${UNAME_MACHINE}-unknown-morphos
+	exit ;;
+    *:OS/390:*:*)
+	echo i370-ibm-openedition
+	exit ;;
+    *:z/VM:*:*)
+	echo s390-ibm-zvmoe
+	exit ;;
+    *:OS400:*:*)
+        echo powerpc-ibm-os400
+	exit ;;
+    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
+	echo arm-acorn-riscix${UNAME_RELEASE}
+	exit ;;
+    arm:riscos:*:*|arm:RISCOS:*:*)
+	echo arm-unknown-riscos
+	exit ;;
+    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
+	echo hppa1.1-hitachi-hiuxmpp
+	exit ;;
+    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
+	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
+	if test "`(/bin/universe) 2>/dev/null`" = att ; then
+		echo pyramid-pyramid-sysv3
+	else
+		echo pyramid-pyramid-bsd
+	fi
+	exit ;;
+    NILE*:*:*:dcosx)
+	echo pyramid-pyramid-svr4
+	exit ;;
+    DRS?6000:unix:4.0:6*)
+	echo sparc-icl-nx6
+	exit ;;
+    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
+	case `/usr/bin/uname -p` in
+	    sparc) echo sparc-icl-nx7; exit ;;
+	esac ;;
+    sun4H:SunOS:5.*:*)
+	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
+	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    i86pc:SunOS:5.*:*)
+	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    sun4*:SunOS:6*:*)
+	# According to config.sub, this is the proper way to canonicalize
+	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
+	# it's likely to be more like Solaris than SunOS4.
+	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    sun4*:SunOS:*:*)
+	case "`/usr/bin/arch -k`" in
+	    Series*|S4*)
+		UNAME_RELEASE=`uname -v`
+		;;
+	esac
+	# Japanese Language versions have a version number like `4.1.3-JL'.
+	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
+	exit ;;
+    sun3*:SunOS:*:*)
+	echo m68k-sun-sunos${UNAME_RELEASE}
+	exit ;;
+    sun*:*:4.2BSD:*)
+	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
+	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
+	case "`/bin/arch`" in
+	    sun3)
+		echo m68k-sun-sunos${UNAME_RELEASE}
+		;;
+	    sun4)
+		echo sparc-sun-sunos${UNAME_RELEASE}
+		;;
+	esac
+	exit ;;
+    aushp:SunOS:*:*)
+	echo sparc-auspex-sunos${UNAME_RELEASE}
+	exit ;;
+    # The situation for MiNT is a little confusing.  The machine name
+    # can be virtually everything (everything which is not
+    # "atarist" or "atariste" at least should have a processor
+    # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
+    # to the lowercase version "mint" (or "freemint").  Finally
+    # the system name "TOS" denotes a system which is actually not
+    # MiNT.  But MiNT is downward compatible to TOS, so this should
+    # be no problem.
+    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
+        echo m68k-atari-mint${UNAME_RELEASE}
+	exit ;;
+    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
+	echo m68k-atari-mint${UNAME_RELEASE}
+        exit ;;
+    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
+        echo m68k-atari-mint${UNAME_RELEASE}
+	exit ;;
+    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
+        echo m68k-milan-mint${UNAME_RELEASE}
+        exit ;;
+    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
+        echo m68k-hades-mint${UNAME_RELEASE}
+        exit ;;
+    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
+        echo m68k-unknown-mint${UNAME_RELEASE}
+        exit ;;
+    m68k:machten:*:*)
+	echo m68k-apple-machten${UNAME_RELEASE}
+	exit ;;
+    powerpc:machten:*:*)
+	echo powerpc-apple-machten${UNAME_RELEASE}
+	exit ;;
+    RISC*:Mach:*:*)
+	echo mips-dec-mach_bsd4.3
+	exit ;;
+    RISC*:ULTRIX:*:*)
+	echo mips-dec-ultrix${UNAME_RELEASE}
+	exit ;;
+    VAX*:ULTRIX*:*:*)
+	echo vax-dec-ultrix${UNAME_RELEASE}
+	exit ;;
+    2020:CLIX:*:* | 2430:CLIX:*:*)
+	echo clipper-intergraph-clix${UNAME_RELEASE}
+	exit ;;
+    mips:*:*:UMIPS | mips:*:*:RISCos)
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+#ifdef __cplusplus
+#include <stdio.h>  /* for printf() prototype */
+	int main (int argc, char *argv[]) {
+#else
+	int main (argc, argv) int argc; char *argv[]; {
+#endif
+	#if defined (host_mips) && defined (MIPSEB)
+	#if defined (SYSTYPE_SYSV)
+	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
+	#endif
+	#if defined (SYSTYPE_SVR4)
+	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
+	#endif
+	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
+	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
+	#endif
+	#endif
+	  exit (-1);
+	}
+EOF
+	$CC_FOR_BUILD -o $dummy $dummy.c &&
+	  dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
+	  SYSTEM_NAME=`$dummy $dummyarg` &&
+	    { echo "$SYSTEM_NAME"; exit; }
+	echo mips-mips-riscos${UNAME_RELEASE}
+	exit ;;
+    Motorola:PowerMAX_OS:*:*)
+	echo powerpc-motorola-powermax
+	exit ;;
+    Motorola:*:4.3:PL8-*)
+	echo powerpc-harris-powermax
+	exit ;;
+    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
+	echo powerpc-harris-powermax
+	exit ;;
+    Night_Hawk:Power_UNIX:*:*)
+	echo powerpc-harris-powerunix
+	exit ;;
+    m88k:CX/UX:7*:*)
+	echo m88k-harris-cxux7
+	exit ;;
+    m88k:*:4*:R4*)
+	echo m88k-motorola-sysv4
+	exit ;;
+    m88k:*:3*:R3*)
+	echo m88k-motorola-sysv3
+	exit ;;
+    AViiON:dgux:*:*)
+        # DG/UX returns AViiON for all architectures
+        UNAME_PROCESSOR=`/usr/bin/uname -p`
+	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
+	then
+	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
+	       [ ${TARGET_BINARY_INTERFACE}x = x ]
+	    then
+		echo m88k-dg-dgux${UNAME_RELEASE}
+	    else
+		echo m88k-dg-dguxbcs${UNAME_RELEASE}
+	    fi
+	else
+	    echo i586-dg-dgux${UNAME_RELEASE}
+	fi
+ 	exit ;;
+    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
+	echo m88k-dolphin-sysv3
+	exit ;;
+    M88*:*:R3*:*)
+	# Delta 88k system running SVR3
+	echo m88k-motorola-sysv3
+	exit ;;
+    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
+	echo m88k-tektronix-sysv3
+	exit ;;
+    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
+	echo m68k-tektronix-bsd
+	exit ;;
+    *:IRIX*:*:*)
+	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
+	exit ;;
+    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
+	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
+	exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
+    i*86:AIX:*:*)
+	echo i386-ibm-aix
+	exit ;;
+    ia64:AIX:*:*)
+	if [ -x /usr/bin/oslevel ] ; then
+		IBM_REV=`/usr/bin/oslevel`
+	else
+		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+	fi
+	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
+	exit ;;
+    *:AIX:2:3)
+	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
+		eval $set_cc_for_build
+		sed 's/^		//' << EOF >$dummy.c
+		#include <sys/systemcfg.h>
+
+		main()
+			{
+			if (!__power_pc())
+				exit(1);
+			puts("powerpc-ibm-aix3.2.5");
+			exit(0);
+			}
+EOF
+		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
+		then
+			echo "$SYSTEM_NAME"
+		else
+			echo rs6000-ibm-aix3.2.5
+		fi
+	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
+		echo rs6000-ibm-aix3.2.4
+	else
+		echo rs6000-ibm-aix3.2
+	fi
+	exit ;;
+    *:AIX:*:[45])
+	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
+	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
+		IBM_ARCH=rs6000
+	else
+		IBM_ARCH=powerpc
+	fi
+	if [ -x /usr/bin/oslevel ] ; then
+		IBM_REV=`/usr/bin/oslevel`
+	else
+		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+	fi
+	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
+	exit ;;
+    *:AIX:*:*)
+	echo rs6000-ibm-aix
+	exit ;;
+    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
+	echo romp-ibm-bsd4.4
+	exit ;;
+    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
+	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
+	exit ;;                             # report: romp-ibm BSD 4.3
+    *:BOSX:*:*)
+	echo rs6000-bull-bosx
+	exit ;;
+    DPX/2?00:B.O.S.:*:*)
+	echo m68k-bull-sysv3
+	exit ;;
+    9000/[34]??:4.3bsd:1.*:*)
+	echo m68k-hp-bsd
+	exit ;;
+    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
+	echo m68k-hp-bsd4.4
+	exit ;;
+    9000/[34678]??:HP-UX:*:*)
+	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+	case "${UNAME_MACHINE}" in
+	    9000/31? )            HP_ARCH=m68000 ;;
+	    9000/[34]?? )         HP_ARCH=m68k ;;
+	    9000/[678][0-9][0-9])
+		if [ -x /usr/bin/getconf ]; then
+		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
+                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+                    case "${sc_cpu_version}" in
+                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
+                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+                      532)                      # CPU_PA_RISC2_0
+                        case "${sc_kernel_bits}" in
+                          32) HP_ARCH="hppa2.0n" ;;
+                          64) HP_ARCH="hppa2.0w" ;;
+			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
+                        esac ;;
+                    esac
+		fi
+		if [ "${HP_ARCH}" = "" ]; then
+		    eval $set_cc_for_build
+		    sed 's/^              //' << EOF >$dummy.c
+
+              #define _HPUX_SOURCE
+              #include <stdlib.h>
+              #include <unistd.h>
+
+              int main ()
+              {
+              #if defined(_SC_KERNEL_BITS)
+                  long bits = sysconf(_SC_KERNEL_BITS);
+              #endif
+                  long cpu  = sysconf (_SC_CPU_VERSION);
+
+                  switch (cpu)
+              	{
+              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+              	case CPU_PA_RISC2_0:
+              #if defined(_SC_KERNEL_BITS)
+              	    switch (bits)
+              		{
+              		case 64: puts ("hppa2.0w"); break;
+              		case 32: puts ("hppa2.0n"); break;
+              		default: puts ("hppa2.0"); break;
+              		} break;
+              #else  /* !defined(_SC_KERNEL_BITS) */
+              	    puts ("hppa2.0"); break;
+              #endif
+              	default: puts ("hppa1.0"); break;
+              	}
+                  exit (0);
+              }
+EOF
+		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
+		    test -z "$HP_ARCH" && HP_ARCH=hppa
+		fi ;;
+	esac
+	if [ ${HP_ARCH} = "hppa2.0w" ]
+	then
+	    eval $set_cc_for_build
+
+	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
+	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
+	    # generating 64-bit code.  GNU and HP use different nomenclature:
+	    #
+	    # $ CC_FOR_BUILD=cc ./config.guess
+	    # => hppa2.0w-hp-hpux11.23
+	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
+	    # => hppa64-hp-hpux11.23
+
+	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
+		grep __LP64__ >/dev/null
+	    then
+		HP_ARCH="hppa2.0w"
+	    else
+		HP_ARCH="hppa64"
+	    fi
+	fi
+	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
+	exit ;;
+    ia64:HP-UX:*:*)
+	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+	echo ia64-hp-hpux${HPUX_REV}
+	exit ;;
+    3050*:HI-UX:*:*)
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#include <unistd.h>
+	int
+	main ()
+	{
+	  long cpu = sysconf (_SC_CPU_VERSION);
+	  /* The order matters, because CPU_IS_HP_MC68K erroneously returns
+	     true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
+	     results, however.  */
+	  if (CPU_IS_PA_RISC (cpu))
+	    {
+	      switch (cpu)
+		{
+		  case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
+		  case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
+		  case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
+		  default: puts ("hppa-hitachi-hiuxwe2"); break;
+		}
+	    }
+	  else if (CPU_IS_HP_MC68K (cpu))
+	    puts ("m68k-hitachi-hiuxwe2");
+	  else puts ("unknown-hitachi-hiuxwe2");
+	  exit (0);
+	}
+EOF
+	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
+		{ echo "$SYSTEM_NAME"; exit; }
+	echo unknown-hitachi-hiuxwe2
+	exit ;;
+    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
+	echo hppa1.1-hp-bsd
+	exit ;;
+    9000/8??:4.3bsd:*:*)
+	echo hppa1.0-hp-bsd
+	exit ;;
+    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
+	echo hppa1.0-hp-mpeix
+	exit ;;
+    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
+	echo hppa1.1-hp-osf
+	exit ;;
+    hp8??:OSF1:*:*)
+	echo hppa1.0-hp-osf
+	exit ;;
+    i*86:OSF1:*:*)
+	if [ -x /usr/sbin/sysversion ] ; then
+	    echo ${UNAME_MACHINE}-unknown-osf1mk
+	else
+	    echo ${UNAME_MACHINE}-unknown-osf1
+	fi
+	exit ;;
+    parisc*:Lites*:*:*)
+	echo hppa1.1-hp-lites
+	exit ;;
+    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
+	echo c1-convex-bsd
+        exit ;;
+    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
+	if getsysinfo -f scalar_acc
+	then echo c32-convex-bsd
+	else echo c2-convex-bsd
+	fi
+        exit ;;
+    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
+	echo c34-convex-bsd
+        exit ;;
+    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
+	echo c38-convex-bsd
+        exit ;;
+    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
+	echo c4-convex-bsd
+        exit ;;
+    CRAY*Y-MP:*:*:*)
+	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    CRAY*[A-Z]90:*:*:*)
+	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
+	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
+	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
+	      -e 's/\.[^.]*$/.X/'
+	exit ;;
+    CRAY*TS:*:*:*)
+	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    CRAY*T3E:*:*:*)
+	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    CRAY*SV1:*:*:*)
+	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    *:UNICOS/mp:*:*)
+	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
+	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+        exit ;;
+    5000:UNIX_System_V:4.*:*)
+        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	exit ;;
+    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
+	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
+	exit ;;
+    sparc*:BSD/OS:*:*)
+	echo sparc-unknown-bsdi${UNAME_RELEASE}
+	exit ;;
+    *:BSD/OS:*:*)
+	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
+	exit ;;
+    *:FreeBSD:*:*)
+	case ${UNAME_MACHINE} in
+	    pc98)
+		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	    amd64)
+		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	    *)
+		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	esac
+	exit ;;
+    i*:CYGWIN*:*)
+	echo ${UNAME_MACHINE}-pc-cygwin
+	exit ;;
+    i*:MINGW*:*)
+	echo ${UNAME_MACHINE}-pc-mingw32
+	exit ;;
+    i*:windows32*:*)
+    	# uname -m includes "-pc" on this system.
+    	echo ${UNAME_MACHINE}-mingw32
+	exit ;;
+    i*:PW*:*)
+	echo ${UNAME_MACHINE}-pc-pw32
+	exit ;;
+    x86:Interix*:[3456]*)
+	echo i586-pc-interix${UNAME_RELEASE}
+	exit ;;
+    EM64T:Interix*:[3456]* | authenticamd:Interix*:[3456]*)
+	echo x86_64-unknown-interix${UNAME_RELEASE}
+	exit ;;
+    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
+	echo i${UNAME_MACHINE}-pc-mks
+	exit ;;
+    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
+	# How do we know it's Interix rather than the generic POSIX subsystem?
+	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
+	# UNAME_MACHINE based on the output of uname instead of i386?
+	echo i586-pc-interix
+	exit ;;
+    i*:UWIN*:*)
+	echo ${UNAME_MACHINE}-pc-uwin
+	exit ;;
+    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
+	echo x86_64-unknown-cygwin
+	exit ;;
+    p*:CYGWIN*:*)
+	echo powerpcle-unknown-cygwin
+	exit ;;
+    prep*:SunOS:5.*:*)
+	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    *:GNU:*:*)
+	# the GNU system
+	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+	exit ;;
+    *:GNU/*:*:*)
+	# other systems with GNU libc and userland
+	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
+	exit ;;
+    i*86:Minix:*:*)
+	echo ${UNAME_MACHINE}-pc-minix
+	exit ;;
+    arm*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    avr32*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    cris:Linux:*:*)
+	echo cris-axis-linux-gnu
+	exit ;;
+    crisv32:Linux:*:*)
+	echo crisv32-axis-linux-gnu
+	exit ;;
+    frv:Linux:*:*)
+    	echo frv-unknown-linux-gnu
+	exit ;;
+    ia64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    m32r*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    m68*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    mips:Linux:*:*)
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#undef CPU
+	#undef mips
+	#undef mipsel
+	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+	CPU=mipsel
+	#else
+	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+	CPU=mips
+	#else
+	CPU=
+	#endif
+	#endif
+EOF
+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+	    /^CPU/{
+		s: ::g
+		p
+	    }'`"
+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+	;;
+    mips64:Linux:*:*)
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#undef CPU
+	#undef mips64
+	#undef mips64el
+	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+	CPU=mips64el
+	#else
+	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+	CPU=mips64
+	#else
+	CPU=
+	#endif
+	#endif
+EOF
+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+	    /^CPU/{
+		s: ::g
+		p
+	    }'`"
+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+	;;
+    or32:Linux:*:*)
+	echo or32-unknown-linux-gnu
+	exit ;;
+    ppc:Linux:*:*)
+	echo powerpc-unknown-linux-gnu
+	exit ;;
+    ppc64:Linux:*:*)
+	echo powerpc64-unknown-linux-gnu
+	exit ;;
+    alpha:Linux:*:*)
+	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+	  EV5)   UNAME_MACHINE=alphaev5 ;;
+	  EV56)  UNAME_MACHINE=alphaev56 ;;
+	  PCA56) UNAME_MACHINE=alphapca56 ;;
+	  PCA57) UNAME_MACHINE=alphapca56 ;;
+	  EV6)   UNAME_MACHINE=alphaev6 ;;
+	  EV67)  UNAME_MACHINE=alphaev67 ;;
+	  EV68*) UNAME_MACHINE=alphaev68 ;;
+        esac
+	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
+	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+	exit ;;
+    parisc:Linux:*:* | hppa:Linux:*:*)
+	# Look for CPU level
+	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
+	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
+	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
+	  *)    echo hppa-unknown-linux-gnu ;;
+	esac
+	exit ;;
+    parisc64:Linux:*:* | hppa64:Linux:*:*)
+	echo hppa64-unknown-linux-gnu
+	exit ;;
+    s390:Linux:*:* | s390x:Linux:*:*)
+	echo ${UNAME_MACHINE}-ibm-linux
+	exit ;;
+    sh64*:Linux:*:*)
+    	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    sh*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    sparc:Linux:*:* | sparc64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    vax:Linux:*:*)
+	echo ${UNAME_MACHINE}-dec-linux-gnu
+	exit ;;
+    x86_64:Linux:*:*)
+	echo x86_64-unknown-linux-gnu
+	exit ;;
+    i*86:Linux:*:*)
+	# The BFD linker knows what the default object file format is, so
+	# first see if it will tell us. cd to the root directory to prevent
+	# problems with other programs or directories called `ld' in the path.
+	# Set LC_ALL=C to ensure ld outputs messages in English.
+	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
+			 | sed -ne '/supported targets:/!d
+				    s/[ 	][ 	]*/ /g
+				    s/.*supported targets: *//
+				    s/ .*//
+				    p'`
+        case "$ld_supported_targets" in
+	  elf32-i386)
+		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
+		;;
+	  a.out-i386-linux)
+		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
+		exit ;;
+	  coff-i386)
+		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
+		exit ;;
+	  "")
+		# Either a pre-BFD a.out linker (linux-gnuoldld) or
+		# one that does not give us useful --help.
+		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
+		exit ;;
+	esac
+	# Determine whether the default compiler is a.out or elf
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#include <features.h>
+	#ifdef __ELF__
+	# ifdef __GLIBC__
+	#  if __GLIBC__ >= 2
+	LIBC=gnu
+	#  else
+	LIBC=gnulibc1
+	#  endif
+	# else
+	LIBC=gnulibc1
+	# endif
+	#else
+	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
+	LIBC=gnu
+	#else
+	LIBC=gnuaout
+	#endif
+	#endif
+	#ifdef __dietlibc__
+	LIBC=dietlibc
+	#endif
+EOF
+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+	    /^LIBC/{
+		s: ::g
+		p
+	    }'`"
+	test x"${LIBC}" != x && {
+		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+		exit
+	}
+	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
+	;;
+    i*86:DYNIX/ptx:4*:*)
+	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
+	# earlier versions are messed up and put the nodename in both
+	# sysname and nodename.
+	echo i386-sequent-sysv4
+	exit ;;
+    i*86:UNIX_SV:4.2MP:2.*)
+        # Unixware is an offshoot of SVR4, but it has its own version
+        # number series starting with 2...
+        # I am not positive that other SVR4 systems won't match this,
+	# I just have to hope.  -- rms.
+        # Use sysv4.2uw... so that sysv4* matches it.
+	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
+	exit ;;
+    i*86:OS/2:*:*)
+	# If we were able to find `uname', then EMX Unix compatibility
+	# is probably installed.
+	echo ${UNAME_MACHINE}-pc-os2-emx
+	exit ;;
+    i*86:XTS-300:*:STOP)
+	echo ${UNAME_MACHINE}-unknown-stop
+	exit ;;
+    i*86:atheos:*:*)
+	echo ${UNAME_MACHINE}-unknown-atheos
+	exit ;;
+    i*86:syllable:*:*)
+	echo ${UNAME_MACHINE}-pc-syllable
+	exit ;;
+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
+	echo i386-unknown-lynxos${UNAME_RELEASE}
+	exit ;;
+    i*86:*DOS:*:*)
+	echo ${UNAME_MACHINE}-pc-msdosdjgpp
+	exit ;;
+    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
+	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
+	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
+		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
+	else
+		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
+	fi
+	exit ;;
+    i*86:*:5:[678]*)
+    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
+	case `/bin/uname -X | grep "^Machine"` in
+	    *486*)	     UNAME_MACHINE=i486 ;;
+	    *Pentium)	     UNAME_MACHINE=i586 ;;
+	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
+	esac
+	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
+	exit ;;
+    i*86:*:3.2:*)
+	if test -f /usr/options/cb.name; then
+		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
+		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
+	elif /bin/uname -X 2>/dev/null >/dev/null ; then
+		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
+		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
+		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
+			&& UNAME_MACHINE=i586
+		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
+			&& UNAME_MACHINE=i686
+		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
+			&& UNAME_MACHINE=i686
+		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
+	else
+		echo ${UNAME_MACHINE}-pc-sysv32
+	fi
+	exit ;;
+    pc:*:*:*)
+	# Left here for compatibility:
+        # uname -m prints for DJGPP always 'pc', but it prints nothing about
+        # the processor, so we play safe by assuming i386.
+	echo i386-pc-msdosdjgpp
+        exit ;;
+    Intel:Mach:3*:*)
+	echo i386-pc-mach3
+	exit ;;
+    paragon:*:*:*)
+	echo i860-intel-osf1
+	exit ;;
+    i860:*:4.*:*) # i860-SVR4
+	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
+	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
+	else # Add other i860-SVR4 vendors below as they are discovered.
+	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
+	fi
+	exit ;;
+    mini*:CTIX:SYS*5:*)
+	# "miniframe"
+	echo m68010-convergent-sysv
+	exit ;;
+    mc68k:UNIX:SYSTEM5:3.51m)
+	echo m68k-convergent-sysv
+	exit ;;
+    M680?0:D-NIX:5.3:*)
+	echo m68k-diab-dnix
+	exit ;;
+    M68*:*:R3V[5678]*:*)
+	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
+    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
+	OS_REL=''
+	test -r /etc/.relid \
+	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	  && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
+    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
+        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+          && { echo i486-ncr-sysv4; exit; } ;;
+    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
+	echo m68k-unknown-lynxos${UNAME_RELEASE}
+	exit ;;
+    mc68030:UNIX_System_V:4.*:*)
+	echo m68k-atari-sysv4
+	exit ;;
+    TSUNAMI:LynxOS:2.*:*)
+	echo sparc-unknown-lynxos${UNAME_RELEASE}
+	exit ;;
+    rs6000:LynxOS:2.*:*)
+	echo rs6000-unknown-lynxos${UNAME_RELEASE}
+	exit ;;
+    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
+	echo powerpc-unknown-lynxos${UNAME_RELEASE}
+	exit ;;
+    SM[BE]S:UNIX_SV:*:*)
+	echo mips-dde-sysv${UNAME_RELEASE}
+	exit ;;
+    RM*:ReliantUNIX-*:*:*)
+	echo mips-sni-sysv4
+	exit ;;
+    RM*:SINIX-*:*:*)
+	echo mips-sni-sysv4
+	exit ;;
+    *:SINIX-*:*:*)
+	if uname -p 2>/dev/null >/dev/null ; then
+		UNAME_MACHINE=`(uname -p) 2>/dev/null`
+		echo ${UNAME_MACHINE}-sni-sysv4
+	else
+		echo ns32k-sni-sysv
+	fi
+	exit ;;
+    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+                      # says <Richard.M.Bartel@ccMail.Census.GOV>
+        echo i586-unisys-sysv4
+        exit ;;
+    *:UNIX_System_V:4*:FTX*)
+	# From Gerald Hewes <hewes@openmarket.com>.
+	# How about differentiating between stratus architectures? -djm
+	echo hppa1.1-stratus-sysv4
+	exit ;;
+    *:*:*:FTX*)
+	# From seanf@swdc.stratus.com.
+	echo i860-stratus-sysv4
+	exit ;;
+    i*86:VOS:*:*)
+	# From Paul.Green@stratus.com.
+	echo ${UNAME_MACHINE}-stratus-vos
+	exit ;;
+    *:VOS:*:*)
+	# From Paul.Green@stratus.com.
+	echo hppa1.1-stratus-vos
+	exit ;;
+    mc68*:A/UX:*:*)
+	echo m68k-apple-aux${UNAME_RELEASE}
+	exit ;;
+    news*:NEWS-OS:6*:*)
+	echo mips-sony-newsos6
+	exit ;;
+    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
+	if [ -d /usr/nec ]; then
+	        echo mips-nec-sysv${UNAME_RELEASE}
+	else
+	        echo mips-unknown-sysv${UNAME_RELEASE}
+	fi
+        exit ;;
+    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
+	echo powerpc-be-beos
+	exit ;;
+    BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
+	echo powerpc-apple-beos
+	exit ;;
+    BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
+	echo i586-pc-beos
+	exit ;;
+    SX-4:SUPER-UX:*:*)
+	echo sx4-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-5:SUPER-UX:*:*)
+	echo sx5-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-6:SUPER-UX:*:*)
+	echo sx6-nec-superux${UNAME_RELEASE}
+	exit ;;
+    Power*:Rhapsody:*:*)
+	echo powerpc-apple-rhapsody${UNAME_RELEASE}
+	exit ;;
+    *:Rhapsody:*:*)
+	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
+	exit ;;
+    *:Darwin:*:*)
+	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
+	case $UNAME_PROCESSOR in
+	    unknown) UNAME_PROCESSOR=powerpc ;;
+	esac
+	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
+	exit ;;
+    *:procnto*:*:* | *:QNX:[0123456789]*:*)
+	UNAME_PROCESSOR=`uname -p`
+	if test "$UNAME_PROCESSOR" = "x86"; then
+		UNAME_PROCESSOR=i386
+		UNAME_MACHINE=pc
+	fi
+	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
+	exit ;;
+    *:QNX:*:4*)
+	echo i386-pc-qnx
+	exit ;;
+    NSE-?:NONSTOP_KERNEL:*:*)
+	echo nse-tandem-nsk${UNAME_RELEASE}
+	exit ;;
+    NSR-?:NONSTOP_KERNEL:*:*)
+	echo nsr-tandem-nsk${UNAME_RELEASE}
+	exit ;;
+    *:NonStop-UX:*:*)
+	echo mips-compaq-nonstopux
+	exit ;;
+    BS2000:POSIX*:*:*)
+	echo bs2000-siemens-sysv
+	exit ;;
+    DS/*:UNIX_System_V:*:*)
+	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
+	exit ;;
+    *:Plan9:*:*)
+	# "uname -m" is not consistent, so use $cputype instead. 386
+	# is converted to i386 for consistency with other x86
+	# operating systems.
+	if test "$cputype" = "386"; then
+	    UNAME_MACHINE=i386
+	else
+	    UNAME_MACHINE="$cputype"
+	fi
+	echo ${UNAME_MACHINE}-unknown-plan9
+	exit ;;
+    *:TOPS-10:*:*)
+	echo pdp10-unknown-tops10
+	exit ;;
+    *:TENEX:*:*)
+	echo pdp10-unknown-tenex
+	exit ;;
+    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
+	echo pdp10-dec-tops20
+	exit ;;
+    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
+	echo pdp10-xkl-tops20
+	exit ;;
+    *:TOPS-20:*:*)
+	echo pdp10-unknown-tops20
+	exit ;;
+    *:ITS:*:*)
+	echo pdp10-unknown-its
+	exit ;;
+    SEI:*:*:SEIUX)
+        echo mips-sei-seiux${UNAME_RELEASE}
+	exit ;;
+    *:DragonFly:*:*)
+	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+	exit ;;
+    *:*VMS:*:*)
+    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
+	case "${UNAME_MACHINE}" in
+	    A*) echo alpha-dec-vms ; exit ;;
+	    I*) echo ia64-dec-vms ; exit ;;
+	    V*) echo vax-dec-vms ; exit ;;
+	esac ;;
+    *:XENIX:*:SysV)
+	echo i386-pc-xenix
+	exit ;;
+    i*86:skyos:*:*)
+	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
+	exit ;;
+    i*86:rdos:*:*)
+	echo ${UNAME_MACHINE}-pc-rdos
+	exit ;;
+esac
+
+#echo '(No uname command or uname output not recognized.)' 1>&2
+#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
+
+eval $set_cc_for_build
+cat >$dummy.c <<EOF
+#ifdef _SEQUENT_
+# include <sys/types.h>
+# include <sys/utsname.h>
+#endif
+main ()
+{
+#if defined (sony)
+#if defined (MIPSEB)
+  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
+     I don't know....  */
+  printf ("mips-sony-bsd\n"); exit (0);
+#else
+#include <sys/param.h>
+  printf ("m68k-sony-newsos%s\n",
+#ifdef NEWSOS4
+          "4"
+#else
+	  ""
+#endif
+         ); exit (0);
+#endif
+#endif
+
+#if defined (__arm) && defined (__acorn) && defined (__unix)
+  printf ("arm-acorn-riscix\n"); exit (0);
+#endif
+
+#if defined (hp300) && !defined (hpux)
+  printf ("m68k-hp-bsd\n"); exit (0);
+#endif
+
+#if defined (NeXT)
+#if !defined (__ARCHITECTURE__)
+#define __ARCHITECTURE__ "m68k"
+#endif
+  int version;
+  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
+  if (version < 4)
+    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
+  else
+    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
+  exit (0);
+#endif
+
+#if defined (MULTIMAX) || defined (n16)
+#if defined (UMAXV)
+  printf ("ns32k-encore-sysv\n"); exit (0);
+#else
+#if defined (CMU)
+  printf ("ns32k-encore-mach\n"); exit (0);
+#else
+  printf ("ns32k-encore-bsd\n"); exit (0);
+#endif
+#endif
+#endif
+
+#if defined (__386BSD__)
+  printf ("i386-pc-bsd\n"); exit (0);
+#endif
+
+#if defined (sequent)
+#if defined (i386)
+  printf ("i386-sequent-dynix\n"); exit (0);
+#endif
+#if defined (ns32000)
+  printf ("ns32k-sequent-dynix\n"); exit (0);
+#endif
+#endif
+
+#if defined (_SEQUENT_)
+    struct utsname un;
+
+    uname(&un);
+
+    if (strncmp(un.version, "V2", 2) == 0) {
+	printf ("i386-sequent-ptx2\n"); exit (0);
+    }
+    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
+	printf ("i386-sequent-ptx1\n"); exit (0);
+    }
+    printf ("i386-sequent-ptx\n"); exit (0);
+
+#endif
+
+#if defined (vax)
+# if !defined (ultrix)
+#  include <sys/param.h>
+#  if defined (BSD)
+#   if BSD == 43
+      printf ("vax-dec-bsd4.3\n"); exit (0);
+#   else
+#    if BSD == 199006
+      printf ("vax-dec-bsd4.3reno\n"); exit (0);
+#    else
+      printf ("vax-dec-bsd\n"); exit (0);
+#    endif
+#   endif
+#  else
+    printf ("vax-dec-bsd\n"); exit (0);
+#  endif
+# else
+    printf ("vax-dec-ultrix\n"); exit (0);
+# endif
+#endif
+
+#if defined (alliant) && defined (i860)
+  printf ("i860-alliant-bsd\n"); exit (0);
+#endif
+
+  exit (1);
+}
+EOF
+
+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
+	{ echo "$SYSTEM_NAME"; exit; }
+
+# Apollos put the system type in the environment.
+
+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
+
+# Convex versions that predate uname can use getsysinfo(1)
+
+if [ -x /usr/convex/getsysinfo ]
+then
+    case `getsysinfo -f cpu_type` in
+    c1*)
+	echo c1-convex-bsd
+	exit ;;
+    c2*)
+	if getsysinfo -f scalar_acc
+	then echo c32-convex-bsd
+	else echo c2-convex-bsd
+	fi
+	exit ;;
+    c34*)
+	echo c34-convex-bsd
+	exit ;;
+    c38*)
+	echo c38-convex-bsd
+	exit ;;
+    c4*)
+	echo c4-convex-bsd
+	exit ;;
+    esac
+fi
+
+cat >&2 <<EOF
+$0: unable to guess system type
+
+This script, last modified $timestamp, has failed to recognize
+the operating system you are using. It is advised that you
+download the most up to date version of the config scripts from
+
+  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
+and
+  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
+
+If the version you run ($0) is already up to date, please
+send the following data and any information you think might be
+pertinent to <config-patches@gnu.org> in order to provide the needed
+information to handle your system.
+
+config.guess timestamp = $timestamp
+
+uname -m = `(uname -m) 2>/dev/null || echo unknown`
+uname -r = `(uname -r) 2>/dev/null || echo unknown`
+uname -s = `(uname -s) 2>/dev/null || echo unknown`
+uname -v = `(uname -v) 2>/dev/null || echo unknown`
+
+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
+/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
+
+hostinfo               = `(hostinfo) 2>/dev/null`
+/bin/universe          = `(/bin/universe) 2>/dev/null`
+/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
+/bin/arch              = `(/bin/arch) 2>/dev/null`
+/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
+
+UNAME_MACHINE = ${UNAME_MACHINE}
+UNAME_RELEASE = ${UNAME_RELEASE}
+UNAME_SYSTEM  = ${UNAME_SYSTEM}
+UNAME_VERSION = ${UNAME_VERSION}
+EOF
+
+exit 1
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "timestamp='"
+# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-end: "'"
+# End:
diff --git a/cpp/build-aux/config.rpath b/cpp/build-aux/config.rpath
new file mode 100755
index 0000000000..c492a93b66
--- /dev/null
+++ b/cpp/build-aux/config.rpath
@@ -0,0 +1,614 @@
+#! /bin/sh
+# Output a system dependent set of variables, describing how to set the
+# run time search path of shared libraries in an executable.
+#
+#   Copyright 1996-2006 Free Software Foundation, Inc.
+#   Taken from GNU libtool, 2001
+#   Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
+#
+#   This file is free software; the Free Software Foundation gives
+#   unlimited permission to copy and/or distribute it, with or without
+#   modifications, as long as this notice is preserved.
+#
+# The first argument passed to this file is the canonical host specification,
+#    CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
+# or
+#    CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
+# The environment variables CC, GCC, LDFLAGS, LD, with_gnu_ld
+# should be set by the caller.
+#
+# The set of defined variables is at the end of this script.
+
+# Known limitations:
+# - On IRIX 6.5 with CC="cc", the run time search patch must not be longer
+#   than 256 bytes, otherwise the compiler driver will dump core. The only
+#   known workaround is to choose shorter directory names for the build
+#   directory and/or the installation directory.
+
+# All known linkers require a `.a' archive for static linking (except MSVC,
+# which needs '.lib').
+libext=a
+shrext=.so
+
+host="$1"
+host_cpu=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+host_vendor=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+host_os=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+
+# Code taken from libtool.m4's _LT_CC_BASENAME.
+
+for cc_temp in $CC""; do
+  case $cc_temp in
+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+    \-*) ;;
+    *) break;;
+  esac
+done
+cc_basename=`echo "$cc_temp" | sed -e 's%^.*/%%'`
+
+# Code taken from libtool.m4's AC_LIBTOOL_PROG_COMPILER_PIC.
+
+wl=
+if test "$GCC" = yes; then
+  wl='-Wl,'
+else
+  case "$host_os" in
+    aix*)
+      wl='-Wl,'
+      ;;
+    darwin*)
+      case $cc_basename in
+        xlc*)
+          wl='-Wl,'
+          ;;
+      esac
+      ;;
+    mingw* | pw32* | os2*)
+      ;;
+    hpux9* | hpux10* | hpux11*)
+      wl='-Wl,'
+      ;;
+    irix5* | irix6* | nonstopux*)
+      wl='-Wl,'
+      ;;
+    newsos6)
+      ;;
+    linux*)
+      case $cc_basename in
+        icc* | ecc*)
+          wl='-Wl,'
+          ;;
+        pgcc | pgf77 | pgf90)
+          wl='-Wl,'
+          ;;
+        ccc*)
+          wl='-Wl,'
+          ;;
+        como)
+          wl='-lopt='
+          ;;
+        *)
+          case `$CC -V 2>&1 | sed 5q` in
+            *Sun\ C*)
+              wl='-Wl,'
+              ;;
+          esac
+          ;;
+      esac
+      ;;
+    osf3* | osf4* | osf5*)
+      wl='-Wl,'
+      ;;
+    sco3.2v5*)
+      ;;
+    solaris*)
+      wl='-Wl,'
+      ;;
+    sunos4*)
+      wl='-Qoption ld '
+      ;;
+    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+      wl='-Wl,'
+      ;;
+    sysv4*MP*)
+      ;;
+    unicos*)
+      wl='-Wl,'
+      ;;
+    uts4*)
+      ;;
+  esac
+fi
+
+# Code taken from libtool.m4's AC_LIBTOOL_PROG_LD_SHLIBS.
+
+hardcode_libdir_flag_spec=
+hardcode_libdir_separator=
+hardcode_direct=no
+hardcode_minus_L=no
+
+case "$host_os" in
+  cygwin* | mingw* | pw32*)
+    # FIXME: the MSVC++ port hasn't been tested in a loooong time
+    # When not using gcc, we currently assume that we are using
+    # Microsoft Visual C++.
+    if test "$GCC" != yes; then
+      with_gnu_ld=no
+    fi
+    ;;
+  interix*)
+    # we just hope/assume this is gcc and not c89 (= MSVC++)
+    with_gnu_ld=yes
+    ;;
+  openbsd*)
+    with_gnu_ld=no
+    ;;
+esac
+
+ld_shlibs=yes
+if test "$with_gnu_ld" = yes; then
+  # Set some defaults for GNU ld with shared library support. These
+  # are reset later if shared libraries are not supported. Putting them
+  # here allows them to be overridden if necessary.
+  # Unlike libtool, we use -rpath here, not --rpath, since the documented
+  # option of GNU ld is called -rpath, not --rpath.
+  hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+  case "$host_os" in
+    aix3* | aix4* | aix5*)
+      # On AIX/PPC, the GNU linker is very broken
+      if test "$host_cpu" != ia64; then
+        ld_shlibs=no
+      fi
+      ;;
+    amigaos*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_minus_L=yes
+      # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
+      # that the semantics of dynamic libraries on AmigaOS, at least up
+      # to version 4, is to share data among multiple programs linked
+      # with the same dynamic library.  Since this doesn't match the
+      # behavior of shared libraries on other platforms, we cannot use
+      # them.
+      ld_shlibs=no
+      ;;
+    beos*)
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+        :
+      else
+        ld_shlibs=no
+      fi
+      ;;
+    cygwin* | mingw* | pw32*)
+      # hardcode_libdir_flag_spec is actually meaningless, as there is
+      # no search path for DLLs.
+      hardcode_libdir_flag_spec='-L$libdir'
+      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+        :
+      else
+        ld_shlibs=no
+      fi
+      ;;
+    interix3*)
+      hardcode_direct=no
+      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+      ;;
+    linux*)
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+        :
+      else
+        ld_shlibs=no
+      fi
+      ;;
+    netbsd*)
+      ;;
+    solaris*)
+      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
+        ld_shlibs=no
+      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+        :
+      else
+        ld_shlibs=no
+      fi
+      ;;
+    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+      case `$LD -v 2>&1` in
+        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
+          ld_shlibs=no
+          ;;
+        *)
+          if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+            hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
+          else
+            ld_shlibs=no
+          fi
+          ;;
+      esac
+      ;;
+    sunos4*)
+      hardcode_direct=yes
+      ;;
+    *)
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+        :
+      else
+        ld_shlibs=no
+      fi
+      ;;
+  esac
+  if test "$ld_shlibs" = no; then
+    hardcode_libdir_flag_spec=
+  fi
+else
+  case "$host_os" in
+    aix3*)
+      # Note: this linker hardcodes the directories in LIBPATH if there
+      # are no directories specified by -L.
+      hardcode_minus_L=yes
+      if test "$GCC" = yes; then
+        # Neither direct hardcoding nor static linking is supported with a
+        # broken collect2.
+        hardcode_direct=unsupported
+      fi
+      ;;
+    aix4* | aix5*)
+      if test "$host_cpu" = ia64; then
+        # On IA64, the linker does run time linking by default, so we don't
+        # have to do anything special.
+        aix_use_runtimelinking=no
+      else
+        aix_use_runtimelinking=no
+        # Test if we are trying to use run time linking or normal
+        # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+        # need to do runtime linking.
+        case $host_os in aix4.[23]|aix4.[23].*|aix5*)
+          for ld_flag in $LDFLAGS; do
+            if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+              aix_use_runtimelinking=yes
+              break
+            fi
+          done
+          ;;
+        esac
+      fi
+      hardcode_direct=yes
+      hardcode_libdir_separator=':'
+      if test "$GCC" = yes; then
+        case $host_os in aix4.[012]|aix4.[012].*)
+          collect2name=`${CC} -print-prog-name=collect2`
+          if test -f "$collect2name" && \
+            strings "$collect2name" | grep resolve_lib_name >/dev/null
+          then
+            # We have reworked collect2
+            hardcode_direct=yes
+          else
+            # We have old collect2
+            hardcode_direct=unsupported
+            hardcode_minus_L=yes
+            hardcode_libdir_flag_spec='-L$libdir'
+            hardcode_libdir_separator=
+          fi
+          ;;
+        esac
+      fi
+      # Begin _LT_AC_SYS_LIBPATH_AIX.
+      echo 'int main () { return 0; }' > conftest.c
+      ${CC} ${LDFLAGS} conftest.c -o conftest
+      aix_libpath=`dump -H conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+}'`
+      if test -z "$aix_libpath"; then
+        aix_libpath=`dump -HX64 conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+}'`
+      fi
+      if test -z "$aix_libpath"; then
+        aix_libpath="/usr/lib:/lib"
+      fi
+      rm -f conftest.c conftest
+      # End _LT_AC_SYS_LIBPATH_AIX.
+      if test "$aix_use_runtimelinking" = yes; then
+        hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
+      else
+        if test "$host_cpu" = ia64; then
+          hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
+        else
+          hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
+        fi
+      fi
+      ;;
+    amigaos*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_minus_L=yes
+      # see comment about different semantics on the GNU ld section
+      ld_shlibs=no
+      ;;
+    bsdi[45]*)
+      ;;
+    cygwin* | mingw* | pw32*)
+      # When not using gcc, we currently assume that we are using
+      # Microsoft Visual C++.
+      # hardcode_libdir_flag_spec is actually meaningless, as there is
+      # no search path for DLLs.
+      hardcode_libdir_flag_spec=' '
+      libext=lib
+      ;;
+    darwin* | rhapsody*)
+      hardcode_direct=no
+      if test "$GCC" = yes ; then
+        :
+      else
+        case $cc_basename in
+          xlc*)
+            ;;
+          *)
+            ld_shlibs=no
+            ;;
+        esac
+      fi
+      ;;
+    dgux*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      ;;
+    freebsd1*)
+      ld_shlibs=no
+      ;;
+    freebsd2.2*)
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      ;;
+    freebsd2*)
+      hardcode_direct=yes
+      hardcode_minus_L=yes
+      ;;
+    freebsd* | kfreebsd*-gnu | dragonfly*)
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      ;;
+    hpux9*)
+      hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+      hardcode_libdir_separator=:
+      hardcode_direct=yes
+      # hardcode_minus_L: Not really in the search PATH,
+      # but as the default location of the library.
+      hardcode_minus_L=yes
+      ;;
+    hpux10*)
+      if test "$with_gnu_ld" = no; then
+        hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+        hardcode_libdir_separator=:
+        hardcode_direct=yes
+        # hardcode_minus_L: Not really in the search PATH,
+        # but as the default location of the library.
+        hardcode_minus_L=yes
+      fi
+      ;;
+    hpux11*)
+      if test "$with_gnu_ld" = no; then
+        hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+        hardcode_libdir_separator=:
+        case $host_cpu in
+          hppa*64*|ia64*)
+            hardcode_direct=no
+            ;;
+          *)
+            hardcode_direct=yes
+            # hardcode_minus_L: Not really in the search PATH,
+            # but as the default location of the library.
+            hardcode_minus_L=yes
+            ;;
+        esac
+      fi
+      ;;
+    irix5* | irix6* | nonstopux*)
+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_separator=:
+      ;;
+    netbsd*)
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      ;;
+    newsos6)
+      hardcode_direct=yes
+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_separator=:
+      ;;
+    openbsd*)
+      hardcode_direct=yes
+      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+        hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+      else
+        case "$host_os" in
+          openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+            hardcode_libdir_flag_spec='-R$libdir'
+            ;;
+          *)
+            hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+            ;;
+        esac
+      fi
+      ;;
+    os2*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_minus_L=yes
+      ;;
+    osf3*)
+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_separator=:
+      ;;
+    osf4* | osf5*)
+      if test "$GCC" = yes; then
+        hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      else
+        # Both cc and cxx compiler support -rpath directly
+        hardcode_libdir_flag_spec='-rpath $libdir'
+      fi
+      hardcode_libdir_separator=:
+      ;;
+    solaris*)
+      hardcode_libdir_flag_spec='-R$libdir'
+      ;;
+    sunos4*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_direct=yes
+      hardcode_minus_L=yes
+      ;;
+    sysv4)
+      case $host_vendor in
+        sni)
+          hardcode_direct=yes # is this really true???
+          ;;
+        siemens)
+          hardcode_direct=no
+          ;;
+        motorola)
+          hardcode_direct=no #Motorola manual says yes, but my tests say they lie
+          ;;
+      esac
+      ;;
+    sysv4.3*)
+      ;;
+    sysv4*MP*)
+      if test -d /usr/nec; then
+        ld_shlibs=yes
+      fi
+      ;;
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
+      ;;
+    sysv5* | sco3.2v5* | sco5v6*)
+      hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
+      hardcode_libdir_separator=':'
+      ;;
+    uts4*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      ;;
+    *)
+      ld_shlibs=no
+      ;;
+  esac
+fi
+
+# Check dynamic linker characteristics
+# Code taken from libtool.m4's AC_LIBTOOL_SYS_DYNAMIC_LINKER.
+libname_spec='lib$name'
+case "$host_os" in
+  aix3*)
+    ;;
+  aix4* | aix5*)
+    ;;
+  amigaos*)
+    ;;
+  beos*)
+    ;;
+  bsdi[45]*)
+    ;;
+  cygwin* | mingw* | pw32*)
+    shrext=.dll
+    ;;
+  darwin* | rhapsody*)
+    shrext=.dylib
+    ;;
+  dgux*)
+    ;;
+  freebsd1*)
+    ;;
+  kfreebsd*-gnu)
+    ;;
+  freebsd* | dragonfly*)
+    ;;
+  gnu*)
+    ;;
+  hpux9* | hpux10* | hpux11*)
+    case $host_cpu in
+      ia64*)
+        shrext=.so
+        ;;
+      hppa*64*)
+        shrext=.sl
+        ;;
+      *)
+        shrext=.sl
+        ;;
+    esac
+    ;;
+  interix3*)
+    ;;
+  irix5* | irix6* | nonstopux*)
+    case "$host_os" in
+      irix5* | nonstopux*)
+        libsuff= shlibsuff=
+        ;;
+      *)
+        case $LD in
+          *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") libsuff= shlibsuff= ;;
+          *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") libsuff=32 shlibsuff=N32 ;;
+          *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") libsuff=64 shlibsuff=64 ;;
+          *) libsuff= shlibsuff= ;;
+        esac
+        ;;
+    esac
+    ;;
+  linux*oldld* | linux*aout* | linux*coff*)
+    ;;
+  linux*)
+    ;;
+  knetbsd*-gnu)
+    ;;
+  netbsd*)
+    ;;
+  newsos6)
+    ;;
+  nto-qnx*)
+    ;;
+  openbsd*)
+    ;;
+  os2*)
+    libname_spec='$name'
+    shrext=.dll
+    ;;
+  osf3* | osf4* | osf5*)
+    ;;
+  solaris*)
+    ;;
+  sunos4*)
+    ;;
+  sysv4 | sysv4.3*)
+    ;;
+  sysv4*MP*)
+    ;;
+  sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+    ;;
+  uts4*)
+    ;;
+esac
+
+sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
+escaped_wl=`echo "X$wl" | sed -e 's/^X//' -e "$sed_quote_subst"`
+shlibext=`echo "$shrext" | sed -e 's,^\.,,'`
+escaped_hardcode_libdir_flag_spec=`echo "X$hardcode_libdir_flag_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
+
+LC_ALL=C sed -e 's/^\([a-zA-Z0-9_]*\)=/acl_cv_\1=/' <<EOF
+
+# How to pass a linker flag through the compiler.
+wl="$escaped_wl"
+
+# Static library suffix (normally "a").
+libext="$libext"
+
+# Shared library suffix (normally "so").
+shlibext="$shlibext"
+
+# Flag to hardcode \$libdir into a binary during linking.
+# This must work even if \$libdir does not exist.
+hardcode_libdir_flag_spec="$escaped_hardcode_libdir_flag_spec"
+
+# Whether we need a single -rpath flag with a separated argument.
+hardcode_libdir_separator="$hardcode_libdir_separator"
+
+# Set to yes if using DIR/libNAME.so during linking hardcodes DIR into the
+# resulting binary.
+hardcode_direct="$hardcode_direct"
+
+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
+# resulting binary.
+hardcode_minus_L="$hardcode_minus_L"
+
+EOF
diff --git a/cpp/build-aux/config.sub b/cpp/build-aux/config.sub
new file mode 100755
index 0000000000..7ccee73057
--- /dev/null
+++ b/cpp/build-aux/config.sub
@@ -0,0 +1,1619 @@
+#! /bin/sh
+# Configuration validation subroutine script.
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+#   Inc.
+
+timestamp='2006-11-07'
+
+# This file is (in principle) common to ALL GNU software.
+# The presence of a machine in this file suggests that SOME GNU software
+# can handle that machine.  It does not imply ALL GNU software can.
+#
+# This file is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+# 02110-1301, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+
+# Please send patches to <config-patches@gnu.org>.  Submit a context
+# diff and a properly formatted ChangeLog entry.
+#
+# Configuration subroutine to validate and canonicalize a configuration type.
+# Supply the specified configuration type as an argument.
+# If it is invalid, we print an error message on stderr and exit with code 1.
+# Otherwise, we print the canonical config type on stdout and succeed.
+
+# This file is supposed to be the same for all GNU packages
+# and recognize all the CPU types, system types and aliases
+# that are meaningful with *any* GNU software.
+# Each package is responsible for reporting which valid configurations
+# it does not support.  The user should be able to distinguish
+# a failure to support a valid configuration from a meaningless
+# configuration.
+
+# The goal of this file is to map all the various variations of a given
+# machine specification into a single specification in the form:
+#	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
+# or in some cases, the newer four-part form:
+#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
+# It is wrong to echo any other type of specification.
+
+me=`echo "$0" | sed -e 's,.*/,,'`
+
+usage="\
+Usage: $0 [OPTION] CPU-MFR-OPSYS
+       $0 [OPTION] ALIAS
+
+Canonicalize a configuration name.
+
+Operation modes:
+  -h, --help         print this help, then exit
+  -t, --time-stamp   print date of last modification, then exit
+  -v, --version      print version number, then exit
+
+Report bugs and patches to <config-patches@gnu.org>."
+
+version="\
+GNU config.sub ($timestamp)
+
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+Free Software Foundation, Inc.
+
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+
+help="
+Try \`$me --help' for more information."
+
+# Parse command line
+while test $# -gt 0 ; do
+  case $1 in
+    --time-stamp | --time* | -t )
+       echo "$timestamp" ; exit ;;
+    --version | -v )
+       echo "$version" ; exit ;;
+    --help | --h* | -h )
+       echo "$usage"; exit ;;
+    -- )     # Stop option processing
+       shift; break ;;
+    - )	# Use stdin as input.
+       break ;;
+    -* )
+       echo "$me: invalid option $1$help"
+       exit 1 ;;
+
+    *local*)
+       # First pass through any local machine types.
+       echo $1
+       exit ;;
+
+    * )
+       break ;;
+  esac
+done
+
+case $# in
+ 0) echo "$me: missing argument$help" >&2
+    exit 1;;
+ 1) ;;
+ *) echo "$me: too many arguments$help" >&2
+    exit 1;;
+esac
+
+# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
+# Here we must recognize all the valid KERNEL-OS combinations.
+maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+case $maybe_os in
+  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
+  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
+  storm-chaos* | os2-emx* | rtmk-nova*)
+    os=-$maybe_os
+    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
+    ;;
+  *)
+    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
+    if [ $basic_machine != $1 ]
+    then os=`echo $1 | sed 's/.*-/-/'`
+    else os=; fi
+    ;;
+esac
+
+### Let's recognize common machines as not being operating systems so
+### that things like config.sub decstation-3100 work.  We also
+### recognize some manufacturers as not being operating systems, so we
+### can provide default operating systems below.
+case $os in
+	-sun*os*)
+		# Prevent following clause from handling this invalid input.
+		;;
+	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
+	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
+	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
+	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
+	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
+	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
+	-apple | -axis | -knuth | -cray)
+		os=
+		basic_machine=$1
+		;;
+	-sim | -cisco | -oki | -wec | -winbond)
+		os=
+		basic_machine=$1
+		;;
+	-scout)
+		;;
+	-wrs)
+		os=-vxworks
+		basic_machine=$1
+		;;
+	-chorusos*)
+		os=-chorusos
+		basic_machine=$1
+		;;
+ 	-chorusrdb)
+ 		os=-chorusrdb
+		basic_machine=$1
+ 		;;
+	-hiux*)
+		os=-hiuxwe2
+		;;
+	-sco6)
+		os=-sco5v6
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco5)
+		os=-sco3.2v5
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco4)
+		os=-sco3.2v4
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco3.2.[4-9]*)
+		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco3.2v[4-9]*)
+		# Don't forget version if it is 3.2v4 or newer.
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco5v6*)
+		# Don't forget version if it is 3.2v4 or newer.
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco*)
+		os=-sco3.2v2
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-udk*)
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-isc)
+		os=-isc2.2
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-clix*)
+		basic_machine=clipper-intergraph
+		;;
+	-isc*)
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-lynx*)
+		os=-lynxos
+		;;
+	-ptx*)
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
+		;;
+	-windowsnt*)
+		os=`echo $os | sed -e 's/windowsnt/winnt/'`
+		;;
+	-psos*)
+		os=-psos
+		;;
+	-mint | -mint[0-9]*)
+		basic_machine=m68k-atari
+		os=-mint
+		;;
+esac
+
+# Decode aliases for certain CPU-COMPANY combinations.
+case $basic_machine in
+	# Recognize the basic CPU types without company name.
+	# Some are omitted here because they have special meanings below.
+	1750a | 580 \
+	| a29k \
+	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
+	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+	| am33_2.0 \
+	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
+	| bfin \
+	| c4x | clipper \
+	| d10v | d30v | dlx | dsp16xx \
+	| fr30 | frv \
+	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+	| i370 | i860 | i960 | ia64 \
+	| ip2k | iq2000 \
+	| m32c | m32r | m32rle | m68000 | m68k | m88k \
+	| maxq | mb | microblaze | mcore \
+	| mips | mipsbe | mipseb | mipsel | mipsle \
+	| mips16 \
+	| mips64 | mips64el \
+	| mips64vr | mips64vrel \
+	| mips64orion | mips64orionel \
+	| mips64vr4100 | mips64vr4100el \
+	| mips64vr4300 | mips64vr4300el \
+	| mips64vr5000 | mips64vr5000el \
+	| mips64vr5900 | mips64vr5900el \
+	| mipsisa32 | mipsisa32el \
+	| mipsisa32r2 | mipsisa32r2el \
+	| mipsisa64 | mipsisa64el \
+	| mipsisa64r2 | mipsisa64r2el \
+	| mipsisa64sb1 | mipsisa64sb1el \
+	| mipsisa64sr71k | mipsisa64sr71kel \
+	| mipstx39 | mipstx39el \
+	| mn10200 | mn10300 \
+	| mt \
+	| msp430 \
+	| nios | nios2 \
+	| ns16k | ns32k \
+	| or32 \
+	| pdp10 | pdp11 | pj | pjl \
+	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
+	| pyramid \
+	| score \
+	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+	| sh64 | sh64le \
+	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
+	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
+	| spu | strongarm \
+	| tahoe | thumb | tic4x | tic80 | tron \
+	| v850 | v850e \
+	| we32k \
+	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
+	| z8k)
+		basic_machine=$basic_machine-unknown
+		;;
+	m6811 | m68hc11 | m6812 | m68hc12)
+		# Motorola 68HC11/12.
+		basic_machine=$basic_machine-unknown
+		os=-none
+		;;
+	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
+		;;
+	ms1)
+		basic_machine=mt-unknown
+		;;
+
+	# We use `pc' rather than `unknown'
+	# because (1) that's what they normally are, and
+	# (2) the word "unknown" tends to confuse beginning users.
+	i*86 | x86_64)
+	  basic_machine=$basic_machine-pc
+	  ;;
+	# Object if more than one company name word.
+	*-*-*)
+		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+		exit 1
+		;;
+	# Recognize the basic CPU types with company name.
+	580-* \
+	| a29k-* \
+	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
+	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
+	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
+	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
+	| avr-* | avr32-* \
+	| bfin-* | bs2000-* \
+	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
+	| clipper-* | craynv-* | cydra-* \
+	| d10v-* | d30v-* | dlx-* \
+	| elxsi-* \
+	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
+	| h8300-* | h8500-* \
+	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+	| i*86-* | i860-* | i960-* | ia64-* \
+	| ip2k-* | iq2000-* \
+	| m32c-* | m32r-* | m32rle-* \
+	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
+	| m88110-* | m88k-* | maxq-* | mcore-* \
+	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
+	| mips16-* \
+	| mips64-* | mips64el-* \
+	| mips64vr-* | mips64vrel-* \
+	| mips64orion-* | mips64orionel-* \
+	| mips64vr4100-* | mips64vr4100el-* \
+	| mips64vr4300-* | mips64vr4300el-* \
+	| mips64vr5000-* | mips64vr5000el-* \
+	| mips64vr5900-* | mips64vr5900el-* \
+	| mipsisa32-* | mipsisa32el-* \
+	| mipsisa32r2-* | mipsisa32r2el-* \
+	| mipsisa64-* | mipsisa64el-* \
+	| mipsisa64r2-* | mipsisa64r2el-* \
+	| mipsisa64sb1-* | mipsisa64sb1el-* \
+	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
+	| mipstx39-* | mipstx39el-* \
+	| mmix-* \
+	| mt-* \
+	| msp430-* \
+	| nios-* | nios2-* \
+	| none-* | np1-* | ns16k-* | ns32k-* \
+	| orion-* \
+	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
+	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
+	| pyramid-* \
+	| romp-* | rs6000-* \
+	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
+	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
+	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
+	| sparclite-* \
+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
+	| tahoe-* | thumb-* \
+	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+	| tron-* \
+	| v850-* | v850e-* | vax-* \
+	| we32k-* \
+	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
+	| xstormy16-* | xtensa-* \
+	| ymp-* \
+	| z8k-*)
+		;;
+	# Recognize the various machine names and aliases which stand
+	# for a CPU type and a company and sometimes even an OS.
+	386bsd)
+		basic_machine=i386-unknown
+		os=-bsd
+		;;
+	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
+		basic_machine=m68000-att
+		;;
+	3b*)
+		basic_machine=we32k-att
+		;;
+	a29khif)
+		basic_machine=a29k-amd
+		os=-udi
+		;;
+    	abacus)
+		basic_machine=abacus-unknown
+		;;
+	adobe68k)
+		basic_machine=m68010-adobe
+		os=-scout
+		;;
+	alliant | fx80)
+		basic_machine=fx80-alliant
+		;;
+	altos | altos3068)
+		basic_machine=m68k-altos
+		;;
+	am29k)
+		basic_machine=a29k-none
+		os=-bsd
+		;;
+	amd64)
+		basic_machine=x86_64-pc
+		;;
+	amd64-*)
+		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	amdahl)
+		basic_machine=580-amdahl
+		os=-sysv
+		;;
+	amiga | amiga-*)
+		basic_machine=m68k-unknown
+		;;
+	amigaos | amigados)
+		basic_machine=m68k-unknown
+		os=-amigaos
+		;;
+	amigaunix | amix)
+		basic_machine=m68k-unknown
+		os=-sysv4
+		;;
+	apollo68)
+		basic_machine=m68k-apollo
+		os=-sysv
+		;;
+	apollo68bsd)
+		basic_machine=m68k-apollo
+		os=-bsd
+		;;
+	aux)
+		basic_machine=m68k-apple
+		os=-aux
+		;;
+	balance)
+		basic_machine=ns32k-sequent
+		os=-dynix
+		;;
+	c90)
+		basic_machine=c90-cray
+		os=-unicos
+		;;
+	convex-c1)
+		basic_machine=c1-convex
+		os=-bsd
+		;;
+	convex-c2)
+		basic_machine=c2-convex
+		os=-bsd
+		;;
+	convex-c32)
+		basic_machine=c32-convex
+		os=-bsd
+		;;
+	convex-c34)
+		basic_machine=c34-convex
+		os=-bsd
+		;;
+	convex-c38)
+		basic_machine=c38-convex
+		os=-bsd
+		;;
+	cray | j90)
+		basic_machine=j90-cray
+		os=-unicos
+		;;
+	craynv)
+		basic_machine=craynv-cray
+		os=-unicosmp
+		;;
+	cr16c)
+		basic_machine=cr16c-unknown
+		os=-elf
+		;;
+	crds | unos)
+		basic_machine=m68k-crds
+		;;
+	crisv32 | crisv32-* | etraxfs*)
+		basic_machine=crisv32-axis
+		;;
+	cris | cris-* | etrax*)
+		basic_machine=cris-axis
+		;;
+	crx)
+		basic_machine=crx-unknown
+		os=-elf
+		;;
+	da30 | da30-*)
+		basic_machine=m68k-da30
+		;;
+	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
+		basic_machine=mips-dec
+		;;
+	decsystem10* | dec10*)
+		basic_machine=pdp10-dec
+		os=-tops10
+		;;
+	decsystem20* | dec20*)
+		basic_machine=pdp10-dec
+		os=-tops20
+		;;
+	delta | 3300 | motorola-3300 | motorola-delta \
+	      | 3300-motorola | delta-motorola)
+		basic_machine=m68k-motorola
+		;;
+	delta88)
+		basic_machine=m88k-motorola
+		os=-sysv3
+		;;
+	djgpp)
+		basic_machine=i586-pc
+		os=-msdosdjgpp
+		;;
+	dpx20 | dpx20-*)
+		basic_machine=rs6000-bull
+		os=-bosx
+		;;
+	dpx2* | dpx2*-bull)
+		basic_machine=m68k-bull
+		os=-sysv3
+		;;
+	ebmon29k)
+		basic_machine=a29k-amd
+		os=-ebmon
+		;;
+	elxsi)
+		basic_machine=elxsi-elxsi
+		os=-bsd
+		;;
+	encore | umax | mmax)
+		basic_machine=ns32k-encore
+		;;
+	es1800 | OSE68k | ose68k | ose | OSE)
+		basic_machine=m68k-ericsson
+		os=-ose
+		;;
+	fx2800)
+		basic_machine=i860-alliant
+		;;
+	genix)
+		basic_machine=ns32k-ns
+		;;
+	gmicro)
+		basic_machine=tron-gmicro
+		os=-sysv
+		;;
+	go32)
+		basic_machine=i386-pc
+		os=-go32
+		;;
+	h3050r* | hiux*)
+		basic_machine=hppa1.1-hitachi
+		os=-hiuxwe2
+		;;
+	h8300hms)
+		basic_machine=h8300-hitachi
+		os=-hms
+		;;
+	h8300xray)
+		basic_machine=h8300-hitachi
+		os=-xray
+		;;
+	h8500hms)
+		basic_machine=h8500-hitachi
+		os=-hms
+		;;
+	harris)
+		basic_machine=m88k-harris
+		os=-sysv3
+		;;
+	hp300-*)
+		basic_machine=m68k-hp
+		;;
+	hp300bsd)
+		basic_machine=m68k-hp
+		os=-bsd
+		;;
+	hp300hpux)
+		basic_machine=m68k-hp
+		os=-hpux
+		;;
+	hp3k9[0-9][0-9] | hp9[0-9][0-9])
+		basic_machine=hppa1.0-hp
+		;;
+	hp9k2[0-9][0-9] | hp9k31[0-9])
+		basic_machine=m68000-hp
+		;;
+	hp9k3[2-9][0-9])
+		basic_machine=m68k-hp
+		;;
+	hp9k6[0-9][0-9] | hp6[0-9][0-9])
+		basic_machine=hppa1.0-hp
+		;;
+	hp9k7[0-79][0-9] | hp7[0-79][0-9])
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k78[0-9] | hp78[0-9])
+		# FIXME: really hppa2.0-hp
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
+		# FIXME: really hppa2.0-hp
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k8[0-9][13679] | hp8[0-9][13679])
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k8[0-9][0-9] | hp8[0-9][0-9])
+		basic_machine=hppa1.0-hp
+		;;
+	hppa-next)
+		os=-nextstep3
+		;;
+	hppaosf)
+		basic_machine=hppa1.1-hp
+		os=-osf
+		;;
+	hppro)
+		basic_machine=hppa1.1-hp
+		os=-proelf
+		;;
+	i370-ibm* | ibm*)
+		basic_machine=i370-ibm
+		;;
+# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
+	i*86v32)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-sysv32
+		;;
+	i*86v4*)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-sysv4
+		;;
+	i*86v)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-sysv
+		;;
+	i*86sol2)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-solaris2
+		;;
+	i386mach)
+		basic_machine=i386-mach
+		os=-mach
+		;;
+	i386-vsta | vsta)
+		basic_machine=i386-unknown
+		os=-vsta
+		;;
+	iris | iris4d)
+		basic_machine=mips-sgi
+		case $os in
+		    -irix*)
+			;;
+		    *)
+			os=-irix4
+			;;
+		esac
+		;;
+	isi68 | isi)
+		basic_machine=m68k-isi
+		os=-sysv
+		;;
+	m88k-omron*)
+		basic_machine=m88k-omron
+		;;
+	magnum | m3230)
+		basic_machine=mips-mips
+		os=-sysv
+		;;
+	merlin)
+		basic_machine=ns32k-utek
+		os=-sysv
+		;;
+	mingw32)
+		basic_machine=i386-pc
+		os=-mingw32
+		;;
+	miniframe)
+		basic_machine=m68000-convergent
+		;;
+	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
+		basic_machine=m68k-atari
+		os=-mint
+		;;
+	mips3*-*)
+		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
+		;;
+	mips3*)
+		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
+		;;
+	monitor)
+		basic_machine=m68k-rom68k
+		os=-coff
+		;;
+	morphos)
+		basic_machine=powerpc-unknown
+		os=-morphos
+		;;
+	msdos)
+		basic_machine=i386-pc
+		os=-msdos
+		;;
+	ms1-*)
+		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
+		;;
+	mvs)
+		basic_machine=i370-ibm
+		os=-mvs
+		;;
+	ncr3000)
+		basic_machine=i486-ncr
+		os=-sysv4
+		;;
+	netbsd386)
+		basic_machine=i386-unknown
+		os=-netbsd
+		;;
+	netwinder)
+		basic_machine=armv4l-rebel
+		os=-linux
+		;;
+	news | news700 | news800 | news900)
+		basic_machine=m68k-sony
+		os=-newsos
+		;;
+	news1000)
+		basic_machine=m68030-sony
+		os=-newsos
+		;;
+	news-3600 | risc-news)
+		basic_machine=mips-sony
+		os=-newsos
+		;;
+	necv70)
+		basic_machine=v70-nec
+		os=-sysv
+		;;
+	next | m*-next )
+		basic_machine=m68k-next
+		case $os in
+		    -nextstep* )
+			;;
+		    -ns2*)
+		      os=-nextstep2
+			;;
+		    *)
+		      os=-nextstep3
+			;;
+		esac
+		;;
+	nh3000)
+		basic_machine=m68k-harris
+		os=-cxux
+		;;
+	nh[45]000)
+		basic_machine=m88k-harris
+		os=-cxux
+		;;
+	nindy960)
+		basic_machine=i960-intel
+		os=-nindy
+		;;
+	mon960)
+		basic_machine=i960-intel
+		os=-mon960
+		;;
+	nonstopux)
+		basic_machine=mips-compaq
+		os=-nonstopux
+		;;
+	np1)
+		basic_machine=np1-gould
+		;;
+	nsr-tandem)
+		basic_machine=nsr-tandem
+		;;
+	op50n-* | op60c-*)
+		basic_machine=hppa1.1-oki
+		os=-proelf
+		;;
+	openrisc | openrisc-*)
+		basic_machine=or32-unknown
+		;;
+	os400)
+		basic_machine=powerpc-ibm
+		os=-os400
+		;;
+	OSE68000 | ose68000)
+		basic_machine=m68000-ericsson
+		os=-ose
+		;;
+	os68k)
+		basic_machine=m68k-none
+		os=-os68k
+		;;
+	pa-hitachi)
+		basic_machine=hppa1.1-hitachi
+		os=-hiuxwe2
+		;;
+	paragon)
+		basic_machine=i860-intel
+		os=-osf
+		;;
+	pbd)
+		basic_machine=sparc-tti
+		;;
+	pbb)
+		basic_machine=m68k-tti
+		;;
+	pc532 | pc532-*)
+		basic_machine=ns32k-pc532
+		;;
+	pc98)
+		basic_machine=i386-pc
+		;;
+	pc98-*)
+		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentium | p5 | k5 | k6 | nexgen | viac3)
+		basic_machine=i586-pc
+		;;
+	pentiumpro | p6 | 6x86 | athlon | athlon_*)
+		basic_machine=i686-pc
+		;;
+	pentiumii | pentium2 | pentiumiii | pentium3)
+		basic_machine=i686-pc
+		;;
+	pentium4)
+		basic_machine=i786-pc
+		;;
+	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
+		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentiumpro-* | p6-* | 6x86-* | athlon-*)
+		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
+		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentium4-*)
+		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pn)
+		basic_machine=pn-gould
+		;;
+	power)	basic_machine=power-ibm
+		;;
+	ppc)	basic_machine=powerpc-unknown
+		;;
+	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ppcle | powerpclittle | ppc-le | powerpc-little)
+		basic_machine=powerpcle-unknown
+		;;
+	ppcle-* | powerpclittle-*)
+		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ppc64)	basic_machine=powerpc64-unknown
+		;;
+	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
+		basic_machine=powerpc64le-unknown
+		;;
+	ppc64le-* | powerpc64little-*)
+		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ps2)
+		basic_machine=i386-ibm
+		;;
+	pw32)
+		basic_machine=i586-unknown
+		os=-pw32
+		;;
+	rdos)
+		basic_machine=i386-pc
+		os=-rdos
+		;;
+	rom68k)
+		basic_machine=m68k-rom68k
+		os=-coff
+		;;
+	rm[46]00)
+		basic_machine=mips-siemens
+		;;
+	rtpc | rtpc-*)
+		basic_machine=romp-ibm
+		;;
+	s390 | s390-*)
+		basic_machine=s390-ibm
+		;;
+	s390x | s390x-*)
+		basic_machine=s390x-ibm
+		;;
+	sa29200)
+		basic_machine=a29k-amd
+		os=-udi
+		;;
+	sb1)
+		basic_machine=mipsisa64sb1-unknown
+		;;
+	sb1el)
+		basic_machine=mipsisa64sb1el-unknown
+		;;
+	sde)
+		basic_machine=mipsisa32-sde
+		os=-elf
+		;;
+	sei)
+		basic_machine=mips-sei
+		os=-seiux
+		;;
+	sequent)
+		basic_machine=i386-sequent
+		;;
+	sh)
+		basic_machine=sh-hitachi
+		os=-hms
+		;;
+	sh5el)
+		basic_machine=sh5le-unknown
+		;;
+	sh64)
+		basic_machine=sh64-unknown
+		;;
+	sparclite-wrs | simso-wrs)
+		basic_machine=sparclite-wrs
+		os=-vxworks
+		;;
+	sps7)
+		basic_machine=m68k-bull
+		os=-sysv2
+		;;
+	spur)
+		basic_machine=spur-unknown
+		;;
+	st2000)
+		basic_machine=m68k-tandem
+		;;
+	stratus)
+		basic_machine=i860-stratus
+		os=-sysv4
+		;;
+	sun2)
+		basic_machine=m68000-sun
+		;;
+	sun2os3)
+		basic_machine=m68000-sun
+		os=-sunos3
+		;;
+	sun2os4)
+		basic_machine=m68000-sun
+		os=-sunos4
+		;;
+	sun3os3)
+		basic_machine=m68k-sun
+		os=-sunos3
+		;;
+	sun3os4)
+		basic_machine=m68k-sun
+		os=-sunos4
+		;;
+	sun4os3)
+		basic_machine=sparc-sun
+		os=-sunos3
+		;;
+	sun4os4)
+		basic_machine=sparc-sun
+		os=-sunos4
+		;;
+	sun4sol2)
+		basic_machine=sparc-sun
+		os=-solaris2
+		;;
+	sun3 | sun3-*)
+		basic_machine=m68k-sun
+		;;
+	sun4)
+		basic_machine=sparc-sun
+		;;
+	sun386 | sun386i | roadrunner)
+		basic_machine=i386-sun
+		;;
+	sv1)
+		basic_machine=sv1-cray
+		os=-unicos
+		;;
+	symmetry)
+		basic_machine=i386-sequent
+		os=-dynix
+		;;
+	t3e)
+		basic_machine=alphaev5-cray
+		os=-unicos
+		;;
+	t90)
+		basic_machine=t90-cray
+		os=-unicos
+		;;
+	tic54x | c54x*)
+		basic_machine=tic54x-unknown
+		os=-coff
+		;;
+	tic55x | c55x*)
+		basic_machine=tic55x-unknown
+		os=-coff
+		;;
+	tic6x | c6x*)
+		basic_machine=tic6x-unknown
+		os=-coff
+		;;
+	tx39)
+		basic_machine=mipstx39-unknown
+		;;
+	tx39el)
+		basic_machine=mipstx39el-unknown
+		;;
+	toad1)
+		basic_machine=pdp10-xkl
+		os=-tops20
+		;;
+	tower | tower-32)
+		basic_machine=m68k-ncr
+		;;
+	tpf)
+		basic_machine=s390x-ibm
+		os=-tpf
+		;;
+	udi29k)
+		basic_machine=a29k-amd
+		os=-udi
+		;;
+	ultra3)
+		basic_machine=a29k-nyu
+		os=-sym1
+		;;
+	v810 | necv810)
+		basic_machine=v810-nec
+		os=-none
+		;;
+	vaxv)
+		basic_machine=vax-dec
+		os=-sysv
+		;;
+	vms)
+		basic_machine=vax-dec
+		os=-vms
+		;;
+	vpp*|vx|vx-*)
+		basic_machine=f301-fujitsu
+		;;
+	vxworks960)
+		basic_machine=i960-wrs
+		os=-vxworks
+		;;
+	vxworks68)
+		basic_machine=m68k-wrs
+		os=-vxworks
+		;;
+	vxworks29k)
+		basic_machine=a29k-wrs
+		os=-vxworks
+		;;
+	w65*)
+		basic_machine=w65-wdc
+		os=-none
+		;;
+	w89k-*)
+		basic_machine=hppa1.1-winbond
+		os=-proelf
+		;;
+	xbox)
+		basic_machine=i686-pc
+		os=-mingw32
+		;;
+	xps | xps100)
+		basic_machine=xps100-honeywell
+		;;
+	ymp)
+		basic_machine=ymp-cray
+		os=-unicos
+		;;
+	z8k-*-coff)
+		basic_machine=z8k-unknown
+		os=-sim
+		;;
+	none)
+		basic_machine=none-none
+		os=-none
+		;;
+
+# Here we handle the default manufacturer of certain CPU types.  It is in
+# some cases the only manufacturer, in others, it is the most popular.
+	w89k)
+		basic_machine=hppa1.1-winbond
+		;;
+	op50n)
+		basic_machine=hppa1.1-oki
+		;;
+	op60c)
+		basic_machine=hppa1.1-oki
+		;;
+	romp)
+		basic_machine=romp-ibm
+		;;
+	mmix)
+		basic_machine=mmix-knuth
+		;;
+	rs6000)
+		basic_machine=rs6000-ibm
+		;;
+	vax)
+		basic_machine=vax-dec
+		;;
+	pdp10)
+		# there are many clones, so DEC is not a safe bet
+		basic_machine=pdp10-unknown
+		;;
+	pdp11)
+		basic_machine=pdp11-dec
+		;;
+	we32k)
+		basic_machine=we32k-att
+		;;
+	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
+		basic_machine=sh-unknown
+		;;
+	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
+		basic_machine=sparc-sun
+		;;
+	cydra)
+		basic_machine=cydra-cydrome
+		;;
+	orion)
+		basic_machine=orion-highlevel
+		;;
+	orion105)
+		basic_machine=clipper-highlevel
+		;;
+	mac | mpw | mac-mpw)
+		basic_machine=m68k-apple
+		;;
+	pmac | pmac-mpw)
+		basic_machine=powerpc-apple
+		;;
+	*-unknown)
+		# Make sure to match an already-canonicalized machine name.
+		;;
+	*)
+		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+		exit 1
+		;;
+esac
+
+# Here we canonicalize certain aliases for manufacturers.
+case $basic_machine in
+	*-digital*)
+		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
+		;;
+	*-commodore*)
+		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
+		;;
+	*)
+		;;
+esac
+
+# Decode manufacturer-specific aliases for certain operating systems.
+
+if [ x"$os" != x"" ]
+then
+case $os in
+        # First match some system type aliases
+        # that might get confused with valid system types.
+	# -solaris* is a basic system type, with this one exception.
+	-solaris1 | -solaris1.*)
+		os=`echo $os | sed -e 's|solaris1|sunos4|'`
+		;;
+	-solaris)
+		os=-solaris2
+		;;
+	-svr4*)
+		os=-sysv4
+		;;
+	-unixware*)
+		os=-sysv4.2uw
+		;;
+	-gnu/linux*)
+		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
+		;;
+	# First accept the basic system types.
+	# The portable systems comes first.
+	# Each alternative MUST END IN A *, to match a version number.
+	# -sysv* is not here because it comes later, after sysvr4.
+	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
+	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
+	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
+	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
+	      | -aos* \
+	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
+	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
+	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
+	      | -openbsd* | -solidbsd* \
+	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
+	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+	      | -chorusos* | -chorusrdb* \
+	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
+	      | -uxpv* | -beos* | -mpeix* | -udk* \
+	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
+	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
+	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
+	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
+	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
+	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
+	      | -skyos* | -haiku* | -rdos* | -toppers*)
+	# Remember, each alternative MUST END IN *, to match a version number.
+		;;
+	-qnx*)
+		case $basic_machine in
+		    x86-* | i*86-*)
+			;;
+		    *)
+			os=-nto$os
+			;;
+		esac
+		;;
+	-nto-qnx*)
+		;;
+	-nto*)
+		os=`echo $os | sed -e 's|nto|nto-qnx|'`
+		;;
+	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
+	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
+	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
+		;;
+	-mac*)
+		os=`echo $os | sed -e 's|mac|macos|'`
+		;;
+	-linux-dietlibc)
+		os=-linux-dietlibc
+		;;
+	-linux*)
+		os=`echo $os | sed -e 's|linux|linux-gnu|'`
+		;;
+	-sunos5*)
+		os=`echo $os | sed -e 's|sunos5|solaris2|'`
+		;;
+	-sunos6*)
+		os=`echo $os | sed -e 's|sunos6|solaris3|'`
+		;;
+	-opened*)
+		os=-openedition
+		;;
+        -os400*)
+		os=-os400
+		;;
+	-wince*)
+		os=-wince
+		;;
+	-osfrose*)
+		os=-osfrose
+		;;
+	-osf*)
+		os=-osf
+		;;
+	-utek*)
+		os=-bsd
+		;;
+	-dynix*)
+		os=-bsd
+		;;
+	-acis*)
+		os=-aos
+		;;
+	-atheos*)
+		os=-atheos
+		;;
+	-syllable*)
+		os=-syllable
+		;;
+	-386bsd)
+		os=-bsd
+		;;
+	-ctix* | -uts*)
+		os=-sysv
+		;;
+	-nova*)
+		os=-rtmk-nova
+		;;
+	-ns2 )
+		os=-nextstep2
+		;;
+	-nsk*)
+		os=-nsk
+		;;
+	# Preserve the version number of sinix5.
+	-sinix5.*)
+		os=`echo $os | sed -e 's|sinix|sysv|'`
+		;;
+	-sinix*)
+		os=-sysv4
+		;;
+        -tpf*)
+		os=-tpf
+		;;
+	-triton*)
+		os=-sysv3
+		;;
+	-oss*)
+		os=-sysv3
+		;;
+	-svr4)
+		os=-sysv4
+		;;
+	-svr3)
+		os=-sysv3
+		;;
+	-sysvr4)
+		os=-sysv4
+		;;
+	# This must come after -sysvr4.
+	-sysv*)
+		;;
+	-ose*)
+		os=-ose
+		;;
+	-es1800*)
+		os=-ose
+		;;
+	-xenix)
+		os=-xenix
+		;;
+	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+		os=-mint
+		;;
+	-aros*)
+		os=-aros
+		;;
+	-kaos*)
+		os=-kaos
+		;;
+	-zvmoe)
+		os=-zvmoe
+		;;
+	-none)
+		;;
+	*)
+		# Get rid of the `-' at the beginning of $os.
+		os=`echo $os | sed 's/[^-]*-//'`
+		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
+		exit 1
+		;;
+esac
+else
+
+# Here we handle the default operating systems that come with various machines.
+# The value should be what the vendor currently ships out the door with their
+# machine or put another way, the most popular os provided with the machine.
+
+# Note that if you're going to try to match "-MANUFACTURER" here (say,
+# "-sun"), then you have to tell the case statement up towards the top
+# that MANUFACTURER isn't an operating system.  Otherwise, code above
+# will signal an error saying that MANUFACTURER isn't an operating
+# system, and we'll never get to this point.
+
+case $basic_machine in
+        score-*)
+		os=-elf
+		;;
+        spu-*)
+		os=-elf
+		;;
+	*-acorn)
+		os=-riscix1.2
+		;;
+	arm*-rebel)
+		os=-linux
+		;;
+	arm*-semi)
+		os=-aout
+		;;
+        c4x-* | tic4x-*)
+        	os=-coff
+		;;
+	# This must come before the *-dec entry.
+	pdp10-*)
+		os=-tops20
+		;;
+	pdp11-*)
+		os=-none
+		;;
+	*-dec | vax-*)
+		os=-ultrix4.2
+		;;
+	m68*-apollo)
+		os=-domain
+		;;
+	i386-sun)
+		os=-sunos4.0.2
+		;;
+	m68000-sun)
+		os=-sunos3
+		# This also exists in the configure program, but was not the
+		# default.
+		# os=-sunos4
+		;;
+	m68*-cisco)
+		os=-aout
+		;;
+	mips*-cisco)
+		os=-elf
+		;;
+	mips*-*)
+		os=-elf
+		;;
+	or32-*)
+		os=-coff
+		;;
+	*-tti)	# must be before sparc entry or we get the wrong os.
+		os=-sysv3
+		;;
+	sparc-* | *-sun)
+		os=-sunos4.1.1
+		;;
+	*-be)
+		os=-beos
+		;;
+	*-haiku)
+		os=-haiku
+		;;
+	*-ibm)
+		os=-aix
+		;;
+    	*-knuth)
+		os=-mmixware
+		;;
+	*-wec)
+		os=-proelf
+		;;
+	*-winbond)
+		os=-proelf
+		;;
+	*-oki)
+		os=-proelf
+		;;
+	*-hp)
+		os=-hpux
+		;;
+	*-hitachi)
+		os=-hiux
+		;;
+	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
+		os=-sysv
+		;;
+	*-cbm)
+		os=-amigaos
+		;;
+	*-dg)
+		os=-dgux
+		;;
+	*-dolphin)
+		os=-sysv3
+		;;
+	m68k-ccur)
+		os=-rtu
+		;;
+	m88k-omron*)
+		os=-luna
+		;;
+	*-next )
+		os=-nextstep
+		;;
+	*-sequent)
+		os=-ptx
+		;;
+	*-crds)
+		os=-unos
+		;;
+	*-ns)
+		os=-genix
+		;;
+	i370-*)
+		os=-mvs
+		;;
+	*-next)
+		os=-nextstep3
+		;;
+	*-gould)
+		os=-sysv
+		;;
+	*-highlevel)
+		os=-bsd
+		;;
+	*-encore)
+		os=-bsd
+		;;
+	*-sgi)
+		os=-irix
+		;;
+	*-siemens)
+		os=-sysv4
+		;;
+	*-masscomp)
+		os=-rtu
+		;;
+	f30[01]-fujitsu | f700-fujitsu)
+		os=-uxpv
+		;;
+	*-rom68k)
+		os=-coff
+		;;
+	*-*bug)
+		os=-coff
+		;;
+	*-apple)
+		os=-macos
+		;;
+	*-atari*)
+		os=-mint
+		;;
+	*)
+		os=-none
+		;;
+esac
+fi
+
+# Here we handle the case where we know the os, and the CPU type, but not the
+# manufacturer.  We pick the logical manufacturer.
+vendor=unknown
+case $basic_machine in
+	*-unknown)
+		case $os in
+			-riscix*)
+				vendor=acorn
+				;;
+			-sunos*)
+				vendor=sun
+				;;
+			-aix*)
+				vendor=ibm
+				;;
+			-beos*)
+				vendor=be
+				;;
+			-hpux*)
+				vendor=hp
+				;;
+			-mpeix*)
+				vendor=hp
+				;;
+			-hiux*)
+				vendor=hitachi
+				;;
+			-unos*)
+				vendor=crds
+				;;
+			-dgux*)
+				vendor=dg
+				;;
+			-luna*)
+				vendor=omron
+				;;
+			-genix*)
+				vendor=ns
+				;;
+			-mvs* | -opened*)
+				vendor=ibm
+				;;
+			-os400*)
+				vendor=ibm
+				;;
+			-ptx*)
+				vendor=sequent
+				;;
+			-tpf*)
+				vendor=ibm
+				;;
+			-vxsim* | -vxworks* | -windiss*)
+				vendor=wrs
+				;;
+			-aux*)
+				vendor=apple
+				;;
+			-hms*)
+				vendor=hitachi
+				;;
+			-mpw* | -macos*)
+				vendor=apple
+				;;
+			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+				vendor=atari
+				;;
+			-vos*)
+				vendor=stratus
+				;;
+		esac
+		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
+		;;
+esac
+
+echo $basic_machine$os
+exit
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "timestamp='"
+# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-end: "'"
+# End:
diff --git a/cpp/build-aux/depcomp b/cpp/build-aux/depcomp
new file mode 100755
index 0000000000..ca5ea4e1ef
--- /dev/null
+++ b/cpp/build-aux/depcomp
@@ -0,0 +1,584 @@
+#! /bin/sh
+# depcomp - compile a program generating dependencies as side-effects
+
+scriptversion=2006-10-15.18
+
+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006 Free Software
+# Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>.
+
+case $1 in
+  '')
+     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
+     exit 1;
+     ;;
+  -h | --h*)
+    cat <<\EOF
+Usage: depcomp [--help] [--version] PROGRAM [ARGS]
+
+Run PROGRAMS ARGS to compile a file, generating dependencies
+as side-effects.
+
+Environment variables:
+  depmode     Dependency tracking mode.
+  source      Source file read by `PROGRAMS ARGS'.
+  object      Object file output by `PROGRAMS ARGS'.
+  DEPDIR      directory where to store dependencies.
+  depfile     Dependency file to output.
+  tmpdepfile  Temporary file to use when outputing dependencies.
+  libtool     Whether libtool is used (yes/no).
+
+Report bugs to <bug-automake@gnu.org>.
+EOF
+    exit $?
+    ;;
+  -v | --v*)
+    echo "depcomp $scriptversion"
+    exit $?
+    ;;
+esac
+
+if test -z "$depmode" || test -z "$source" || test -z "$object"; then
+  echo "depcomp: Variables source, object and depmode must be set" 1>&2
+  exit 1
+fi
+
+# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
+depfile=${depfile-`echo "$object" |
+  sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
+tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
+
+rm -f "$tmpdepfile"
+
+# Some modes work just like other modes, but use different flags.  We
+# parameterize here, but still list the modes in the big case below,
+# to make depend.m4 easier to write.  Note that we *cannot* use a case
+# here, because this file can only contain one case statement.
+if test "$depmode" = hp; then
+  # HP compiler uses -M and no extra arg.
+  gccflag=-M
+  depmode=gcc
+fi
+
+if test "$depmode" = dashXmstdout; then
+   # This is just like dashmstdout with a different argument.
+   dashmflag=-xM
+   depmode=dashmstdout
+fi
+
+case "$depmode" in
+gcc3)
+## gcc 3 implements dependency tracking that does exactly what
+## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
+## it if -MD -MP comes after the -MF stuff.  Hmm.
+## Unfortunately, FreeBSD c89 acceptance of flags depends upon
+## the command line argument order; so add the flags where they
+## appear in depend2.am.  Note that the slowdown incurred here
+## affects only configure: in makefiles, %FASTDEP% shortcuts this.
+  for arg
+  do
+    case $arg in
+    -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;;
+    *)  set fnord "$@" "$arg" ;;
+    esac
+    shift # fnord
+    shift # $arg
+  done
+  "$@"
+  stat=$?
+  if test $stat -eq 0; then :
+  else
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  mv "$tmpdepfile" "$depfile"
+  ;;
+
+gcc)
+## There are various ways to get dependency output from gcc.  Here's
+## why we pick this rather obscure method:
+## - Don't want to use -MD because we'd like the dependencies to end
+##   up in a subdir.  Having to rename by hand is ugly.
+##   (We might end up doing this anyway to support other compilers.)
+## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
+##   -MM, not -M (despite what the docs say).
+## - Using -M directly means running the compiler twice (even worse
+##   than renaming).
+  if test -z "$gccflag"; then
+    gccflag=-MD,
+  fi
+  "$@" -Wp,"$gccflag$tmpdepfile"
+  stat=$?
+  if test $stat -eq 0; then :
+  else
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
+## The second -e expression handles DOS-style file names with drive letters.
+  sed -e 's/^[^:]*: / /' \
+      -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
+## This next piece of magic avoids the `deleted header file' problem.
+## The problem is that when a header file which appears in a .P file
+## is deleted, the dependency causes make to die (because there is
+## typically no way to rebuild the header).  We avoid this by adding
+## dummy dependencies for each header file.  Too bad gcc doesn't do
+## this for us directly.
+  tr ' ' '
+' < "$tmpdepfile" |
+## Some versions of gcc put a space before the `:'.  On the theory
+## that the space means something, we add a space to the output as
+## well.
+## Some versions of the HPUX 10.20 sed can't process this invocation
+## correctly.  Breaking it into two sed invocations is a workaround.
+    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+hp)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
+sgi)
+  if test "$libtool" = yes; then
+    "$@" "-Wp,-MDupdate,$tmpdepfile"
+  else
+    "$@" -MDupdate "$tmpdepfile"
+  fi
+  stat=$?
+  if test $stat -eq 0; then :
+  else
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+
+  if test -f "$tmpdepfile"; then  # yes, the sourcefile depend on other files
+    echo "$object : \\" > "$depfile"
+
+    # Clip off the initial element (the dependent).  Don't try to be
+    # clever and replace this with sed code, as IRIX sed won't handle
+    # lines with more than a fixed number of characters (4096 in
+    # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
+    # the IRIX cc adds comments like `#:fec' to the end of the
+    # dependency line.
+    tr ' ' '
+' < "$tmpdepfile" \
+    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
+    tr '
+' ' ' >> $depfile
+    echo >> $depfile
+
+    # The second pass generates a dummy entry for each header file.
+    tr ' ' '
+' < "$tmpdepfile" \
+   | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
+   >> $depfile
+  else
+    # The sourcefile does not contain any dependencies, so just
+    # store a dummy comment line, to avoid errors with the Makefile
+    # "include basename.Plo" scheme.
+    echo "#dummy" > "$depfile"
+  fi
+  rm -f "$tmpdepfile"
+  ;;
+
+aix)
+  # The C for AIX Compiler uses -M and outputs the dependencies
+  # in a .u file.  In older versions, this file always lives in the
+  # current directory.  Also, the AIX compiler puts `$object:' at the
+  # start of each line; $object doesn't have directory information.
+  # Version 6 uses the directory in both cases.
+  stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'`
+  tmpdepfile="$stripped.u"
+  if test "$libtool" = yes; then
+    "$@" -Wc,-M
+  else
+    "$@" -M
+  fi
+  stat=$?
+
+  if test -f "$tmpdepfile"; then :
+  else
+    stripped=`echo "$stripped" | sed 's,^.*/,,'`
+    tmpdepfile="$stripped.u"
+  fi
+
+  if test $stat -eq 0; then :
+  else
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+
+  if test -f "$tmpdepfile"; then
+    outname="$stripped.o"
+    # Each line is of the form `foo.o: dependent.h'.
+    # Do two passes, one to just change these to
+    # `$object: dependent.h' and one to simply `dependent.h:'.
+    sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
+    sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
+  else
+    # The sourcefile does not contain any dependencies, so just
+    # store a dummy comment line, to avoid errors with the Makefile
+    # "include basename.Plo" scheme.
+    echo "#dummy" > "$depfile"
+  fi
+  rm -f "$tmpdepfile"
+  ;;
+
+icc)
+  # Intel's C compiler understands `-MD -MF file'.  However on
+  #    icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
+  # ICC 7.0 will fill foo.d with something like
+  #    foo.o: sub/foo.c
+  #    foo.o: sub/foo.h
+  # which is wrong.  We want:
+  #    sub/foo.o: sub/foo.c
+  #    sub/foo.o: sub/foo.h
+  #    sub/foo.c:
+  #    sub/foo.h:
+  # ICC 7.1 will output
+  #    foo.o: sub/foo.c sub/foo.h
+  # and will wrap long lines using \ :
+  #    foo.o: sub/foo.c ... \
+  #     sub/foo.h ... \
+  #     ...
+
+  "$@" -MD -MF "$tmpdepfile"
+  stat=$?
+  if test $stat -eq 0; then :
+  else
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  # Each line is of the form `foo.o: dependent.h',
+  # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
+  # Do two passes, one to just change these to
+  # `$object: dependent.h' and one to simply `dependent.h:'.
+  sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
+  # Some versions of the HPUX 10.20 sed can't process this invocation
+  # correctly.  Breaking it into two sed invocations is a workaround.
+  sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
+    sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+hp2)
+  # The "hp" stanza above does not work with aCC (C++) and HP's ia64
+  # compilers, which have integrated preprocessors.  The correct option
+  # to use with these is +Maked; it writes dependencies to a file named
+  # 'foo.d', which lands next to the object file, wherever that
+  # happens to be.
+  # Much of this is similar to the tru64 case; see comments there.
+  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
+  test "x$dir" = "x$object" && dir=
+  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
+  if test "$libtool" = yes; then
+    tmpdepfile1=$dir$base.d
+    tmpdepfile2=$dir.libs/$base.d
+    "$@" -Wc,+Maked
+  else
+    tmpdepfile1=$dir$base.d
+    tmpdepfile2=$dir$base.d
+    "$@" +Maked
+  fi
+  stat=$?
+  if test $stat -eq 0; then :
+  else
+     rm -f "$tmpdepfile1" "$tmpdepfile2"
+     exit $stat
+  fi
+
+  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2"
+  do
+    test -f "$tmpdepfile" && break
+  done
+  if test -f "$tmpdepfile"; then
+    sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
+    # Add `dependent.h:' lines.
+    sed -ne '2,${; s/^ *//; s/ \\*$//; s/$/:/; p;}' "$tmpdepfile" >> "$depfile"
+  else
+    echo "#dummy" > "$depfile"
+  fi
+  rm -f "$tmpdepfile" "$tmpdepfile2"
+  ;;
+
+tru64)
+   # The Tru64 compiler uses -MD to generate dependencies as a side
+   # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
+   # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
+   # dependencies in `foo.d' instead, so we check for that too.
+   # Subdirectories are respected.
+   dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
+   test "x$dir" = "x$object" && dir=
+   base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
+
+   if test "$libtool" = yes; then
+      # With Tru64 cc, shared objects can also be used to make a
+      # static library.  This mechanism is used in libtool 1.4 series to
+      # handle both shared and static libraries in a single compilation.
+      # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
+      #
+      # With libtool 1.5 this exception was removed, and libtool now
+      # generates 2 separate objects for the 2 libraries.  These two
+      # compilations output dependencies in $dir.libs/$base.o.d and
+      # in $dir$base.o.d.  We have to check for both files, because
+      # one of the two compilations can be disabled.  We should prefer
+      # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
+      # automatically cleaned when .libs/ is deleted, while ignoring
+      # the former would cause a distcleancheck panic.
+      tmpdepfile1=$dir.libs/$base.lo.d   # libtool 1.4
+      tmpdepfile2=$dir$base.o.d          # libtool 1.5
+      tmpdepfile3=$dir.libs/$base.o.d    # libtool 1.5
+      tmpdepfile4=$dir.libs/$base.d      # Compaq CCC V6.2-504
+      "$@" -Wc,-MD
+   else
+      tmpdepfile1=$dir$base.o.d
+      tmpdepfile2=$dir$base.d
+      tmpdepfile3=$dir$base.d
+      tmpdepfile4=$dir$base.d
+      "$@" -MD
+   fi
+
+   stat=$?
+   if test $stat -eq 0; then :
+   else
+      rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
+      exit $stat
+   fi
+
+   for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
+   do
+     test -f "$tmpdepfile" && break
+   done
+   if test -f "$tmpdepfile"; then
+      sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
+      # That's a tab and a space in the [].
+      sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
+   else
+      echo "#dummy" > "$depfile"
+   fi
+   rm -f "$tmpdepfile"
+   ;;
+
+#nosideeffect)
+  # This comment above is used by automake to tell side-effect
+  # dependency tracking mechanisms from slower ones.
+
+dashmstdout)
+  # Important note: in order to support this mode, a compiler *must*
+  # always write the preprocessed file to stdout, regardless of -o.
+  "$@" || exit $?
+
+  # Remove the call to Libtool.
+  if test "$libtool" = yes; then
+    while test $1 != '--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+
+  # Remove `-o $object'.
+  IFS=" "
+  for arg
+  do
+    case $arg in
+    -o)
+      shift
+      ;;
+    $object)
+      shift
+      ;;
+    *)
+      set fnord "$@" "$arg"
+      shift # fnord
+      shift # $arg
+      ;;
+    esac
+  done
+
+  test -z "$dashmflag" && dashmflag=-M
+  # Require at least two characters before searching for `:'
+  # in the target name.  This is to cope with DOS-style filenames:
+  # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
+  "$@" $dashmflag |
+    sed 's:^[  ]*[^: ][^:][^:]*\:[    ]*:'"$object"'\: :' > "$tmpdepfile"
+  rm -f "$depfile"
+  cat < "$tmpdepfile" > "$depfile"
+  tr ' ' '
+' < "$tmpdepfile" | \
+## Some versions of the HPUX 10.20 sed can't process this invocation
+## correctly.  Breaking it into two sed invocations is a workaround.
+    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+dashXmstdout)
+  # This case only exists to satisfy depend.m4.  It is never actually
+  # run, as this mode is specially recognized in the preamble.
+  exit 1
+  ;;
+
+makedepend)
+  "$@" || exit $?
+  # Remove any Libtool call
+  if test "$libtool" = yes; then
+    while test $1 != '--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+  # X makedepend
+  shift
+  cleared=no
+  for arg in "$@"; do
+    case $cleared in
+    no)
+      set ""; shift
+      cleared=yes ;;
+    esac
+    case "$arg" in
+    -D*|-I*)
+      set fnord "$@" "$arg"; shift ;;
+    # Strip any option that makedepend may not understand.  Remove
+    # the object too, otherwise makedepend will parse it as a source file.
+    -*|$object)
+      ;;
+    *)
+      set fnord "$@" "$arg"; shift ;;
+    esac
+  done
+  obj_suffix="`echo $object | sed 's/^.*\././'`"
+  touch "$tmpdepfile"
+  ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
+  rm -f "$depfile"
+  cat < "$tmpdepfile" > "$depfile"
+  sed '1,2d' "$tmpdepfile" | tr ' ' '
+' | \
+## Some versions of the HPUX 10.20 sed can't process this invocation
+## correctly.  Breaking it into two sed invocations is a workaround.
+    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile" "$tmpdepfile".bak
+  ;;
+
+cpp)
+  # Important note: in order to support this mode, a compiler *must*
+  # always write the preprocessed file to stdout.
+  "$@" || exit $?
+
+  # Remove the call to Libtool.
+  if test "$libtool" = yes; then
+    while test $1 != '--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+
+  # Remove `-o $object'.
+  IFS=" "
+  for arg
+  do
+    case $arg in
+    -o)
+      shift
+      ;;
+    $object)
+      shift
+      ;;
+    *)
+      set fnord "$@" "$arg"
+      shift # fnord
+      shift # $arg
+      ;;
+    esac
+  done
+
+  "$@" -E |
+    sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
+       -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
+    sed '$ s: \\$::' > "$tmpdepfile"
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  cat < "$tmpdepfile" >> "$depfile"
+  sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+msvisualcpp)
+  # Important note: in order to support this mode, a compiler *must*
+  # always write the preprocessed file to stdout, regardless of -o,
+  # because we must use -o when running libtool.
+  "$@" || exit $?
+  IFS=" "
+  for arg
+  do
+    case "$arg" in
+    "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
+	set fnord "$@"
+	shift
+	shift
+	;;
+    *)
+	set fnord "$@" "$arg"
+	shift
+	shift
+	;;
+    esac
+  done
+  "$@" -E |
+  sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::	\1 \\:p' >> "$depfile"
+  echo "	" >> "$depfile"
+  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+none)
+  exec "$@"
+  ;;
+
+*)
+  echo "Unknown depmode $depmode" 1>&2
+  exit 1
+  ;;
+esac
+
+exit 0
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
diff --git a/cpp/build-aux/install-sh b/cpp/build-aux/install-sh
new file mode 100755
index 0000000000..4fbbae7b7f
--- /dev/null
+++ b/cpp/build-aux/install-sh
@@ -0,0 +1,507 @@
+#!/bin/sh
+# install - install a program, script, or datafile
+
+scriptversion=2006-10-14.15
+
+# This originates from X11R5 (mit/util/scripts/install.sh), which was
+# later released in X11R6 (xc/config/util/install.sh) with the
+# following copyright and license.
+#
+# Copyright (C) 1994 X Consortium
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to
+# deal in the Software without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+# sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
+# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+# Except as contained in this notice, the name of the X Consortium shall not
+# be used in advertising or otherwise to promote the sale, use or other deal-
+# ings in this Software without prior written authorization from the X Consor-
+# tium.
+#
+#
+# FSF changes to this file are in the public domain.
+#
+# Calling this script install-sh is preferred over install.sh, to prevent
+# `make' implicit rules from creating a file called install from it
+# when there is no Makefile.
+#
+# This script is compatible with the BSD install script, but was written
+# from scratch.
+
+nl='
+'
+IFS=" ""	$nl"
+
+# set DOITPROG to echo to test this script
+
+# Don't use :- since 4.3BSD and earlier shells don't like it.
+doit="${DOITPROG-}"
+if test -z "$doit"; then
+  doit_exec=exec
+else
+  doit_exec=$doit
+fi
+
+# Put in absolute file names if you don't have them in your path;
+# or use environment vars.
+
+mvprog="${MVPROG-mv}"
+cpprog="${CPPROG-cp}"
+chmodprog="${CHMODPROG-chmod}"
+chownprog="${CHOWNPROG-chown}"
+chgrpprog="${CHGRPPROG-chgrp}"
+stripprog="${STRIPPROG-strip}"
+rmprog="${RMPROG-rm}"
+mkdirprog="${MKDIRPROG-mkdir}"
+
+posix_glob=
+posix_mkdir=
+
+# Desired mode of installed file.
+mode=0755
+
+chmodcmd=$chmodprog
+chowncmd=
+chgrpcmd=
+stripcmd=
+rmcmd="$rmprog -f"
+mvcmd="$mvprog"
+src=
+dst=
+dir_arg=
+dstarg=
+no_target_directory=
+
+usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
+   or: $0 [OPTION]... SRCFILES... DIRECTORY
+   or: $0 [OPTION]... -t DIRECTORY SRCFILES...
+   or: $0 [OPTION]... -d DIRECTORIES...
+
+In the 1st form, copy SRCFILE to DSTFILE.
+In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
+In the 4th, create DIRECTORIES.
+
+Options:
+-c         (ignored)
+-d         create directories instead of installing files.
+-g GROUP   $chgrpprog installed files to GROUP.
+-m MODE    $chmodprog installed files to MODE.
+-o USER    $chownprog installed files to USER.
+-s         $stripprog installed files.
+-t DIRECTORY  install into DIRECTORY.
+-T         report an error if DSTFILE is a directory.
+--help     display this help and exit.
+--version  display version info and exit.
+
+Environment variables override the default commands:
+  CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
+"
+
+while test $# -ne 0; do
+  case $1 in
+    -c) shift
+        continue;;
+
+    -d) dir_arg=true
+        shift
+        continue;;
+
+    -g) chgrpcmd="$chgrpprog $2"
+        shift
+        shift
+        continue;;
+
+    --help) echo "$usage"; exit $?;;
+
+    -m) mode=$2
+        shift
+        shift
+	case $mode in
+	  *' '* | *'	'* | *'
+'*	  | *'*'* | *'?'* | *'['*)
+	    echo "$0: invalid mode: $mode" >&2
+	    exit 1;;
+	esac
+        continue;;
+
+    -o) chowncmd="$chownprog $2"
+        shift
+        shift
+        continue;;
+
+    -s) stripcmd=$stripprog
+        shift
+        continue;;
+
+    -t) dstarg=$2
+	shift
+	shift
+	continue;;
+
+    -T) no_target_directory=true
+	shift
+	continue;;
+
+    --version) echo "$0 $scriptversion"; exit $?;;
+
+    --)	shift
+	break;;
+
+    -*)	echo "$0: invalid option: $1" >&2
+	exit 1;;
+
+    *)  break;;
+  esac
+done
+
+if test $# -ne 0 && test -z "$dir_arg$dstarg"; then
+  # When -d is used, all remaining arguments are directories to create.
+  # When -t is used, the destination is already specified.
+  # Otherwise, the last argument is the destination.  Remove it from $@.
+  for arg
+  do
+    if test -n "$dstarg"; then
+      # $@ is not empty: it contains at least $arg.
+      set fnord "$@" "$dstarg"
+      shift # fnord
+    fi
+    shift # arg
+    dstarg=$arg
+  done
+fi
+
+if test $# -eq 0; then
+  if test -z "$dir_arg"; then
+    echo "$0: no input file specified." >&2
+    exit 1
+  fi
+  # It's OK to call `install-sh -d' without argument.
+  # This can happen when creating conditional directories.
+  exit 0
+fi
+
+if test -z "$dir_arg"; then
+  trap '(exit $?); exit' 1 2 13 15
+
+  # Set umask so as not to create temps with too-generous modes.
+  # However, 'strip' requires both read and write access to temps.
+  case $mode in
+    # Optimize common cases.
+    *644) cp_umask=133;;
+    *755) cp_umask=22;;
+
+    *[0-7])
+      if test -z "$stripcmd"; then
+	u_plus_rw=
+      else
+	u_plus_rw='% 200'
+      fi
+      cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
+    *)
+      if test -z "$stripcmd"; then
+	u_plus_rw=
+      else
+	u_plus_rw=,u+rw
+      fi
+      cp_umask=$mode$u_plus_rw;;
+  esac
+fi
+
+for src
+do
+  # Protect names starting with `-'.
+  case $src in
+    -*) src=./$src ;;
+  esac
+
+  if test -n "$dir_arg"; then
+    dst=$src
+    dstdir=$dst
+    test -d "$dstdir"
+    dstdir_status=$?
+  else
+
+    # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
+    # might cause directories to be created, which would be especially bad
+    # if $src (and thus $dsttmp) contains '*'.
+    if test ! -f "$src" && test ! -d "$src"; then
+      echo "$0: $src does not exist." >&2
+      exit 1
+    fi
+
+    if test -z "$dstarg"; then
+      echo "$0: no destination specified." >&2
+      exit 1
+    fi
+
+    dst=$dstarg
+    # Protect names starting with `-'.
+    case $dst in
+      -*) dst=./$dst ;;
+    esac
+
+    # If destination is a directory, append the input filename; won't work
+    # if double slashes aren't ignored.
+    if test -d "$dst"; then
+      if test -n "$no_target_directory"; then
+	echo "$0: $dstarg: Is a directory" >&2
+	exit 1
+      fi
+      dstdir=$dst
+      dst=$dstdir/`basename "$src"`
+      dstdir_status=0
+    else
+      # Prefer dirname, but fall back on a substitute if dirname fails.
+      dstdir=`
+	(dirname "$dst") 2>/dev/null ||
+	expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	     X"$dst" : 'X\(//\)[^/]' \| \
+	     X"$dst" : 'X\(//\)$' \| \
+	     X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
+	echo X"$dst" |
+	    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+		   s//\1/
+		   q
+		 }
+		 /^X\(\/\/\)[^/].*/{
+		   s//\1/
+		   q
+		 }
+		 /^X\(\/\/\)$/{
+		   s//\1/
+		   q
+		 }
+		 /^X\(\/\).*/{
+		   s//\1/
+		   q
+		 }
+		 s/.*/./; q'
+      `
+
+      test -d "$dstdir"
+      dstdir_status=$?
+    fi
+  fi
+
+  obsolete_mkdir_used=false
+
+  if test $dstdir_status != 0; then
+    case $posix_mkdir in
+      '')
+	# Create intermediate dirs using mode 755 as modified by the umask.
+	# This is like FreeBSD 'install' as of 1997-10-28.
+	umask=`umask`
+	case $stripcmd.$umask in
+	  # Optimize common cases.
+	  *[2367][2367]) mkdir_umask=$umask;;
+	  .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
+
+	  *[0-7])
+	    mkdir_umask=`expr $umask + 22 \
+	      - $umask % 100 % 40 + $umask % 20 \
+	      - $umask % 10 % 4 + $umask % 2
+	    `;;
+	  *) mkdir_umask=$umask,go-w;;
+	esac
+
+	# With -d, create the new directory with the user-specified mode.
+	# Otherwise, rely on $mkdir_umask.
+	if test -n "$dir_arg"; then
+	  mkdir_mode=-m$mode
+	else
+	  mkdir_mode=
+	fi
+
+	posix_mkdir=false
+	case $umask in
+	  *[123567][0-7][0-7])
+	    # POSIX mkdir -p sets u+wx bits regardless of umask, which
+	    # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
+	    ;;
+	  *)
+	    tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
+	    trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
+
+	    if (umask $mkdir_umask &&
+		exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
+	    then
+	      if test -z "$dir_arg" || {
+		   # Check for POSIX incompatibilities with -m.
+		   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
+		   # other-writeable bit of parent directory when it shouldn't.
+		   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
+		   ls_ld_tmpdir=`ls -ld "$tmpdir"`
+		   case $ls_ld_tmpdir in
+		     d????-?r-*) different_mode=700;;
+		     d????-?--*) different_mode=755;;
+		     *) false;;
+		   esac &&
+		   $mkdirprog -m$different_mode -p -- "$tmpdir" && {
+		     ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
+		     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
+		   }
+		 }
+	      then posix_mkdir=:
+	      fi
+	      rmdir "$tmpdir/d" "$tmpdir"
+	    else
+	      # Remove any dirs left behind by ancient mkdir implementations.
+	      rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
+	    fi
+	    trap '' 0;;
+	esac;;
+    esac
+
+    if
+      $posix_mkdir && (
+	umask $mkdir_umask &&
+	$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
+      )
+    then :
+    else
+
+      # The umask is ridiculous, or mkdir does not conform to POSIX,
+      # or it failed possibly due to a race condition.  Create the
+      # directory the slow way, step by step, checking for races as we go.
+
+      case $dstdir in
+	/*) prefix=/ ;;
+	-*) prefix=./ ;;
+	*)  prefix= ;;
+      esac
+
+      case $posix_glob in
+        '')
+	  if (set -f) 2>/dev/null; then
+	    posix_glob=true
+	  else
+	    posix_glob=false
+	  fi ;;
+      esac
+
+      oIFS=$IFS
+      IFS=/
+      $posix_glob && set -f
+      set fnord $dstdir
+      shift
+      $posix_glob && set +f
+      IFS=$oIFS
+
+      prefixes=
+
+      for d
+      do
+	test -z "$d" && continue
+
+	prefix=$prefix$d
+	if test -d "$prefix"; then
+	  prefixes=
+	else
+	  if $posix_mkdir; then
+	    (umask=$mkdir_umask &&
+	     $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
+	    # Don't fail if two instances are running concurrently.
+	    test -d "$prefix" || exit 1
+	  else
+	    case $prefix in
+	      *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
+	      *) qprefix=$prefix;;
+	    esac
+	    prefixes="$prefixes '$qprefix'"
+	  fi
+	fi
+	prefix=$prefix/
+      done
+
+      if test -n "$prefixes"; then
+	# Don't fail if two instances are running concurrently.
+	(umask $mkdir_umask &&
+	 eval "\$doit_exec \$mkdirprog $prefixes") ||
+	  test -d "$dstdir" || exit 1
+	obsolete_mkdir_used=true
+      fi
+    fi
+  fi
+
+  if test -n "$dir_arg"; then
+    { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
+    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
+    { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
+      test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
+  else
+
+    # Make a couple of temp file names in the proper directory.
+    dsttmp=$dstdir/_inst.$$_
+    rmtmp=$dstdir/_rm.$$_
+
+    # Trap to clean up those temp files at exit.
+    trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
+
+    # Copy the file name to the temp name.
+    (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
+
+    # and set any options; do chmod last to preserve setuid bits.
+    #
+    # If any of these fail, we abort the whole thing.  If we want to
+    # ignore errors from any of these, just make sure not to ignore
+    # errors from the above "$doit $cpprog $src $dsttmp" command.
+    #
+    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
+      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
+      && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
+      && { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
+
+    # Now rename the file to the real destination.
+    { $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null \
+      || {
+	   # The rename failed, perhaps because mv can't rename something else
+	   # to itself, or perhaps because mv is so ancient that it does not
+	   # support -f.
+
+	   # Now remove or move aside any old file at destination location.
+	   # We try this two ways since rm can't unlink itself on some
+	   # systems and the destination file might be busy for other
+	   # reasons.  In this case, the final cleanup might fail but the new
+	   # file should still install successfully.
+	   {
+	     if test -f "$dst"; then
+	       $doit $rmcmd -f "$dst" 2>/dev/null \
+	       || { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null \
+		     && { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }; }\
+	       || {
+		 echo "$0: cannot unlink or rename $dst" >&2
+		 (exit 1); exit 1
+	       }
+	     else
+	       :
+	     fi
+	   } &&
+
+	   # Now rename the file to the real destination.
+	   $doit $mvcmd "$dsttmp" "$dst"
+	 }
+    } || exit 1
+
+    trap '' 0
+  fi
+done
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
diff --git a/cpp/build-aux/ltmain.sh b/cpp/build-aux/ltmain.sh
new file mode 100755
index 0000000000..c715b59412
--- /dev/null
+++ b/cpp/build-aux/ltmain.sh
@@ -0,0 +1,6871 @@
+# ltmain.sh - Provide generalized library-building support services.
+# NOTE: Changing this file will not affect anything until you rerun configure.
+#
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005
+# Free Software Foundation, Inc.
+# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+basename="s,^.*/,,g"
+
+# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
+# is ksh but when the shell is invoked as "sh" and the current value of
+# the _XPG environment variable is not equal to 1 (one), the special
+# positional parameter $0, within a function call, is the name of the
+# function.
+progpath="$0"
+
+# The name of this program:
+progname=`echo "$progpath" | $SED $basename`
+modename="$progname"
+
+# Global variables:
+EXIT_SUCCESS=0
+EXIT_FAILURE=1
+
+PROGRAM=ltmain.sh
+PACKAGE=libtool
+VERSION="1.5.22 Debian 1.5.22-4"
+TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)"
+
+# See if we are running on zsh, and set the options which allow our
+# commands through without removal of \ escapes.
+if test -n "${ZSH_VERSION+set}" ; then
+  setopt NO_GLOB_SUBST
+fi
+
+# Check that we have a working $echo.
+if test "X$1" = X--no-reexec; then
+  # Discard the --no-reexec flag, and continue.
+  shift
+elif test "X$1" = X--fallback-echo; then
+  # Avoid inline document here, it may be left over
+  :
+elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then
+  # Yippee, $echo works!
+  :
+else
+  # Restart under the correct shell, and then maybe $echo will work.
+  exec $SHELL "$progpath" --no-reexec ${1+"$@"}
+fi
+
+if test "X$1" = X--fallback-echo; then
+  # used as fallback echo
+  shift
+  cat <<EOF
+$*
+EOF
+  exit $EXIT_SUCCESS
+fi
+
+default_mode=
+help="Try \`$progname --help' for more information."
+magic="%%%MAGIC variable%%%"
+mkdir="mkdir"
+mv="mv -f"
+rm="rm -f"
+
+# Sed substitution that helps us do robust quoting.  It backslashifies
+# metacharacters that are still active within double-quoted strings.
+Xsed="${SED}"' -e 1s/^X//'
+sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
+# test EBCDIC or ASCII
+case `echo X|tr X '\101'` in
+ A) # ASCII based system
+    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
+  SP2NL='tr \040 \012'
+  NL2SP='tr \015\012 \040\040'
+  ;;
+ *) # EBCDIC based system
+  SP2NL='tr \100 \n'
+  NL2SP='tr \r\n \100\100'
+  ;;
+esac
+
+# NLS nuisances.
+# Only set LANG and LC_ALL to C if already set.
+# These must not be set unconditionally because not all systems understand
+# e.g. LANG=C (notably SCO).
+# We save the old values to restore during execute mode.
+if test "${LC_ALL+set}" = set; then
+  save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL
+fi
+if test "${LANG+set}" = set; then
+  save_LANG="$LANG"; LANG=C; export LANG
+fi
+
+# Make sure IFS has a sensible default
+lt_nl='
+'
+IFS=" 	$lt_nl"
+
+if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
+  $echo "$modename: not configured to build any kind of library" 1>&2
+  $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
+  exit $EXIT_FAILURE
+fi
+
+# Global variables.
+mode=$default_mode
+nonopt=
+prev=
+prevopt=
+run=
+show="$echo"
+show_help=
+execute_dlfiles=
+duplicate_deps=no
+preserve_args=
+lo2o="s/\\.lo\$/.${objext}/"
+o2lo="s/\\.${objext}\$/.lo/"
+
+#####################################
+# Shell function definitions:
+# This seems to be the best place for them
+
+# func_mktempdir [string]
+# Make a temporary directory that won't clash with other running
+# libtool processes, and avoids race conditions if possible.  If
+# given, STRING is the basename for that directory.
+func_mktempdir ()
+{
+    my_template="${TMPDIR-/tmp}/${1-$progname}"
+
+    if test "$run" = ":"; then
+      # Return a directory name, but don't create it in dry-run mode
+      my_tmpdir="${my_template}-$$"
+    else
+
+      # If mktemp works, use that first and foremost
+      my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null`
+
+      if test ! -d "$my_tmpdir"; then
+	# Failing that, at least try and use $RANDOM to avoid a race
+	my_tmpdir="${my_template}-${RANDOM-0}$$"
+
+	save_mktempdir_umask=`umask`
+	umask 0077
+	$mkdir "$my_tmpdir"
+	umask $save_mktempdir_umask
+      fi
+
+      # If we're not in dry-run mode, bomb out on failure
+      test -d "$my_tmpdir" || {
+        $echo "cannot create temporary directory \`$my_tmpdir'" 1>&2
+	exit $EXIT_FAILURE
+      }
+    fi
+
+    $echo "X$my_tmpdir" | $Xsed
+}
+
+
+# func_win32_libid arg
+# return the library type of file 'arg'
+#
+# Need a lot of goo to handle *both* DLLs and import libs
+# Has to be a shell function in order to 'eat' the argument
+# that is supplied when $file_magic_command is called.
+func_win32_libid ()
+{
+  win32_libid_type="unknown"
+  win32_fileres=`file -L $1 2>/dev/null`
+  case $win32_fileres in
+  *ar\ archive\ import\ library*) # definitely import
+    win32_libid_type="x86 archive import"
+    ;;
+  *ar\ archive*) # could be an import, or static
+    if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
+      $EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
+      win32_nmres=`eval $NM -f posix -A $1 | \
+	$SED -n -e '1,100{/ I /{s,.*,import,;p;q;};}'`
+      case $win32_nmres in
+      import*)  win32_libid_type="x86 archive import";;
+      *)        win32_libid_type="x86 archive static";;
+      esac
+    fi
+    ;;
+  *DLL*)
+    win32_libid_type="x86 DLL"
+    ;;
+  *executable*) # but shell scripts are "executable" too...
+    case $win32_fileres in
+    *MS\ Windows\ PE\ Intel*)
+      win32_libid_type="x86 DLL"
+      ;;
+    esac
+    ;;
+  esac
+  $echo $win32_libid_type
+}
+
+
+# func_infer_tag arg
+# Infer tagged configuration to use if any are available and
+# if one wasn't chosen via the "--tag" command line option.
+# Only attempt this if the compiler in the base compile
+# command doesn't match the default compiler.
+# arg is usually of the form 'gcc ...'
+func_infer_tag ()
+{
+    if test -n "$available_tags" && test -z "$tagname"; then
+      CC_quoted=
+      for arg in $CC; do
+	case $arg in
+	  *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+	  arg="\"$arg\""
+	  ;;
+	esac
+	CC_quoted="$CC_quoted $arg"
+      done
+      case $@ in
+      # Blanks in the command may have been stripped by the calling shell,
+      # but not from the CC environment variable when configure was run.
+      " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*) ;;
+      # Blanks at the start of $base_compile will cause this to fail
+      # if we don't check for them as well.
+      *)
+	for z in $available_tags; do
+	  if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then
+	    # Evaluate the configuration.
+	    eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
+	    CC_quoted=
+	    for arg in $CC; do
+	    # Double-quote args containing other shell metacharacters.
+	    case $arg in
+	      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+	      arg="\"$arg\""
+	      ;;
+	    esac
+	    CC_quoted="$CC_quoted $arg"
+	  done
+	    case "$@ " in
+	      " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*)
+	      # The compiler in the base compile command matches
+	      # the one in the tagged configuration.
+	      # Assume this is the tagged configuration we want.
+	      tagname=$z
+	      break
+	      ;;
+	    esac
+	  fi
+	done
+	# If $tagname still isn't set, then no tagged configuration
+	# was found and let the user know that the "--tag" command
+	# line option must be used.
+	if test -z "$tagname"; then
+	  $echo "$modename: unable to infer tagged configuration"
+	  $echo "$modename: specify a tag with \`--tag'" 1>&2
+	  exit $EXIT_FAILURE
+#        else
+#          $echo "$modename: using $tagname tagged configuration"
+	fi
+	;;
+      esac
+    fi
+}
+
+
+# func_extract_an_archive dir oldlib
+func_extract_an_archive ()
+{
+    f_ex_an_ar_dir="$1"; shift
+    f_ex_an_ar_oldlib="$1"
+
+    $show "(cd $f_ex_an_ar_dir && $AR x $f_ex_an_ar_oldlib)"
+    $run eval "(cd \$f_ex_an_ar_dir && $AR x \$f_ex_an_ar_oldlib)" || exit $?
+    if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
+     :
+    else
+      $echo "$modename: ERROR: object name conflicts: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib" 1>&2
+      exit $EXIT_FAILURE
+    fi
+}
+
+# func_extract_archives gentop oldlib ...
+func_extract_archives ()
+{
+    my_gentop="$1"; shift
+    my_oldlibs=${1+"$@"}
+    my_oldobjs=""
+    my_xlib=""
+    my_xabs=""
+    my_xdir=""
+    my_status=""
+
+    $show "${rm}r $my_gentop"
+    $run ${rm}r "$my_gentop"
+    $show "$mkdir $my_gentop"
+    $run $mkdir "$my_gentop"
+    my_status=$?
+    if test "$my_status" -ne 0 && test ! -d "$my_gentop"; then
+      exit $my_status
+    fi
+
+    for my_xlib in $my_oldlibs; do
+      # Extract the objects.
+      case $my_xlib in
+	[\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;;
+	*) my_xabs=`pwd`"/$my_xlib" ;;
+      esac
+      my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
+      my_xdir="$my_gentop/$my_xlib"
+
+      $show "${rm}r $my_xdir"
+      $run ${rm}r "$my_xdir"
+      $show "$mkdir $my_xdir"
+      $run $mkdir "$my_xdir"
+      exit_status=$?
+      if test "$exit_status" -ne 0 && test ! -d "$my_xdir"; then
+	exit $exit_status
+      fi
+      case $host in
+      *-darwin*)
+	$show "Extracting $my_xabs"
+	# Do not bother doing anything if just a dry run
+	if test -z "$run"; then
+	  darwin_orig_dir=`pwd`
+	  cd $my_xdir || exit $?
+	  darwin_archive=$my_xabs
+	  darwin_curdir=`pwd`
+	  darwin_base_archive=`$echo "X$darwin_archive" | $Xsed -e 's%^.*/%%'`
+	  darwin_arches=`lipo -info "$darwin_archive" 2>/dev/null | $EGREP Architectures 2>/dev/null`
+	  if test -n "$darwin_arches"; then 
+	    darwin_arches=`echo "$darwin_arches" | $SED -e 's/.*are://'`
+	    darwin_arch=
+	    $show "$darwin_base_archive has multiple architectures $darwin_arches"
+	    for darwin_arch in  $darwin_arches ; do
+	      mkdir -p "unfat-$$/${darwin_base_archive}-${darwin_arch}"
+	      lipo -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}"
+	      cd "unfat-$$/${darwin_base_archive}-${darwin_arch}"
+	      func_extract_an_archive "`pwd`" "${darwin_base_archive}"
+	      cd "$darwin_curdir"
+	      $rm "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}"
+	    done # $darwin_arches
+      ## Okay now we have a bunch of thin objects, gotta fatten them up :)
+	    darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print| xargs basename | sort -u | $NL2SP`
+	    darwin_file=
+	    darwin_files=
+	    for darwin_file in $darwin_filelist; do
+	      darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
+	      lipo -create -output "$darwin_file" $darwin_files
+	    done # $darwin_filelist
+	    ${rm}r unfat-$$
+	    cd "$darwin_orig_dir"
+	  else
+	    cd "$darwin_orig_dir"
+ 	    func_extract_an_archive "$my_xdir" "$my_xabs"
+	  fi # $darwin_arches
+	fi # $run
+	;;
+      *)
+        func_extract_an_archive "$my_xdir" "$my_xabs"
+        ;;
+      esac
+      my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
+    done
+    func_extract_archives_result="$my_oldobjs"
+}
+# End of Shell function definitions
+#####################################
+
+# Darwin sucks
+eval std_shrext=\"$shrext_cmds\"
+
+disable_libs=no
+
+# Parse our command line options once, thoroughly.
+while test "$#" -gt 0
+do
+  arg="$1"
+  shift
+
+  case $arg in
+  -*=*) optarg=`$echo "X$arg" | $Xsed -e 's/[-_a-zA-Z0-9]*=//'` ;;
+  *) optarg= ;;
+  esac
+
+  # If the previous option needs an argument, assign it.
+  if test -n "$prev"; then
+    case $prev in
+    execute_dlfiles)
+      execute_dlfiles="$execute_dlfiles $arg"
+      ;;
+    tag)
+      tagname="$arg"
+      preserve_args="${preserve_args}=$arg"
+
+      # Check whether tagname contains only valid characters
+      case $tagname in
+      *[!-_A-Za-z0-9,/]*)
+	$echo "$progname: invalid tag name: $tagname" 1>&2
+	exit $EXIT_FAILURE
+	;;
+      esac
+
+      case $tagname in
+      CC)
+	# Don't test for the "default" C tag, as we know, it's there, but
+	# not specially marked.
+	;;
+      *)
+	if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$progpath" > /dev/null; then
+	  taglist="$taglist $tagname"
+	  # Evaluate the configuration.
+	  eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $progpath`"
+	else
+	  $echo "$progname: ignoring unknown tag $tagname" 1>&2
+	fi
+	;;
+      esac
+      ;;
+    *)
+      eval "$prev=\$arg"
+      ;;
+    esac
+
+    prev=
+    prevopt=
+    continue
+  fi
+
+  # Have we seen a non-optional argument yet?
+  case $arg in
+  --help)
+    show_help=yes
+    ;;
+
+  --version)
+    $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
+    $echo
+    $echo "Copyright (C) 2005  Free Software Foundation, Inc."
+    $echo "This is free software; see the source for copying conditions.  There is NO"
+    $echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+    exit $?
+    ;;
+
+  --config)
+    ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $progpath
+    # Now print the configurations for the tags.
+    for tagname in $taglist; do
+      ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$progpath"
+    done
+    exit $?
+    ;;
+
+  --debug)
+    $echo "$progname: enabling shell trace mode"
+    set -x
+    preserve_args="$preserve_args $arg"
+    ;;
+
+  --dry-run | -n)
+    run=:
+    ;;
+
+  --features)
+    $echo "host: $host"
+    if test "$build_libtool_libs" = yes; then
+      $echo "enable shared libraries"
+    else
+      $echo "disable shared libraries"
+    fi
+    if test "$build_old_libs" = yes; then
+      $echo "enable static libraries"
+    else
+      $echo "disable static libraries"
+    fi
+    exit $?
+    ;;
+
+  --finish) mode="finish" ;;
+
+  --mode) prevopt="--mode" prev=mode ;;
+  --mode=*) mode="$optarg" ;;
+
+  --preserve-dup-deps) duplicate_deps="yes" ;;
+
+  --quiet | --silent)
+    show=:
+    preserve_args="$preserve_args $arg"
+    ;;
+
+  --tag)
+    prevopt="--tag"
+    prev=tag
+    preserve_args="$preserve_args --tag"
+    ;;
+  --tag=*)
+    set tag "$optarg" ${1+"$@"}
+    shift
+    prev=tag
+    preserve_args="$preserve_args --tag"
+    ;;
+
+  -dlopen)
+    prevopt="-dlopen"
+    prev=execute_dlfiles
+    ;;
+
+  -*)
+    $echo "$modename: unrecognized option \`$arg'" 1>&2
+    $echo "$help" 1>&2
+    exit $EXIT_FAILURE
+    ;;
+
+  *)
+    nonopt="$arg"
+    break
+    ;;
+  esac
+done
+
+if test -n "$prevopt"; then
+  $echo "$modename: option \`$prevopt' requires an argument" 1>&2
+  $echo "$help" 1>&2
+  exit $EXIT_FAILURE
+fi
+
+case $disable_libs in
+no) 
+  ;;
+shared)
+  build_libtool_libs=no
+  build_old_libs=yes
+  ;;
+static)
+  build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac`
+  ;;
+esac
+
+# If this variable is set in any of the actions, the command in it
+# will be execed at the end.  This prevents here-documents from being
+# left over by shells.
+exec_cmd=
+
+if test -z "$show_help"; then
+
+  # Infer the operation mode.
+  if test -z "$mode"; then
+    $echo "*** Warning: inferring the mode of operation is deprecated." 1>&2
+    $echo "*** Future versions of Libtool will require --mode=MODE be specified." 1>&2
+    case $nonopt in
+    *cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*)
+      mode=link
+      for arg
+      do
+	case $arg in
+	-c)
+	   mode=compile
+	   break
+	   ;;
+	esac
+      done
+      ;;
+    *db | *dbx | *strace | *truss)
+      mode=execute
+      ;;
+    *install*|cp|mv)
+      mode=install
+      ;;
+    *rm)
+      mode=uninstall
+      ;;
+    *)
+      # If we have no mode, but dlfiles were specified, then do execute mode.
+      test -n "$execute_dlfiles" && mode=execute
+
+      # Just use the default operation mode.
+      if test -z "$mode"; then
+	if test -n "$nonopt"; then
+	  $echo "$modename: warning: cannot infer operation mode from \`$nonopt'" 1>&2
+	else
+	  $echo "$modename: warning: cannot infer operation mode without MODE-ARGS" 1>&2
+	fi
+      fi
+      ;;
+    esac
+  fi
+
+  # Only execute mode is allowed to have -dlopen flags.
+  if test -n "$execute_dlfiles" && test "$mode" != execute; then
+    $echo "$modename: unrecognized option \`-dlopen'" 1>&2
+    $echo "$help" 1>&2
+    exit $EXIT_FAILURE
+  fi
+
+  # Change the help message to a mode-specific one.
+  generic_help="$help"
+  help="Try \`$modename --help --mode=$mode' for more information."
+
+  # These modes are in order of execution frequency so that they run quickly.
+  case $mode in
+  # libtool compile mode
+  compile)
+    modename="$modename: compile"
+    # Get the compilation command and the source file.
+    base_compile=
+    srcfile="$nonopt"  #  always keep a non-empty value in "srcfile"
+    suppress_opt=yes
+    suppress_output=
+    arg_mode=normal
+    libobj=
+    later=
+
+    for arg
+    do
+      case $arg_mode in
+      arg  )
+	# do not "continue".  Instead, add this to base_compile
+	lastarg="$arg"
+	arg_mode=normal
+	;;
+
+      target )
+	libobj="$arg"
+	arg_mode=normal
+	continue
+	;;
+
+      normal )
+	# Accept any command-line options.
+	case $arg in
+	-o)
+	  if test -n "$libobj" ; then
+	    $echo "$modename: you cannot specify \`-o' more than once" 1>&2
+	    exit $EXIT_FAILURE
+	  fi
+	  arg_mode=target
+	  continue
+	  ;;
+
+	-static | -prefer-pic | -prefer-non-pic)
+	  later="$later $arg"
+	  continue
+	  ;;
+
+	-no-suppress)
+	  suppress_opt=no
+	  continue
+	  ;;
+
+	-Xcompiler)
+	  arg_mode=arg  #  the next one goes into the "base_compile" arg list
+	  continue      #  The current "srcfile" will either be retained or
+	  ;;            #  replaced later.  I would guess that would be a bug.
+
+	-Wc,*)
+	  args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"`
+	  lastarg=
+	  save_ifs="$IFS"; IFS=','
+ 	  for arg in $args; do
+	    IFS="$save_ifs"
+
+	    # Double-quote args containing other shell metacharacters.
+	    # Many Bourne shells cannot handle close brackets correctly
+	    # in scan sets, so we specify it separately.
+	    case $arg in
+	      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+	      arg="\"$arg\""
+	      ;;
+	    esac
+	    lastarg="$lastarg $arg"
+	  done
+	  IFS="$save_ifs"
+	  lastarg=`$echo "X$lastarg" | $Xsed -e "s/^ //"`
+
+	  # Add the arguments to base_compile.
+	  base_compile="$base_compile $lastarg"
+	  continue
+	  ;;
+
+	* )
+	  # Accept the current argument as the source file.
+	  # The previous "srcfile" becomes the current argument.
+	  #
+	  lastarg="$srcfile"
+	  srcfile="$arg"
+	  ;;
+	esac  #  case $arg
+	;;
+      esac    #  case $arg_mode
+
+      # Aesthetically quote the previous argument.
+      lastarg=`$echo "X$lastarg" | $Xsed -e "$sed_quote_subst"`
+
+      case $lastarg in
+      # Double-quote args containing other shell metacharacters.
+      # Many Bourne shells cannot handle close brackets correctly
+      # in scan sets, and some SunOS ksh mistreat backslash-escaping
+      # in scan sets (worked around with variable expansion),
+      # and furthermore cannot handle '|' '&' '(' ')' in scan sets 
+      # at all, so we specify them separately.
+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+	lastarg="\"$lastarg\""
+	;;
+      esac
+
+      base_compile="$base_compile $lastarg"
+    done # for arg
+
+    case $arg_mode in
+    arg)
+      $echo "$modename: you must specify an argument for -Xcompile"
+      exit $EXIT_FAILURE
+      ;;
+    target)
+      $echo "$modename: you must specify a target with \`-o'" 1>&2
+      exit $EXIT_FAILURE
+      ;;
+    *)
+      # Get the name of the library object.
+      [ -z "$libobj" ] && libobj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%'`
+      ;;
+    esac
+
+    # Recognize several different file suffixes.
+    # If the user specifies -o file.o, it is replaced with file.lo
+    xform='[cCFSifmso]'
+    case $libobj in
+    *.ada) xform=ada ;;
+    *.adb) xform=adb ;;
+    *.ads) xform=ads ;;
+    *.asm) xform=asm ;;
+    *.c++) xform=c++ ;;
+    *.cc) xform=cc ;;
+    *.ii) xform=ii ;;
+    *.class) xform=class ;;
+    *.cpp) xform=cpp ;;
+    *.cxx) xform=cxx ;;
+    *.f90) xform=f90 ;;
+    *.for) xform=for ;;
+    *.java) xform=java ;;
+    esac
+
+    libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
+
+    case $libobj in
+    *.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;;
+    *)
+      $echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2
+      exit $EXIT_FAILURE
+      ;;
+    esac
+
+    func_infer_tag $base_compile
+
+    for arg in $later; do
+      case $arg in
+      -static)
+	build_old_libs=yes
+	continue
+	;;
+
+      -prefer-pic)
+	pic_mode=yes
+	continue
+	;;
+
+      -prefer-non-pic)
+	pic_mode=no
+	continue
+	;;
+      esac
+    done
+
+    qlibobj=`$echo "X$libobj" | $Xsed -e "$sed_quote_subst"`
+    case $qlibobj in
+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+	qlibobj="\"$qlibobj\"" ;;
+    esac
+    test "X$libobj" != "X$qlibobj" \
+	&& $echo "X$libobj" | grep '[]~#^*{};<>?"'"'"' 	&()|`$[]' \
+	&& $echo "$modename: libobj name \`$libobj' may not contain shell special characters."
+    objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
+    xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
+    if test "X$xdir" = "X$obj"; then
+      xdir=
+    else
+      xdir=$xdir/
+    fi
+    lobj=${xdir}$objdir/$objname
+
+    if test -z "$base_compile"; then
+      $echo "$modename: you must specify a compilation command" 1>&2
+      $echo "$help" 1>&2
+      exit $EXIT_FAILURE
+    fi
+
+    # Delete any leftover library objects.
+    if test "$build_old_libs" = yes; then
+      removelist="$obj $lobj $libobj ${libobj}T"
+    else
+      removelist="$lobj $libobj ${libobj}T"
+    fi
+
+    $run $rm $removelist
+    trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15
+
+    # On Cygwin there's no "real" PIC flag so we must build both object types
+    case $host_os in
+    cygwin* | mingw* | pw32* | os2*)
+      pic_mode=default
+      ;;
+    esac
+    if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then
+      # non-PIC code in shared libraries is not supported
+      pic_mode=default
+    fi
+
+    # Calculate the filename of the output object if compiler does
+    # not support -o with -c
+    if test "$compiler_c_o" = no; then
+      output_obj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
+      lockfile="$output_obj.lock"
+      removelist="$removelist $output_obj $lockfile"
+      trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15
+    else
+      output_obj=
+      need_locks=no
+      lockfile=
+    fi
+
+    # Lock this critical section if it is needed
+    # We use this script file to make the link, it avoids creating a new file
+    if test "$need_locks" = yes; then
+      until $run ln "$progpath" "$lockfile" 2>/dev/null; do
+	$show "Waiting for $lockfile to be removed"
+	sleep 2
+      done
+    elif test "$need_locks" = warn; then
+      if test -f "$lockfile"; then
+	$echo "\
+*** ERROR, $lockfile exists and contains:
+`cat $lockfile 2>/dev/null`
+
+This indicates that another process is trying to use the same
+temporary object file, and libtool could not work around it because
+your compiler does not support \`-c' and \`-o' together.  If you
+repeat this compilation, it may succeed, by chance, but you had better
+avoid parallel builds (make -j) in this platform, or get a better
+compiler."
+
+	$run $rm $removelist
+	exit $EXIT_FAILURE
+      fi
+      $echo "$srcfile" > "$lockfile"
+    fi
+
+    if test -n "$fix_srcfile_path"; then
+      eval srcfile=\"$fix_srcfile_path\"
+    fi
+    qsrcfile=`$echo "X$srcfile" | $Xsed -e "$sed_quote_subst"`
+    case $qsrcfile in
+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+      qsrcfile="\"$qsrcfile\"" ;;
+    esac
+
+    $run $rm "$libobj" "${libobj}T"
+
+    # Create a libtool object file (analogous to a ".la" file),
+    # but don't create it if we're doing a dry run.
+    test -z "$run" && cat > ${libobj}T <<EOF
+# $libobj - a libtool object file
+# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
+#
+# Please DO NOT delete this file!
+# It is necessary for linking the library.
+
+# Name of the PIC object.
+EOF
+
+    # Only build a PIC object if we are building libtool libraries.
+    if test "$build_libtool_libs" = yes; then
+      # Without this assignment, base_compile gets emptied.
+      fbsd_hideous_sh_bug=$base_compile
+
+      if test "$pic_mode" != no; then
+	command="$base_compile $qsrcfile $pic_flag"
+      else
+	# Don't build PIC code
+	command="$base_compile $qsrcfile"
+      fi
+
+      if test ! -d "${xdir}$objdir"; then
+	$show "$mkdir ${xdir}$objdir"
+	$run $mkdir ${xdir}$objdir
+	exit_status=$?
+	if test "$exit_status" -ne 0 && test ! -d "${xdir}$objdir"; then
+	  exit $exit_status
+	fi
+      fi
+
+      if test -z "$output_obj"; then
+	# Place PIC objects in $objdir
+	command="$command -o $lobj"
+      fi
+
+      $run $rm "$lobj" "$output_obj"
+
+      $show "$command"
+      if $run eval "$command"; then :
+      else
+	test -n "$output_obj" && $run $rm $removelist
+	exit $EXIT_FAILURE
+      fi
+
+      if test "$need_locks" = warn &&
+	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
+	$echo "\
+*** ERROR, $lockfile contains:
+`cat $lockfile 2>/dev/null`
+
+but it should contain:
+$srcfile
+
+This indicates that another process is trying to use the same
+temporary object file, and libtool could not work around it because
+your compiler does not support \`-c' and \`-o' together.  If you
+repeat this compilation, it may succeed, by chance, but you had better
+avoid parallel builds (make -j) in this platform, or get a better
+compiler."
+
+	$run $rm $removelist
+	exit $EXIT_FAILURE
+      fi
+
+      # Just move the object if needed, then go on to compile the next one
+      if test -n "$output_obj" && test "X$output_obj" != "X$lobj"; then
+	$show "$mv $output_obj $lobj"
+	if $run $mv $output_obj $lobj; then :
+	else
+	  error=$?
+	  $run $rm $removelist
+	  exit $error
+	fi
+      fi
+
+      # Append the name of the PIC object to the libtool object file.
+      test -z "$run" && cat >> ${libobj}T <<EOF
+pic_object='$objdir/$objname'
+
+EOF
+
+      # Allow error messages only from the first compilation.
+      if test "$suppress_opt" = yes; then
+        suppress_output=' >/dev/null 2>&1'
+      fi
+    else
+      # No PIC object so indicate it doesn't exist in the libtool
+      # object file.
+      test -z "$run" && cat >> ${libobj}T <<EOF
+pic_object=none
+
+EOF
+    fi
+
+    # Only build a position-dependent object if we build old libraries.
+    if test "$build_old_libs" = yes; then
+      if test "$pic_mode" != yes; then
+	# Don't build PIC code
+	command="$base_compile $qsrcfile"
+      else
+	command="$base_compile $qsrcfile $pic_flag"
+      fi
+      if test "$compiler_c_o" = yes; then
+	command="$command -o $obj"
+      fi
+
+      # Suppress compiler output if we already did a PIC compilation.
+      command="$command$suppress_output"
+      $run $rm "$obj" "$output_obj"
+      $show "$command"
+      if $run eval "$command"; then :
+      else
+	$run $rm $removelist
+	exit $EXIT_FAILURE
+      fi
+
+      if test "$need_locks" = warn &&
+	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
+	$echo "\
+*** ERROR, $lockfile contains:
+`cat $lockfile 2>/dev/null`
+
+but it should contain:
+$srcfile
+
+This indicates that another process is trying to use the same
+temporary object file, and libtool could not work around it because
+your compiler does not support \`-c' and \`-o' together.  If you
+repeat this compilation, it may succeed, by chance, but you had better
+avoid parallel builds (make -j) in this platform, or get a better
+compiler."
+
+	$run $rm $removelist
+	exit $EXIT_FAILURE
+      fi
+
+      # Just move the object if needed
+      if test -n "$output_obj" && test "X$output_obj" != "X$obj"; then
+	$show "$mv $output_obj $obj"
+	if $run $mv $output_obj $obj; then :
+	else
+	  error=$?
+	  $run $rm $removelist
+	  exit $error
+	fi
+      fi
+
+      # Append the name of the non-PIC object the libtool object file.
+      # Only append if the libtool object file exists.
+      test -z "$run" && cat >> ${libobj}T <<EOF
+# Name of the non-PIC object.
+non_pic_object='$objname'
+
+EOF
+    else
+      # Append the name of the non-PIC object the libtool object file.
+      # Only append if the libtool object file exists.
+      test -z "$run" && cat >> ${libobj}T <<EOF
+# Name of the non-PIC object.
+non_pic_object=none
+
+EOF
+    fi
+
+    $run $mv "${libobj}T" "${libobj}"
+
+    # Unlock the critical section if it was locked
+    if test "$need_locks" != no; then
+      $run $rm "$lockfile"
+    fi
+
+    exit $EXIT_SUCCESS
+    ;;
+
+  # libtool link mode
+  link | relink)
+    modename="$modename: link"
+    case $host in
+    *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
+      # It is impossible to link a dll without this setting, and
+      # we shouldn't force the makefile maintainer to figure out
+      # which system we are compiling for in order to pass an extra
+      # flag for every libtool invocation.
+      # allow_undefined=no
+
+      # FIXME: Unfortunately, there are problems with the above when trying
+      # to make a dll which has undefined symbols, in which case not
+      # even a static library is built.  For now, we need to specify
+      # -no-undefined on the libtool link line when we can be certain
+      # that all symbols are satisfied, otherwise we get a static library.
+      allow_undefined=yes
+      ;;
+    *)
+      allow_undefined=yes
+      ;;
+    esac
+    libtool_args="$nonopt"
+    base_compile="$nonopt $@"
+    compile_command="$nonopt"
+    finalize_command="$nonopt"
+
+    compile_rpath=
+    finalize_rpath=
+    compile_shlibpath=
+    finalize_shlibpath=
+    convenience=
+    old_convenience=
+    deplibs=
+    old_deplibs=
+    compiler_flags=
+    linker_flags=
+    dllsearchpath=
+    lib_search_path=`pwd`
+    inst_prefix_dir=
+
+    avoid_version=no
+    dlfiles=
+    dlprefiles=
+    dlself=no
+    export_dynamic=no
+    export_symbols=
+    export_symbols_regex=
+    generated=
+    libobjs=
+    ltlibs=
+    module=no
+    no_install=no
+    objs=
+    non_pic_objects=
+    notinst_path= # paths that contain not-installed libtool libraries
+    precious_files_regex=
+    prefer_static_libs=no
+    preload=no
+    prev=
+    prevarg=
+    release=
+    rpath=
+    xrpath=
+    perm_rpath=
+    temp_rpath=
+    thread_safe=no
+    vinfo=
+    vinfo_number=no
+
+    func_infer_tag $base_compile
+
+    # We need to know -static, to get the right output filenames.
+    for arg
+    do
+      case $arg in
+      -all-static | -static)
+	if test "X$arg" = "X-all-static"; then
+	  if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
+	    $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2
+	  fi
+	  if test -n "$link_static_flag"; then
+	    dlopen_self=$dlopen_self_static
+	  fi
+	  prefer_static_libs=yes
+	else
+	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
+	    dlopen_self=$dlopen_self_static
+	  fi
+	  prefer_static_libs=built
+	fi
+	build_libtool_libs=no
+	build_old_libs=yes
+	break
+	;;
+      esac
+    done
+
+    # See if our shared archives depend on static archives.
+    test -n "$old_archive_from_new_cmds" && build_old_libs=yes
+
+    # Go through the arguments, transforming them on the way.
+    while test "$#" -gt 0; do
+      arg="$1"
+      shift
+      case $arg in
+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+	qarg=\"`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`\" ### testsuite: skip nested quoting test
+	;;
+      *) qarg=$arg ;;
+      esac
+      libtool_args="$libtool_args $qarg"
+
+      # If the previous option needs an argument, assign it.
+      if test -n "$prev"; then
+	case $prev in
+	output)
+	  compile_command="$compile_command @OUTPUT@"
+	  finalize_command="$finalize_command @OUTPUT@"
+	  ;;
+	esac
+
+	case $prev in
+	dlfiles|dlprefiles)
+	  if test "$preload" = no; then
+	    # Add the symbol object into the linking commands.
+	    compile_command="$compile_command @SYMFILE@"
+	    finalize_command="$finalize_command @SYMFILE@"
+	    preload=yes
+	  fi
+	  case $arg in
+	  *.la | *.lo) ;;  # We handle these cases below.
+	  force)
+	    if test "$dlself" = no; then
+	      dlself=needless
+	      export_dynamic=yes
+	    fi
+	    prev=
+	    continue
+	    ;;
+	  self)
+	    if test "$prev" = dlprefiles; then
+	      dlself=yes
+	    elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then
+	      dlself=yes
+	    else
+	      dlself=needless
+	      export_dynamic=yes
+	    fi
+	    prev=
+	    continue
+	    ;;
+	  *)
+	    if test "$prev" = dlfiles; then
+	      dlfiles="$dlfiles $arg"
+	    else
+	      dlprefiles="$dlprefiles $arg"
+	    fi
+	    prev=
+	    continue
+	    ;;
+	  esac
+	  ;;
+	expsyms)
+	  export_symbols="$arg"
+	  if test ! -f "$arg"; then
+	    $echo "$modename: symbol file \`$arg' does not exist"
+	    exit $EXIT_FAILURE
+	  fi
+	  prev=
+	  continue
+	  ;;
+	expsyms_regex)
+	  export_symbols_regex="$arg"
+	  prev=
+	  continue
+	  ;;
+	inst_prefix)
+	  inst_prefix_dir="$arg"
+	  prev=
+	  continue
+	  ;;
+	precious_regex)
+	  precious_files_regex="$arg"
+	  prev=
+	  continue
+	  ;;
+	release)
+	  release="-$arg"
+	  prev=
+	  continue
+	  ;;
+	objectlist)
+	  if test -f "$arg"; then
+	    save_arg=$arg
+	    moreargs=
+	    for fil in `cat $save_arg`
+	    do
+#	      moreargs="$moreargs $fil"
+	      arg=$fil
+	      # A libtool-controlled object.
+
+	      # Check to see that this really is a libtool object.
+	      if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+		pic_object=
+		non_pic_object=
+
+		# Read the .lo file
+		# If there is no directory component, then add one.
+		case $arg in
+		*/* | *\\*) . $arg ;;
+		*) . ./$arg ;;
+		esac
+
+		if test -z "$pic_object" || \
+		   test -z "$non_pic_object" ||
+		   test "$pic_object" = none && \
+		   test "$non_pic_object" = none; then
+		  $echo "$modename: cannot find name of object for \`$arg'" 1>&2
+		  exit $EXIT_FAILURE
+		fi
+
+		# Extract subdirectory from the argument.
+		xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
+		if test "X$xdir" = "X$arg"; then
+		  xdir=
+		else
+		  xdir="$xdir/"
+		fi
+
+		if test "$pic_object" != none; then
+		  # Prepend the subdirectory the object is found in.
+		  pic_object="$xdir$pic_object"
+
+		  if test "$prev" = dlfiles; then
+		    if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
+		      dlfiles="$dlfiles $pic_object"
+		      prev=
+		      continue
+		    else
+		      # If libtool objects are unsupported, then we need to preload.
+		      prev=dlprefiles
+		    fi
+		  fi
+
+		  # CHECK ME:  I think I busted this.  -Ossama
+		  if test "$prev" = dlprefiles; then
+		    # Preload the old-style object.
+		    dlprefiles="$dlprefiles $pic_object"
+		    prev=
+		  fi
+
+		  # A PIC object.
+		  libobjs="$libobjs $pic_object"
+		  arg="$pic_object"
+		fi
+
+		# Non-PIC object.
+		if test "$non_pic_object" != none; then
+		  # Prepend the subdirectory the object is found in.
+		  non_pic_object="$xdir$non_pic_object"
+
+		  # A standard non-PIC object
+		  non_pic_objects="$non_pic_objects $non_pic_object"
+		  if test -z "$pic_object" || test "$pic_object" = none ; then
+		    arg="$non_pic_object"
+		  fi
+		else
+		  # If the PIC object exists, use it instead.
+		  # $xdir was prepended to $pic_object above.
+		  non_pic_object="$pic_object"
+		  non_pic_objects="$non_pic_objects $non_pic_object"
+		fi
+	      else
+		# Only an error if not doing a dry-run.
+		if test -z "$run"; then
+		  $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
+		  exit $EXIT_FAILURE
+		else
+		  # Dry-run case.
+
+		  # Extract subdirectory from the argument.
+		  xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
+		  if test "X$xdir" = "X$arg"; then
+		    xdir=
+		  else
+		    xdir="$xdir/"
+		  fi
+
+		  pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"`
+		  non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"`
+		  libobjs="$libobjs $pic_object"
+		  non_pic_objects="$non_pic_objects $non_pic_object"
+		fi
+	      fi
+	    done
+	  else
+	    $echo "$modename: link input file \`$save_arg' does not exist"
+	    exit $EXIT_FAILURE
+	  fi
+	  arg=$save_arg
+	  prev=
+	  continue
+	  ;;
+	rpath | xrpath)
+	  # We need an absolute path.
+	  case $arg in
+	  [\\/]* | [A-Za-z]:[\\/]*) ;;
+	  *)
+	    $echo "$modename: only absolute run-paths are allowed" 1>&2
+	    exit $EXIT_FAILURE
+	    ;;
+	  esac
+	  if test "$prev" = rpath; then
+	    case "$rpath " in
+	    *" $arg "*) ;;
+	    *) rpath="$rpath $arg" ;;
+	    esac
+	  else
+	    case "$xrpath " in
+	    *" $arg "*) ;;
+	    *) xrpath="$xrpath $arg" ;;
+	    esac
+	  fi
+	  prev=
+	  continue
+	  ;;
+	xcompiler)
+	  compiler_flags="$compiler_flags $qarg"
+	  prev=
+	  compile_command="$compile_command $qarg"
+	  finalize_command="$finalize_command $qarg"
+	  continue
+	  ;;
+	xlinker)
+	  linker_flags="$linker_flags $qarg"
+	  compiler_flags="$compiler_flags $wl$qarg"
+	  prev=
+	  compile_command="$compile_command $wl$qarg"
+	  finalize_command="$finalize_command $wl$qarg"
+	  continue
+	  ;;
+	xcclinker)
+	  linker_flags="$linker_flags $qarg"
+	  compiler_flags="$compiler_flags $qarg"
+	  prev=
+	  compile_command="$compile_command $qarg"
+	  finalize_command="$finalize_command $qarg"
+	  continue
+	  ;;
+	shrext)
+  	  shrext_cmds="$arg"
+	  prev=
+	  continue
+	  ;;
+	darwin_framework|darwin_framework_skip)
+	  test "$prev" = "darwin_framework" && compiler_flags="$compiler_flags $arg"
+	  compile_command="$compile_command $arg"
+	  finalize_command="$finalize_command $arg"
+	  prev=
+	  continue
+	  ;;
+	*)
+	  eval "$prev=\"\$arg\""
+	  prev=
+	  continue
+	  ;;
+	esac
+      fi # test -n "$prev"
+
+      prevarg="$arg"
+
+      case $arg in
+      -all-static)
+	if test -n "$link_static_flag"; then
+	  compile_command="$compile_command $link_static_flag"
+	  finalize_command="$finalize_command $link_static_flag"
+	fi
+	continue
+	;;
+
+      -allow-undefined)
+	# FIXME: remove this flag sometime in the future.
+	$echo "$modename: \`-allow-undefined' is deprecated because it is the default" 1>&2
+	continue
+	;;
+
+      -avoid-version)
+	avoid_version=yes
+	continue
+	;;
+
+      -dlopen)
+	prev=dlfiles
+	continue
+	;;
+
+      -dlpreopen)
+	prev=dlprefiles
+	continue
+	;;
+
+      -export-dynamic)
+	export_dynamic=yes
+	continue
+	;;
+
+      -export-symbols | -export-symbols-regex)
+	if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
+	  $echo "$modename: more than one -exported-symbols argument is not allowed"
+	  exit $EXIT_FAILURE
+	fi
+	if test "X$arg" = "X-export-symbols"; then
+	  prev=expsyms
+	else
+	  prev=expsyms_regex
+	fi
+	continue
+	;;
+
+      -framework|-arch|-isysroot)
+	case " $CC " in
+	  *" ${arg} ${1} "* | *" ${arg}	${1} "*) 
+		prev=darwin_framework_skip ;;
+	  *) compiler_flags="$compiler_flags $arg"
+	     prev=darwin_framework ;;
+	esac
+	compile_command="$compile_command $arg"
+	finalize_command="$finalize_command $arg"
+	continue
+	;;
+
+      -inst-prefix-dir)
+	prev=inst_prefix
+	continue
+	;;
+
+      # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
+      # so, if we see these flags be careful not to treat them like -L
+      -L[A-Z][A-Z]*:*)
+	case $with_gcc/$host in
+	no/*-*-irix* | /*-*-irix*)
+	  compile_command="$compile_command $arg"
+	  finalize_command="$finalize_command $arg"
+	  ;;
+	esac
+	continue
+	;;
+
+      -L*)
+	dir=`$echo "X$arg" | $Xsed -e 's/^-L//'`
+	# We need an absolute path.
+	case $dir in
+	[\\/]* | [A-Za-z]:[\\/]*) ;;
+	*)
+	  absdir=`cd "$dir" && pwd`
+	  if test -z "$absdir"; then
+	    $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2
+	    absdir="$dir"
+	    notinst_path="$notinst_path $dir"
+	  fi
+	  dir="$absdir"
+	  ;;
+	esac
+	case "$deplibs " in
+	*" -L$dir "*) ;;
+	*)
+	  deplibs="$deplibs -L$dir"
+	  lib_search_path="$lib_search_path $dir"
+	  ;;
+	esac
+	case $host in
+	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
+	  testbindir=`$echo "X$dir" | $Xsed -e 's*/lib$*/bin*'`
+	  case :$dllsearchpath: in
+	  *":$dir:"*) ;;
+	  *) dllsearchpath="$dllsearchpath:$dir";;
+	  esac
+	  case :$dllsearchpath: in
+	  *":$testbindir:"*) ;;
+	  *) dllsearchpath="$dllsearchpath:$testbindir";;
+	  esac
+	  ;;
+	esac
+	continue
+	;;
+
+      -l*)
+	if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
+	  case $host in
+	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos*)
+	    # These systems don't actually have a C or math library (as such)
+	    continue
+	    ;;
+	  *-*-os2*)
+	    # These systems don't actually have a C library (as such)
+	    test "X$arg" = "X-lc" && continue
+	    ;;
+	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+	    # Do not include libc due to us having libc/libc_r.
+	    test "X$arg" = "X-lc" && continue
+	    ;;
+	  *-*-rhapsody* | *-*-darwin1.[012])
+	    # Rhapsody C and math libraries are in the System framework
+	    deplibs="$deplibs -framework System"
+	    continue
+	    ;;
+	  *-*-sco3.2v5* | *-*-sco5v6*)
+	    # Causes problems with __ctype
+	    test "X$arg" = "X-lc" && continue
+	    ;;
+	  *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
+	    # Compiler inserts libc in the correct place for threads to work
+	    test "X$arg" = "X-lc" && continue
+	    ;;
+	  esac
+	elif test "X$arg" = "X-lc_r"; then
+	 case $host in
+	 *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+	   # Do not include libc_r directly, use -pthread flag.
+	   continue
+	   ;;
+	 esac
+	fi
+	deplibs="$deplibs $arg"
+	continue
+	;;
+
+      # Tru64 UNIX uses -model [arg] to determine the layout of C++
+      # classes, name mangling, and exception handling.
+      -model)
+	compile_command="$compile_command $arg"
+	compiler_flags="$compiler_flags $arg"
+	finalize_command="$finalize_command $arg"
+	prev=xcompiler
+	continue
+	;;
+
+     -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
+	compiler_flags="$compiler_flags $arg"
+	compile_command="$compile_command $arg"
+	finalize_command="$finalize_command $arg"
+	continue
+	;;
+
+      -module)
+	module=yes
+	continue
+	;;
+
+      # -64, -mips[0-9] enable 64-bit mode on the SGI compiler
+      # -r[0-9][0-9]* specifies the processor on the SGI compiler
+      # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler
+      # +DA*, +DD* enable 64-bit mode on the HP compiler
+      # -q* pass through compiler args for the IBM compiler
+      # -m* pass through architecture-specific compiler args for GCC
+      # -m*, -t[45]*, -txscale* pass through architecture-specific
+      # compiler args for GCC
+      # -pg pass through profiling flag for GCC
+      # @file GCC response files
+      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \
+      -t[45]*|-txscale*|@*)
+
+	# Unknown arguments in both finalize_command and compile_command need
+	# to be aesthetically quoted because they are evaled later.
+	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
+	case $arg in
+	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+	  arg="\"$arg\""
+	  ;;
+	esac
+        compile_command="$compile_command $arg"
+        finalize_command="$finalize_command $arg"
+        compiler_flags="$compiler_flags $arg"
+        continue
+        ;;
+
+      -shrext)
+	prev=shrext
+	continue
+	;;
+
+      -no-fast-install)
+	fast_install=no
+	continue
+	;;
+
+      -no-install)
+	case $host in
+	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
+	  # The PATH hackery in wrapper scripts is required on Windows
+	  # in order for the loader to find any dlls it needs.
+	  $echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2
+	  $echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2
+	  fast_install=no
+	  ;;
+	*) no_install=yes ;;
+	esac
+	continue
+	;;
+
+      -no-undefined)
+	allow_undefined=no
+	continue
+	;;
+
+      -objectlist)
+	prev=objectlist
+	continue
+	;;
+
+      -o) prev=output ;;
+
+      -precious-files-regex)
+	prev=precious_regex
+	continue
+	;;
+
+      -release)
+	prev=release
+	continue
+	;;
+
+      -rpath)
+	prev=rpath
+	continue
+	;;
+
+      -R)
+	prev=xrpath
+	continue
+	;;
+
+      -R*)
+	dir=`$echo "X$arg" | $Xsed -e 's/^-R//'`
+	# We need an absolute path.
+	case $dir in
+	[\\/]* | [A-Za-z]:[\\/]*) ;;
+	*)
+	  $echo "$modename: only absolute run-paths are allowed" 1>&2
+	  exit $EXIT_FAILURE
+	  ;;
+	esac
+	case "$xrpath " in
+	*" $dir "*) ;;
+	*) xrpath="$xrpath $dir" ;;
+	esac
+	continue
+	;;
+
+      -static)
+	# The effects of -static are defined in a previous loop.
+	# We used to do the same as -all-static on platforms that
+	# didn't have a PIC flag, but the assumption that the effects
+	# would be equivalent was wrong.  It would break on at least
+	# Digital Unix and AIX.
+	continue
+	;;
+
+      -thread-safe)
+	thread_safe=yes
+	continue
+	;;
+
+      -version-info)
+	prev=vinfo
+	continue
+	;;
+      -version-number)
+	prev=vinfo
+	vinfo_number=yes
+	continue
+	;;
+
+      -Wc,*)
+	args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wc,//'`
+	arg=
+	save_ifs="$IFS"; IFS=','
+	for flag in $args; do
+	  IFS="$save_ifs"
+	  case $flag in
+	    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+	    flag="\"$flag\""
+	    ;;
+	  esac
+	  arg="$arg $wl$flag"
+	  compiler_flags="$compiler_flags $flag"
+	done
+	IFS="$save_ifs"
+	arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
+	;;
+
+      -Wl,*)
+	args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'`
+	arg=
+	save_ifs="$IFS"; IFS=','
+	for flag in $args; do
+	  IFS="$save_ifs"
+	  case $flag in
+	    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+	    flag="\"$flag\""
+	    ;;
+	  esac
+	  arg="$arg $wl$flag"
+	  compiler_flags="$compiler_flags $wl$flag"
+	  linker_flags="$linker_flags $flag"
+	done
+	IFS="$save_ifs"
+	arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
+	;;
+
+      -Xcompiler)
+	prev=xcompiler
+	continue
+	;;
+
+      -Xlinker)
+	prev=xlinker
+	continue
+	;;
+
+      -XCClinker)
+	prev=xcclinker
+	continue
+	;;
+
+      # Some other compiler flag.
+      -* | +*)
+	# Unknown arguments in both finalize_command and compile_command need
+	# to be aesthetically quoted because they are evaled later.
+	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
+	case $arg in
+	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+	  arg="\"$arg\""
+	  ;;
+	esac
+	;;
+
+      *.$objext)
+	# A standard object.
+	objs="$objs $arg"
+	;;
+
+      *.lo)
+	# A libtool-controlled object.
+
+	# Check to see that this really is a libtool object.
+	if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+	  pic_object=
+	  non_pic_object=
+
+	  # Read the .lo file
+	  # If there is no directory component, then add one.
+	  case $arg in
+	  */* | *\\*) . $arg ;;
+	  *) . ./$arg ;;
+	  esac
+
+	  if test -z "$pic_object" || \
+	     test -z "$non_pic_object" ||
+	     test "$pic_object" = none && \
+	     test "$non_pic_object" = none; then
+	    $echo "$modename: cannot find name of object for \`$arg'" 1>&2
+	    exit $EXIT_FAILURE
+	  fi
+
+	  # Extract subdirectory from the argument.
+	  xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
+	  if test "X$xdir" = "X$arg"; then
+	    xdir=
+ 	  else
+	    xdir="$xdir/"
+	  fi
+
+	  if test "$pic_object" != none; then
+	    # Prepend the subdirectory the object is found in.
+	    pic_object="$xdir$pic_object"
+
+	    if test "$prev" = dlfiles; then
+	      if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
+		dlfiles="$dlfiles $pic_object"
+		prev=
+		continue
+	      else
+		# If libtool objects are unsupported, then we need to preload.
+		prev=dlprefiles
+	      fi
+	    fi
+
+	    # CHECK ME:  I think I busted this.  -Ossama
+	    if test "$prev" = dlprefiles; then
+	      # Preload the old-style object.
+	      dlprefiles="$dlprefiles $pic_object"
+	      prev=
+	    fi
+
+	    # A PIC object.
+	    libobjs="$libobjs $pic_object"
+	    arg="$pic_object"
+	  fi
+
+	  # Non-PIC object.
+	  if test "$non_pic_object" != none; then
+	    # Prepend the subdirectory the object is found in.
+	    non_pic_object="$xdir$non_pic_object"
+
+	    # A standard non-PIC object
+	    non_pic_objects="$non_pic_objects $non_pic_object"
+	    if test -z "$pic_object" || test "$pic_object" = none ; then
+	      arg="$non_pic_object"
+	    fi
+	  else
+	    # If the PIC object exists, use it instead.
+	    # $xdir was prepended to $pic_object above.
+	    non_pic_object="$pic_object"
+	    non_pic_objects="$non_pic_objects $non_pic_object"
+	  fi
+	else
+	  # Only an error if not doing a dry-run.
+	  if test -z "$run"; then
+	    $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
+	    exit $EXIT_FAILURE
+	  else
+	    # Dry-run case.
+
+	    # Extract subdirectory from the argument.
+	    xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
+	    if test "X$xdir" = "X$arg"; then
+	      xdir=
+	    else
+	      xdir="$xdir/"
+	    fi
+
+	    pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"`
+	    non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"`
+	    libobjs="$libobjs $pic_object"
+	    non_pic_objects="$non_pic_objects $non_pic_object"
+	  fi
+	fi
+	;;
+
+      *.$libext)
+	# An archive.
+	deplibs="$deplibs $arg"
+	old_deplibs="$old_deplibs $arg"
+	continue
+	;;
+
+      *.la)
+	# A libtool-controlled library.
+
+	if test "$prev" = dlfiles; then
+	  # This library was specified with -dlopen.
+	  dlfiles="$dlfiles $arg"
+	  prev=
+	elif test "$prev" = dlprefiles; then
+	  # The library was specified with -dlpreopen.
+	  dlprefiles="$dlprefiles $arg"
+	  prev=
+	else
+	  deplibs="$deplibs $arg"
+	fi
+	continue
+	;;
+
+      # Some other compiler argument.
+      *)
+	# Unknown arguments in both finalize_command and compile_command need
+	# to be aesthetically quoted because they are evaled later.
+	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
+	case $arg in
+	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+	  arg="\"$arg\""
+	  ;;
+	esac
+	;;
+      esac # arg
+
+      # Now actually substitute the argument into the commands.
+      if test -n "$arg"; then
+	compile_command="$compile_command $arg"
+	finalize_command="$finalize_command $arg"
+      fi
+    done # argument parsing loop
+
+    if test -n "$prev"; then
+      $echo "$modename: the \`$prevarg' option requires an argument" 1>&2
+      $echo "$help" 1>&2
+      exit $EXIT_FAILURE
+    fi
+
+    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
+      eval arg=\"$export_dynamic_flag_spec\"
+      compile_command="$compile_command $arg"
+      finalize_command="$finalize_command $arg"
+    fi
+
+    oldlibs=
+    # calculate the name of the file, without its directory
+    outputname=`$echo "X$output" | $Xsed -e 's%^.*/%%'`
+    libobjs_save="$libobjs"
+
+    if test -n "$shlibpath_var"; then
+      # get the directories listed in $shlibpath_var
+      eval shlib_search_path=\`\$echo \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\`
+    else
+      shlib_search_path=
+    fi
+    eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
+    eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
+
+    output_objdir=`$echo "X$output" | $Xsed -e 's%/[^/]*$%%'`
+    if test "X$output_objdir" = "X$output"; then
+      output_objdir="$objdir"
+    else
+      output_objdir="$output_objdir/$objdir"
+    fi
+    # Create the object directory.
+    if test ! -d "$output_objdir"; then
+      $show "$mkdir $output_objdir"
+      $run $mkdir $output_objdir
+      exit_status=$?
+      if test "$exit_status" -ne 0 && test ! -d "$output_objdir"; then
+	exit $exit_status
+      fi
+    fi
+
+    # Determine the type of output
+    case $output in
+    "")
+      $echo "$modename: you must specify an output file" 1>&2
+      $echo "$help" 1>&2
+      exit $EXIT_FAILURE
+      ;;
+    *.$libext) linkmode=oldlib ;;
+    *.lo | *.$objext) linkmode=obj ;;
+    *.la) linkmode=lib ;;
+    *) linkmode=prog ;; # Anything else should be a program.
+    esac
+
+    case $host in
+    *cygwin* | *mingw* | *pw32*)
+      # don't eliminate duplications in $postdeps and $predeps
+      duplicate_compiler_generated_deps=yes
+      ;;
+    *)
+      duplicate_compiler_generated_deps=$duplicate_deps
+      ;;
+    esac
+    specialdeplibs=
+
+    libs=
+    # Find all interdependent deplibs by searching for libraries
+    # that are linked more than once (e.g. -la -lb -la)
+    for deplib in $deplibs; do
+      if test "X$duplicate_deps" = "Xyes" ; then
+	case "$libs " in
+	*" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+	esac
+      fi
+      libs="$libs $deplib"
+    done
+
+    if test "$linkmode" = lib; then
+      libs="$predeps $libs $compiler_lib_search_path $postdeps"
+
+      # Compute libraries that are listed more than once in $predeps
+      # $postdeps and mark them as special (i.e., whose duplicates are
+      # not to be eliminated).
+      pre_post_deps=
+      if test "X$duplicate_compiler_generated_deps" = "Xyes" ; then
+	for pre_post_dep in $predeps $postdeps; do
+	  case "$pre_post_deps " in
+	  *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;;
+	  esac
+	  pre_post_deps="$pre_post_deps $pre_post_dep"
+	done
+      fi
+      pre_post_deps=
+    fi
+
+    deplibs=
+    newdependency_libs=
+    newlib_search_path=
+    need_relink=no # whether we're linking any uninstalled libtool libraries
+    notinst_deplibs= # not-installed libtool libraries
+    case $linkmode in
+    lib)
+	passes="conv link"
+	for file in $dlfiles $dlprefiles; do
+	  case $file in
+	  *.la) ;;
+	  *)
+	    $echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2
+	    exit $EXIT_FAILURE
+	    ;;
+	  esac
+	done
+	;;
+    prog)
+	compile_deplibs=
+	finalize_deplibs=
+	alldeplibs=no
+	newdlfiles=
+	newdlprefiles=
+	passes="conv scan dlopen dlpreopen link"
+	;;
+    *)  passes="conv"
+	;;
+    esac
+    for pass in $passes; do
+      if test "$linkmode,$pass" = "lib,link" ||
+	 test "$linkmode,$pass" = "prog,scan"; then
+	libs="$deplibs"
+	deplibs=
+      fi
+      if test "$linkmode" = prog; then
+	case $pass in
+	dlopen) libs="$dlfiles" ;;
+	dlpreopen) libs="$dlprefiles" ;;
+	link)
+	  libs="$deplibs %DEPLIBS%"
+	  test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
+	  ;;
+	esac
+      fi
+      if test "$pass" = dlopen; then
+	# Collect dlpreopened libraries
+	save_deplibs="$deplibs"
+	deplibs=
+      fi
+      for deplib in $libs; do
+	lib=
+	found=no
+	case $deplib in
+	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
+	  if test "$linkmode,$pass" = "prog,link"; then
+	    compile_deplibs="$deplib $compile_deplibs"
+	    finalize_deplibs="$deplib $finalize_deplibs"
+	  else
+	    compiler_flags="$compiler_flags $deplib"
+	  fi
+	  continue
+	  ;;
+	-l*)
+	  if test "$linkmode" != lib && test "$linkmode" != prog; then
+	    $echo "$modename: warning: \`-l' is ignored for archives/objects" 1>&2
+	    continue
+	  fi
+	  name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
+	  for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do
+	    for search_ext in .la $std_shrext .so .a; do
+	      # Search the libtool library
+	      lib="$searchdir/lib${name}${search_ext}"
+	      if test -f "$lib"; then
+		if test "$search_ext" = ".la"; then
+		  found=yes
+		else
+		  found=no
+		fi
+		break 2
+	      fi
+	    done
+	  done
+	  if test "$found" != yes; then
+	    # deplib doesn't seem to be a libtool library
+	    if test "$linkmode,$pass" = "prog,link"; then
+	      compile_deplibs="$deplib $compile_deplibs"
+	      finalize_deplibs="$deplib $finalize_deplibs"
+	    else
+	      deplibs="$deplib $deplibs"
+	      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
+	    fi
+	    continue
+	  else # deplib is a libtool library
+	    # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib,
+	    # We need to do some special things here, and not later.
+	    if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+	      case " $predeps $postdeps " in
+	      *" $deplib "*)
+		if (${SED} -e '2q' $lib |
+                    grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+		  library_names=
+		  old_library=
+		  case $lib in
+		  */* | *\\*) . $lib ;;
+		  *) . ./$lib ;;
+		  esac
+		  for l in $old_library $library_names; do
+		    ll="$l"
+		  done
+		  if test "X$ll" = "X$old_library" ; then # only static version available
+		    found=no
+		    ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
+		    test "X$ladir" = "X$lib" && ladir="."
+		    lib=$ladir/$old_library
+		    if test "$linkmode,$pass" = "prog,link"; then
+		      compile_deplibs="$deplib $compile_deplibs"
+		      finalize_deplibs="$deplib $finalize_deplibs"
+		    else
+		      deplibs="$deplib $deplibs"
+		      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
+		    fi
+		    continue
+		  fi
+		fi
+	        ;;
+	      *) ;;
+	      esac
+	    fi
+	  fi
+	  ;; # -l
+	-L*)
+	  case $linkmode in
+	  lib)
+	    deplibs="$deplib $deplibs"
+	    test "$pass" = conv && continue
+	    newdependency_libs="$deplib $newdependency_libs"
+	    newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
+	    ;;
+	  prog)
+	    if test "$pass" = conv; then
+	      deplibs="$deplib $deplibs"
+	      continue
+	    fi
+	    if test "$pass" = scan; then
+	      deplibs="$deplib $deplibs"
+	    else
+	      compile_deplibs="$deplib $compile_deplibs"
+	      finalize_deplibs="$deplib $finalize_deplibs"
+	    fi
+	    newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
+	    ;;
+	  *)
+	    $echo "$modename: warning: \`-L' is ignored for archives/objects" 1>&2
+	    ;;
+	  esac # linkmode
+	  continue
+	  ;; # -L
+	-R*)
+	  if test "$pass" = link; then
+	    dir=`$echo "X$deplib" | $Xsed -e 's/^-R//'`
+	    # Make sure the xrpath contains only unique directories.
+	    case "$xrpath " in
+	    *" $dir "*) ;;
+	    *) xrpath="$xrpath $dir" ;;
+	    esac
+	  fi
+	  deplibs="$deplib $deplibs"
+	  continue
+	  ;;
+	*.la) lib="$deplib" ;;
+	*.$libext)
+	  if test "$pass" = conv; then
+	    deplibs="$deplib $deplibs"
+	    continue
+	  fi
+	  case $linkmode in
+	  lib)
+	    valid_a_lib=no
+	    case $deplibs_check_method in
+	      match_pattern*)
+		set dummy $deplibs_check_method
+	        match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
+		if eval $echo \"$deplib\" 2>/dev/null \
+		    | $SED 10q \
+		    | $EGREP "$match_pattern_regex" > /dev/null; then
+		  valid_a_lib=yes
+		fi
+		;;
+	      pass_all)
+		valid_a_lib=yes
+		;;
+            esac
+	    if test "$valid_a_lib" != yes; then
+	      $echo
+	      $echo "*** Warning: Trying to link with static lib archive $deplib."
+	      $echo "*** I have the capability to make that library automatically link in when"
+	      $echo "*** you link to this library.  But I can only do this if you have a"
+	      $echo "*** shared version of the library, which you do not appear to have"
+	      $echo "*** because the file extensions .$libext of this argument makes me believe"
+	      $echo "*** that it is just a static archive that I should not used here."
+	    else
+	      $echo
+	      $echo "*** Warning: Linking the shared library $output against the"
+	      $echo "*** static library $deplib is not portable!"
+	      deplibs="$deplib $deplibs"
+	    fi
+	    continue
+	    ;;
+	  prog)
+	    if test "$pass" != link; then
+	      deplibs="$deplib $deplibs"
+	    else
+	      compile_deplibs="$deplib $compile_deplibs"
+	      finalize_deplibs="$deplib $finalize_deplibs"
+	    fi
+	    continue
+	    ;;
+	  esac # linkmode
+	  ;; # *.$libext
+	*.lo | *.$objext)
+	  if test "$pass" = conv; then
+	    deplibs="$deplib $deplibs"
+	  elif test "$linkmode" = prog; then
+	    if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
+	      # If there is no dlopen support or we're linking statically,
+	      # we need to preload.
+	      newdlprefiles="$newdlprefiles $deplib"
+	      compile_deplibs="$deplib $compile_deplibs"
+	      finalize_deplibs="$deplib $finalize_deplibs"
+	    else
+	      newdlfiles="$newdlfiles $deplib"
+	    fi
+	  fi
+	  continue
+	  ;;
+	%DEPLIBS%)
+	  alldeplibs=yes
+	  continue
+	  ;;
+	esac # case $deplib
+	if test "$found" = yes || test -f "$lib"; then :
+	else
+	  $echo "$modename: cannot find the library \`$lib' or unhandled argument \`$deplib'" 1>&2
+	  exit $EXIT_FAILURE
+	fi
+
+	# Check to see that this really is a libtool archive.
+	if (${SED} -e '2q' $lib | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
+	else
+	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
+	  exit $EXIT_FAILURE
+	fi
+
+	ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
+	test "X$ladir" = "X$lib" && ladir="."
+
+	dlname=
+	dlopen=
+	dlpreopen=
+	libdir=
+	library_names=
+	old_library=
+	# If the library was installed with an old release of libtool,
+	# it will not redefine variables installed, or shouldnotlink
+	installed=yes
+	shouldnotlink=no
+	avoidtemprpath=
+
+
+	# Read the .la file
+	case $lib in
+	*/* | *\\*) . $lib ;;
+	*) . ./$lib ;;
+	esac
+
+	if test "$linkmode,$pass" = "lib,link" ||
+	   test "$linkmode,$pass" = "prog,scan" ||
+	   { test "$linkmode" != prog && test "$linkmode" != lib; }; then
+	  test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
+	  test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
+	fi
+
+	if test "$pass" = conv; then
+	  # Only check for convenience libraries
+	  deplibs="$lib $deplibs"
+	  if test -z "$libdir"; then
+	    if test -z "$old_library"; then
+	      $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
+	      exit $EXIT_FAILURE
+	    fi
+	    # It is a libtool convenience library, so add in its objects.
+	    convenience="$convenience $ladir/$objdir/$old_library"
+	    old_convenience="$old_convenience $ladir/$objdir/$old_library"
+	    tmp_libs=
+	    for deplib in $dependency_libs; do
+	      deplibs="$deplib $deplibs"
+              if test "X$duplicate_deps" = "Xyes" ; then
+	        case "$tmp_libs " in
+	        *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+	        esac
+              fi
+	      tmp_libs="$tmp_libs $deplib"
+	    done
+	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
+	    $echo "$modename: \`$lib' is not a convenience library" 1>&2
+	    exit $EXIT_FAILURE
+	  fi
+	  continue
+	fi # $pass = conv
+
+
+	# Get the name of the library we link against.
+	linklib=
+	for l in $old_library $library_names; do
+	  linklib="$l"
+	done
+	if test -z "$linklib"; then
+	  $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
+	  exit $EXIT_FAILURE
+	fi
+
+	# This library was specified with -dlopen.
+	if test "$pass" = dlopen; then
+	  if test -z "$libdir"; then
+	    $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2
+	    exit $EXIT_FAILURE
+	  fi
+	  if test -z "$dlname" ||
+	     test "$dlopen_support" != yes ||
+	     test "$build_libtool_libs" = no; then
+	    # If there is no dlname, no dlopen support or we're linking
+	    # statically, we need to preload.  We also need to preload any
+	    # dependent libraries so libltdl's deplib preloader doesn't
+	    # bomb out in the load deplibs phase.
+	    dlprefiles="$dlprefiles $lib $dependency_libs"
+	  else
+	    newdlfiles="$newdlfiles $lib"
+	  fi
+	  continue
+	fi # $pass = dlopen
+
+	# We need an absolute path.
+	case $ladir in
+	[\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;;
+	*)
+	  abs_ladir=`cd "$ladir" && pwd`
+	  if test -z "$abs_ladir"; then
+	    $echo "$modename: warning: cannot determine absolute directory name of \`$ladir'" 1>&2
+	    $echo "$modename: passing it literally to the linker, although it might fail" 1>&2
+	    abs_ladir="$ladir"
+	  fi
+	  ;;
+	esac
+	laname=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
+
+	# Find the relevant object directory and library name.
+	if test "X$installed" = Xyes; then
+	  if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
+	    $echo "$modename: warning: library \`$lib' was moved." 1>&2
+	    dir="$ladir"
+	    absdir="$abs_ladir"
+	    libdir="$abs_ladir"
+	  else
+	    dir="$libdir"
+	    absdir="$libdir"
+	  fi
+	  test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
+	else
+	  if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
+	    dir="$ladir"
+	    absdir="$abs_ladir"
+	    # Remove this search path later
+	    notinst_path="$notinst_path $abs_ladir"
+	  else
+	    dir="$ladir/$objdir"
+	    absdir="$abs_ladir/$objdir"
+	    # Remove this search path later
+	    notinst_path="$notinst_path $abs_ladir"
+	  fi
+	fi # $installed = yes
+	name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
+
+	# This library was specified with -dlpreopen.
+	if test "$pass" = dlpreopen; then
+	  if test -z "$libdir"; then
+	    $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2
+	    exit $EXIT_FAILURE
+	  fi
+	  # Prefer using a static library (so that no silly _DYNAMIC symbols
+	  # are required to link).
+	  if test -n "$old_library"; then
+	    newdlprefiles="$newdlprefiles $dir/$old_library"
+	  # Otherwise, use the dlname, so that lt_dlopen finds it.
+	  elif test -n "$dlname"; then
+	    newdlprefiles="$newdlprefiles $dir/$dlname"
+	  else
+	    newdlprefiles="$newdlprefiles $dir/$linklib"
+	  fi
+	fi # $pass = dlpreopen
+
+	if test -z "$libdir"; then
+	  # Link the convenience library
+	  if test "$linkmode" = lib; then
+	    deplibs="$dir/$old_library $deplibs"
+	  elif test "$linkmode,$pass" = "prog,link"; then
+	    compile_deplibs="$dir/$old_library $compile_deplibs"
+	    finalize_deplibs="$dir/$old_library $finalize_deplibs"
+	  else
+	    deplibs="$lib $deplibs" # used for prog,scan pass
+	  fi
+	  continue
+	fi
+
+
+	if test "$linkmode" = prog && test "$pass" != link; then
+	  newlib_search_path="$newlib_search_path $ladir"
+	  deplibs="$lib $deplibs"
+
+	  linkalldeplibs=no
+	  if test "$link_all_deplibs" != no || test -z "$library_names" ||
+	     test "$build_libtool_libs" = no; then
+	    linkalldeplibs=yes
+	  fi
+
+	  tmp_libs=
+	  for deplib in $dependency_libs; do
+	    case $deplib in
+	    -L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test
+	    esac
+	    # Need to link against all dependency_libs?
+	    if test "$linkalldeplibs" = yes; then
+	      deplibs="$deplib $deplibs"
+	    else
+	      # Need to hardcode shared library paths
+	      # or/and link against static libraries
+	      newdependency_libs="$deplib $newdependency_libs"
+	    fi
+	    if test "X$duplicate_deps" = "Xyes" ; then
+	      case "$tmp_libs " in
+	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+	      esac
+	    fi
+	    tmp_libs="$tmp_libs $deplib"
+	  done # for deplib
+	  continue
+	fi # $linkmode = prog...
+
+	if test "$linkmode,$pass" = "prog,link"; then
+	  if test -n "$library_names" &&
+	     { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
+	    # We need to hardcode the library path
+	    if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
+	      # Make sure the rpath contains only unique directories.
+	      case "$temp_rpath " in
+	      *" $dir "*) ;;
+	      *" $absdir "*) ;;
+	      *) temp_rpath="$temp_rpath $absdir" ;;
+	      esac
+	    fi
+
+	    # Hardcode the library path.
+	    # Skip directories that are in the system default run-time
+	    # search path.
+	    case " $sys_lib_dlsearch_path " in
+	    *" $absdir "*) ;;
+	    *)
+	      case "$compile_rpath " in
+	      *" $absdir "*) ;;
+	      *) compile_rpath="$compile_rpath $absdir"
+	      esac
+	      ;;
+	    esac
+	    case " $sys_lib_dlsearch_path " in
+	    *" $libdir "*) ;;
+	    *)
+	      case "$finalize_rpath " in
+	      *" $libdir "*) ;;
+	      *) finalize_rpath="$finalize_rpath $libdir"
+	      esac
+	      ;;
+	    esac
+	  fi # $linkmode,$pass = prog,link...
+
+	  if test "$alldeplibs" = yes &&
+	     { test "$deplibs_check_method" = pass_all ||
+	       { test "$build_libtool_libs" = yes &&
+		 test -n "$library_names"; }; }; then
+	    # We only need to search for static libraries
+	    continue
+	  fi
+	fi
+
+	link_static=no # Whether the deplib will be linked statically
+	use_static_libs=$prefer_static_libs
+	if test "$use_static_libs" = built && test "$installed" = yes ; then
+	  use_static_libs=no
+	fi
+	if test -n "$library_names" &&
+	   { test "$use_static_libs" = no || test -z "$old_library"; }; then
+	  if test "$installed" = no; then
+	    notinst_deplibs="$notinst_deplibs $lib"
+	    need_relink=yes
+	  fi
+	  # This is a shared library
+
+	  # Warn about portability, can't link against -module's on
+	  # some systems (darwin)
+	  if test "$shouldnotlink" = yes && test "$pass" = link ; then
+	    $echo
+	    if test "$linkmode" = prog; then
+	      $echo "*** Warning: Linking the executable $output against the loadable module"
+	    else
+	      $echo "*** Warning: Linking the shared library $output against the loadable module"
+	    fi
+	    $echo "*** $linklib is not portable!"
+	  fi
+	  if test "$linkmode" = lib &&
+	     test "$hardcode_into_libs" = yes; then
+	    # Hardcode the library path.
+	    # Skip directories that are in the system default run-time
+	    # search path.
+	    case " $sys_lib_dlsearch_path " in
+	    *" $absdir "*) ;;
+	    *)
+	      case "$compile_rpath " in
+	      *" $absdir "*) ;;
+	      *) compile_rpath="$compile_rpath $absdir"
+	      esac
+	      ;;
+	    esac
+	    case " $sys_lib_dlsearch_path " in
+	    *" $libdir "*) ;;
+	    *)
+	      case "$finalize_rpath " in
+	      *" $libdir "*) ;;
+	      *) finalize_rpath="$finalize_rpath $libdir"
+	      esac
+	      ;;
+	    esac
+	  fi
+
+	  if test -n "$old_archive_from_expsyms_cmds"; then
+	    # figure out the soname
+	    set dummy $library_names
+	    realname="$2"
+	    shift; shift
+	    libname=`eval \\$echo \"$libname_spec\"`
+	    # use dlname if we got it. it's perfectly good, no?
+	    if test -n "$dlname"; then
+	      soname="$dlname"
+	    elif test -n "$soname_spec"; then
+	      # bleh windows
+	      case $host in
+	      *cygwin* | mingw*)
+		major=`expr $current - $age`
+		versuffix="-$major"
+		;;
+	      esac
+	      eval soname=\"$soname_spec\"
+	    else
+	      soname="$realname"
+	    fi
+
+	    # Make a new name for the extract_expsyms_cmds to use
+	    soroot="$soname"
+	    soname=`$echo $soroot | ${SED} -e 's/^.*\///'`
+	    newlib="libimp-`$echo $soname | ${SED} 's/^lib//;s/\.dll$//'`.a"
+
+	    # If the library has no export list, then create one now
+	    if test -f "$output_objdir/$soname-def"; then :
+	    else
+	      $show "extracting exported symbol list from \`$soname'"
+	      save_ifs="$IFS"; IFS='~'
+	      cmds=$extract_expsyms_cmds
+	      for cmd in $cmds; do
+		IFS="$save_ifs"
+		eval cmd=\"$cmd\"
+		$show "$cmd"
+		$run eval "$cmd" || exit $?
+	      done
+	      IFS="$save_ifs"
+	    fi
+
+	    # Create $newlib
+	    if test -f "$output_objdir/$newlib"; then :; else
+	      $show "generating import library for \`$soname'"
+	      save_ifs="$IFS"; IFS='~'
+	      cmds=$old_archive_from_expsyms_cmds
+	      for cmd in $cmds; do
+		IFS="$save_ifs"
+		eval cmd=\"$cmd\"
+		$show "$cmd"
+		$run eval "$cmd" || exit $?
+	      done
+	      IFS="$save_ifs"
+	    fi
+	    # make sure the library variables are pointing to the new library
+	    dir=$output_objdir
+	    linklib=$newlib
+	  fi # test -n "$old_archive_from_expsyms_cmds"
+
+	  if test "$linkmode" = prog || test "$mode" != relink; then
+	    add_shlibpath=
+	    add_dir=
+	    add=
+	    lib_linked=yes
+	    case $hardcode_action in
+	    immediate | unsupported)
+	      if test "$hardcode_direct" = no; then
+		add="$dir/$linklib"
+		case $host in
+		  *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;;
+		  *-*-sysv4*uw2*) add_dir="-L$dir" ;;
+		  *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \
+		    *-*-unixware7*) add_dir="-L$dir" ;;
+		  *-*-darwin* )
+		    # if the lib is a module then we can not link against
+		    # it, someone is ignoring the new warnings I added
+		    if /usr/bin/file -L $add 2> /dev/null |
+                      $EGREP ": [^:]* bundle" >/dev/null ; then
+		      $echo "** Warning, lib $linklib is a module, not a shared library"
+		      if test -z "$old_library" ; then
+		        $echo
+		        $echo "** And there doesn't seem to be a static archive available"
+		        $echo "** The link will probably fail, sorry"
+		      else
+		        add="$dir/$old_library"
+		      fi
+		    fi
+		esac
+	      elif test "$hardcode_minus_L" = no; then
+		case $host in
+		*-*-sunos*) add_shlibpath="$dir" ;;
+		esac
+		add_dir="-L$dir"
+		add="-l$name"
+	      elif test "$hardcode_shlibpath_var" = no; then
+		add_shlibpath="$dir"
+		add="-l$name"
+	      else
+		lib_linked=no
+	      fi
+	      ;;
+	    relink)
+	      if test "$hardcode_direct" = yes; then
+		add="$dir/$linklib"
+	      elif test "$hardcode_minus_L" = yes; then
+		add_dir="-L$dir"
+		# Try looking first in the location we're being installed to.
+		if test -n "$inst_prefix_dir"; then
+		  case $libdir in
+		    [\\/]*)
+		      add_dir="$add_dir -L$inst_prefix_dir$libdir"
+		      ;;
+		  esac
+		fi
+		add="-l$name"
+	      elif test "$hardcode_shlibpath_var" = yes; then
+		add_shlibpath="$dir"
+		add="-l$name"
+	      else
+		lib_linked=no
+	      fi
+	      ;;
+	    *) lib_linked=no ;;
+	    esac
+
+	    if test "$lib_linked" != yes; then
+	      $echo "$modename: configuration error: unsupported hardcode properties"
+	      exit $EXIT_FAILURE
+	    fi
+
+	    if test -n "$add_shlibpath"; then
+	      case :$compile_shlibpath: in
+	      *":$add_shlibpath:"*) ;;
+	      *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
+	      esac
+	    fi
+	    if test "$linkmode" = prog; then
+	      test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
+	      test -n "$add" && compile_deplibs="$add $compile_deplibs"
+	    else
+	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
+	      test -n "$add" && deplibs="$add $deplibs"
+	      if test "$hardcode_direct" != yes && \
+		 test "$hardcode_minus_L" != yes && \
+		 test "$hardcode_shlibpath_var" = yes; then
+		case :$finalize_shlibpath: in
+		*":$libdir:"*) ;;
+		*) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
+		esac
+	      fi
+	    fi
+	  fi
+
+	  if test "$linkmode" = prog || test "$mode" = relink; then
+	    add_shlibpath=
+	    add_dir=
+	    add=
+	    # Finalize command for both is simple: just hardcode it.
+	    if test "$hardcode_direct" = yes; then
+	      add="$libdir/$linklib"
+	    elif test "$hardcode_minus_L" = yes; then
+	      add_dir="-L$libdir"
+	      add="-l$name"
+	    elif test "$hardcode_shlibpath_var" = yes; then
+	      case :$finalize_shlibpath: in
+	      *":$libdir:"*) ;;
+	      *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
+	      esac
+	      add="-l$name"
+	    elif test "$hardcode_automatic" = yes; then
+	      if test -n "$inst_prefix_dir" &&
+		 test -f "$inst_prefix_dir$libdir/$linklib" ; then
+	        add="$inst_prefix_dir$libdir/$linklib"
+	      else
+	        add="$libdir/$linklib"
+	      fi
+	    else
+	      # We cannot seem to hardcode it, guess we'll fake it.
+	      add_dir="-L$libdir"
+	      # Try looking first in the location we're being installed to.
+	      if test -n "$inst_prefix_dir"; then
+		case $libdir in
+		  [\\/]*)
+		    add_dir="$add_dir -L$inst_prefix_dir$libdir"
+		    ;;
+		esac
+	      fi
+	      add="-l$name"
+	    fi
+
+	    if test "$linkmode" = prog; then
+	      test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
+	      test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
+	    else
+	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
+	      test -n "$add" && deplibs="$add $deplibs"
+	    fi
+	  fi
+	elif test "$linkmode" = prog; then
+	  # Here we assume that one of hardcode_direct or hardcode_minus_L
+	  # is not unsupported.  This is valid on all known static and
+	  # shared platforms.
+	  if test "$hardcode_direct" != unsupported; then
+	    test -n "$old_library" && linklib="$old_library"
+	    compile_deplibs="$dir/$linklib $compile_deplibs"
+	    finalize_deplibs="$dir/$linklib $finalize_deplibs"
+	  else
+	    compile_deplibs="-l$name -L$dir $compile_deplibs"
+	    finalize_deplibs="-l$name -L$dir $finalize_deplibs"
+	  fi
+	elif test "$build_libtool_libs" = yes; then
+	  # Not a shared library
+	  if test "$deplibs_check_method" != pass_all; then
+	    # We're trying link a shared library against a static one
+	    # but the system doesn't support it.
+
+	    # Just print a warning and add the library to dependency_libs so
+	    # that the program can be linked against the static library.
+	    $echo
+	    $echo "*** Warning: This system can not link to static lib archive $lib."
+	    $echo "*** I have the capability to make that library automatically link in when"
+	    $echo "*** you link to this library.  But I can only do this if you have a"
+	    $echo "*** shared version of the library, which you do not appear to have."
+	    if test "$module" = yes; then
+	      $echo "*** But as you try to build a module library, libtool will still create "
+	      $echo "*** a static module, that should work as long as the dlopening application"
+	      $echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
+	      if test -z "$global_symbol_pipe"; then
+		$echo
+		$echo "*** However, this would only work if libtool was able to extract symbol"
+		$echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
+		$echo "*** not find such a program.  So, this module is probably useless."
+		$echo "*** \`nm' from GNU binutils and a full rebuild may help."
+	      fi
+	      if test "$build_old_libs" = no; then
+		build_libtool_libs=module
+		build_old_libs=yes
+	      else
+		build_libtool_libs=no
+	      fi
+	    fi
+	  else
+	    deplibs="$dir/$old_library $deplibs"
+	    link_static=yes
+	  fi
+	fi # link shared/static library?
+
+	if test "$linkmode" = lib; then
+	  if test -n "$dependency_libs" &&
+	     { test "$hardcode_into_libs" != yes ||
+	       test "$build_old_libs" = yes ||
+	       test "$link_static" = yes; }; then
+	    # Extract -R from dependency_libs
+	    temp_deplibs=
+	    for libdir in $dependency_libs; do
+	      case $libdir in
+	      -R*) temp_xrpath=`$echo "X$libdir" | $Xsed -e 's/^-R//'`
+		   case " $xrpath " in
+		   *" $temp_xrpath "*) ;;
+		   *) xrpath="$xrpath $temp_xrpath";;
+		   esac;;
+	      *) temp_deplibs="$temp_deplibs $libdir";;
+	      esac
+	    done
+	    dependency_libs="$temp_deplibs"
+	  fi
+
+	  newlib_search_path="$newlib_search_path $absdir"
+	  # Link against this library
+	  test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
+	  # ... and its dependency_libs
+	  tmp_libs=
+	  for deplib in $dependency_libs; do
+	    newdependency_libs="$deplib $newdependency_libs"
+	    if test "X$duplicate_deps" = "Xyes" ; then
+	      case "$tmp_libs " in
+	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+	      esac
+	    fi
+	    tmp_libs="$tmp_libs $deplib"
+	  done
+
+	  if test "$link_all_deplibs" != no; then
+	    # Add the search paths of all dependency libraries
+	    for deplib in $dependency_libs; do
+	      case $deplib in
+	      -L*) path="$deplib" ;;
+	      *.la)
+		dir=`$echo "X$deplib" | $Xsed -e 's%/[^/]*$%%'`
+		test "X$dir" = "X$deplib" && dir="."
+		# We need an absolute path.
+		case $dir in
+		[\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
+		*)
+		  absdir=`cd "$dir" && pwd`
+		  if test -z "$absdir"; then
+		    $echo "$modename: warning: cannot determine absolute directory name of \`$dir'" 1>&2
+		    absdir="$dir"
+		  fi
+		  ;;
+		esac
+		if grep "^installed=no" $deplib > /dev/null; then
+		  path="$absdir/$objdir"
+		else
+		  eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+		  if test -z "$libdir"; then
+		    $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
+		    exit $EXIT_FAILURE
+		  fi
+		  if test "$absdir" != "$libdir"; then
+		    $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
+		  fi
+		  path="$absdir"
+		fi
+		depdepl=
+		case $host in
+		*-*-darwin*)
+		  # we do not want to link against static libs,
+		  # but need to link against shared
+		  eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
+		  if test -n "$deplibrary_names" ; then
+		    for tmp in $deplibrary_names ; do
+		      depdepl=$tmp
+		    done
+		    if test -f "$path/$depdepl" ; then
+		      depdepl="$path/$depdepl"
+		    fi
+		    # do not add paths which are already there
+		    case " $newlib_search_path " in
+		    *" $path "*) ;;
+		    *) newlib_search_path="$newlib_search_path $path";;
+		    esac
+		  fi
+		  path=""
+		  ;;
+		*)
+		  path="-L$path"
+		  ;;
+		esac
+		;;
+	      -l*)
+		case $host in
+		*-*-darwin*)
+		  # Again, we only want to link against shared libraries
+		  eval tmp_libs=`$echo "X$deplib" | $Xsed -e "s,^\-l,,"`
+		  for tmp in $newlib_search_path ; do
+		    if test -f "$tmp/lib$tmp_libs.dylib" ; then
+		      eval depdepl="$tmp/lib$tmp_libs.dylib"
+		      break
+		    fi
+		  done
+		  path=""
+		  ;;
+		*) continue ;;
+		esac
+		;;
+	      *) continue ;;
+	      esac
+	      case " $deplibs " in
+	      *" $path "*) ;;
+	      *) deplibs="$path $deplibs" ;;
+	      esac
+	      case " $deplibs " in
+	      *" $depdepl "*) ;;
+	      *) deplibs="$depdepl $deplibs" ;;
+	      esac
+	    done
+	  fi # link_all_deplibs != no
+	fi # linkmode = lib
+      done # for deplib in $libs
+      dependency_libs="$newdependency_libs"
+      if test "$pass" = dlpreopen; then
+	# Link the dlpreopened libraries before other libraries
+	for deplib in $save_deplibs; do
+	  deplibs="$deplib $deplibs"
+	done
+      fi
+      if test "$pass" != dlopen; then
+	if test "$pass" != conv; then
+	  # Make sure lib_search_path contains only unique directories.
+	  lib_search_path=
+	  for dir in $newlib_search_path; do
+	    case "$lib_search_path " in
+	    *" $dir "*) ;;
+	    *) lib_search_path="$lib_search_path $dir" ;;
+	    esac
+	  done
+	  newlib_search_path=
+	fi
+
+	if test "$linkmode,$pass" != "prog,link"; then
+	  vars="deplibs"
+	else
+	  vars="compile_deplibs finalize_deplibs"
+	fi
+	for var in $vars dependency_libs; do
+	  # Add libraries to $var in reverse order
+	  eval tmp_libs=\"\$$var\"
+	  new_libs=
+	  for deplib in $tmp_libs; do
+	    # FIXME: Pedantically, this is the right thing to do, so
+	    #        that some nasty dependency loop isn't accidentally
+	    #        broken:
+	    #new_libs="$deplib $new_libs"
+	    # Pragmatically, this seems to cause very few problems in
+	    # practice:
+	    case $deplib in
+	    -L*) new_libs="$deplib $new_libs" ;;
+	    -R*) ;;
+	    *)
+	      # And here is the reason: when a library appears more
+	      # than once as an explicit dependence of a library, or
+	      # is implicitly linked in more than once by the
+	      # compiler, it is considered special, and multiple
+	      # occurrences thereof are not removed.  Compare this
+	      # with having the same library being listed as a
+	      # dependency of multiple other libraries: in this case,
+	      # we know (pedantically, we assume) the library does not
+	      # need to be listed more than once, so we keep only the
+	      # last copy.  This is not always right, but it is rare
+	      # enough that we require users that really mean to play
+	      # such unportable linking tricks to link the library
+	      # using -Wl,-lname, so that libtool does not consider it
+	      # for duplicate removal.
+	      case " $specialdeplibs " in
+	      *" $deplib "*) new_libs="$deplib $new_libs" ;;
+	      *)
+		case " $new_libs " in
+		*" $deplib "*) ;;
+		*) new_libs="$deplib $new_libs" ;;
+		esac
+		;;
+	      esac
+	      ;;
+	    esac
+	  done
+	  tmp_libs=
+	  for deplib in $new_libs; do
+	    case $deplib in
+	    -L*)
+	      case " $tmp_libs " in
+	      *" $deplib "*) ;;
+	      *) tmp_libs="$tmp_libs $deplib" ;;
+	      esac
+	      ;;
+	    *) tmp_libs="$tmp_libs $deplib" ;;
+	    esac
+	  done
+	  eval $var=\"$tmp_libs\"
+	done # for var
+      fi
+      # Last step: remove runtime libs from dependency_libs
+      # (they stay in deplibs)
+      tmp_libs=
+      for i in $dependency_libs ; do
+	case " $predeps $postdeps $compiler_lib_search_path " in
+	*" $i "*)
+	  i=""
+	  ;;
+	esac
+	if test -n "$i" ; then
+	  tmp_libs="$tmp_libs $i"
+	fi
+      done
+      dependency_libs=$tmp_libs
+    done # for pass
+    if test "$linkmode" = prog; then
+      dlfiles="$newdlfiles"
+      dlprefiles="$newdlprefiles"
+    fi
+
+    case $linkmode in
+    oldlib)
+      if test -n "$deplibs"; then
+	$echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2
+      fi
+
+      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
+	$echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2
+      fi
+
+      if test -n "$rpath"; then
+	$echo "$modename: warning: \`-rpath' is ignored for archives" 1>&2
+      fi
+
+      if test -n "$xrpath"; then
+	$echo "$modename: warning: \`-R' is ignored for archives" 1>&2
+      fi
+
+      if test -n "$vinfo"; then
+	$echo "$modename: warning: \`-version-info/-version-number' is ignored for archives" 1>&2
+      fi
+
+      if test -n "$release"; then
+	$echo "$modename: warning: \`-release' is ignored for archives" 1>&2
+      fi
+
+      if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
+	$echo "$modename: warning: \`-export-symbols' is ignored for archives" 1>&2
+      fi
+
+      # Now set the variables for building old libraries.
+      build_libtool_libs=no
+      oldlibs="$output"
+      objs="$objs$old_deplibs"
+      ;;
+
+    lib)
+      # Make sure we only generate libraries of the form `libNAME.la'.
+      case $outputname in
+      lib*)
+	name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
+	eval shared_ext=\"$shrext_cmds\"
+	eval libname=\"$libname_spec\"
+	;;
+      *)
+	if test "$module" = no; then
+	  $echo "$modename: libtool library \`$output' must begin with \`lib'" 1>&2
+	  $echo "$help" 1>&2
+	  exit $EXIT_FAILURE
+	fi
+	if test "$need_lib_prefix" != no; then
+	  # Add the "lib" prefix for modules if required
+	  name=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
+	  eval shared_ext=\"$shrext_cmds\"
+	  eval libname=\"$libname_spec\"
+	else
+	  libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
+	fi
+	;;
+      esac
+
+      if test -n "$objs"; then
+	if test "$deplibs_check_method" != pass_all; then
+	  $echo "$modename: cannot build libtool library \`$output' from non-libtool objects on this host:$objs" 2>&1
+	  exit $EXIT_FAILURE
+	else
+	  $echo
+	  $echo "*** Warning: Linking the shared library $output against the non-libtool"
+	  $echo "*** objects $objs is not portable!"
+	  libobjs="$libobjs $objs"
+	fi
+      fi
+
+      if test "$dlself" != no; then
+	$echo "$modename: warning: \`-dlopen self' is ignored for libtool libraries" 1>&2
+      fi
+
+      set dummy $rpath
+      if test "$#" -gt 2; then
+	$echo "$modename: warning: ignoring multiple \`-rpath's for a libtool library" 1>&2
+      fi
+      install_libdir="$2"
+
+      oldlibs=
+      if test -z "$rpath"; then
+	if test "$build_libtool_libs" = yes; then
+	  # Building a libtool convenience library.
+	  # Some compilers have problems with a `.al' extension so
+	  # convenience libraries should have the same extension an
+	  # archive normally would.
+	  oldlibs="$output_objdir/$libname.$libext $oldlibs"
+	  build_libtool_libs=convenience
+	  build_old_libs=yes
+	fi
+
+	if test -n "$vinfo"; then
+	  $echo "$modename: warning: \`-version-info/-version-number' is ignored for convenience libraries" 1>&2
+	fi
+
+	if test -n "$release"; then
+	  $echo "$modename: warning: \`-release' is ignored for convenience libraries" 1>&2
+	fi
+      else
+
+	# Parse the version information argument.
+	save_ifs="$IFS"; IFS=':'
+	set dummy $vinfo 0 0 0
+	IFS="$save_ifs"
+
+	if test -n "$8"; then
+	  $echo "$modename: too many parameters to \`-version-info'" 1>&2
+	  $echo "$help" 1>&2
+	  exit $EXIT_FAILURE
+	fi
+
+	# convert absolute version numbers to libtool ages
+	# this retains compatibility with .la files and attempts
+	# to make the code below a bit more comprehensible
+
+	case $vinfo_number in
+	yes)
+	  number_major="$2"
+	  number_minor="$3"
+	  number_revision="$4"
+	  #
+	  # There are really only two kinds -- those that
+	  # use the current revision as the major version
+	  # and those that subtract age and use age as
+	  # a minor version.  But, then there is irix
+	  # which has an extra 1 added just for fun
+	  #
+	  case $version_type in
+	  darwin|linux|osf|windows)
+	    current=`expr $number_major + $number_minor`
+	    age="$number_minor"
+	    revision="$number_revision"
+	    ;;
+	  freebsd-aout|freebsd-elf|sunos)
+	    current="$number_major"
+	    revision="$number_minor"
+	    age="0"
+	    ;;
+	  irix|nonstopux)
+	    current=`expr $number_major + $number_minor - 1`
+	    age="$number_minor"
+	    revision="$number_minor"
+	    ;;
+	  *)
+	    $echo "$modename: unknown library version type \`$version_type'" 1>&2
+	    $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
+	    exit $EXIT_FAILURE
+	    ;;
+	  esac
+	  ;;
+	no)
+	  current="$2"
+	  revision="$3"
+	  age="$4"
+	  ;;
+	esac
+
+	# Check that each of the things are valid numbers.
+	case $current in
+	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
+	*)
+	  $echo "$modename: CURRENT \`$current' must be a nonnegative integer" 1>&2
+	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+	  exit $EXIT_FAILURE
+	  ;;
+	esac
+
+	case $revision in
+	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
+	*)
+	  $echo "$modename: REVISION \`$revision' must be a nonnegative integer" 1>&2
+	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+	  exit $EXIT_FAILURE
+	  ;;
+	esac
+
+	case $age in
+	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
+	*)
+	  $echo "$modename: AGE \`$age' must be a nonnegative integer" 1>&2
+	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+	  exit $EXIT_FAILURE
+	  ;;
+	esac
+
+	if test "$age" -gt "$current"; then
+	  $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2
+	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+	  exit $EXIT_FAILURE
+	fi
+
+	# Calculate the version variables.
+	major=
+	versuffix=
+	verstring=
+	case $version_type in
+	none) ;;
+
+	darwin)
+	  # Like Linux, but with the current version available in
+	  # verstring for coding it into the library header
+	  major=.`expr $current - $age`
+	  versuffix="$major.$age.$revision"
+	  # Darwin ld doesn't like 0 for these options...
+	  minor_current=`expr $current + 1`
+	  verstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
+	  ;;
+
+	freebsd-aout)
+	  major=".$current"
+	  versuffix=".$current.$revision";
+	  ;;
+
+	freebsd-elf)
+	  major=".$current"
+	  versuffix=".$current";
+	  ;;
+
+	irix | nonstopux)
+	  major=`expr $current - $age + 1`
+
+	  case $version_type in
+	    nonstopux) verstring_prefix=nonstopux ;;
+	    *)         verstring_prefix=sgi ;;
+	  esac
+	  verstring="$verstring_prefix$major.$revision"
+
+	  # Add in all the interfaces that we are compatible with.
+	  loop=$revision
+	  while test "$loop" -ne 0; do
+	    iface=`expr $revision - $loop`
+	    loop=`expr $loop - 1`
+	    verstring="$verstring_prefix$major.$iface:$verstring"
+	  done
+
+	  # Before this point, $major must not contain `.'.
+	  major=.$major
+	  versuffix="$major.$revision"
+	  ;;
+
+	linux)
+	  major=.`expr $current - $age`
+	  versuffix="$major.$age.$revision"
+	  ;;
+
+	osf)
+	  major=.`expr $current - $age`
+	  versuffix=".$current.$age.$revision"
+	  verstring="$current.$age.$revision"
+
+	  # Add in all the interfaces that we are compatible with.
+	  loop=$age
+	  while test "$loop" -ne 0; do
+	    iface=`expr $current - $loop`
+	    loop=`expr $loop - 1`
+	    verstring="$verstring:${iface}.0"
+	  done
+
+	  # Make executables depend on our current version.
+	  verstring="$verstring:${current}.0"
+	  ;;
+
+	sunos)
+	  major=".$current"
+	  versuffix=".$current.$revision"
+	  ;;
+
+	windows)
+	  # Use '-' rather than '.', since we only want one
+	  # extension on DOS 8.3 filesystems.
+	  major=`expr $current - $age`
+	  versuffix="-$major"
+	  ;;
+
+	*)
+	  $echo "$modename: unknown library version type \`$version_type'" 1>&2
+	  $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
+	  exit $EXIT_FAILURE
+	  ;;
+	esac
+
+	# Clear the version info if we defaulted, and they specified a release.
+	if test -z "$vinfo" && test -n "$release"; then
+	  major=
+	  case $version_type in
+	  darwin)
+	    # we can't check for "0.0" in archive_cmds due to quoting
+	    # problems, so we reset it completely
+	    verstring=
+	    ;;
+	  *)
+	    verstring="0.0"
+	    ;;
+	  esac
+	  if test "$need_version" = no; then
+	    versuffix=
+	  else
+	    versuffix=".0.0"
+	  fi
+	fi
+
+	# Remove version info from name if versioning should be avoided
+	if test "$avoid_version" = yes && test "$need_version" = no; then
+	  major=
+	  versuffix=
+	  verstring=""
+	fi
+
+	# Check to see if the archive will have undefined symbols.
+	if test "$allow_undefined" = yes; then
+	  if test "$allow_undefined_flag" = unsupported; then
+	    $echo "$modename: warning: undefined symbols not allowed in $host shared libraries" 1>&2
+	    build_libtool_libs=no
+	    build_old_libs=yes
+	  fi
+	else
+	  # Don't allow undefined symbols.
+	  allow_undefined_flag="$no_undefined_flag"
+	fi
+      fi
+
+      if test "$mode" != relink; then
+	# Remove our outputs, but don't remove object files since they
+	# may have been created when compiling PIC objects.
+	removelist=
+	tempremovelist=`$echo "$output_objdir/*"`
+	for p in $tempremovelist; do
+	  case $p in
+	    *.$objext)
+	       ;;
+	    $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
+	       if test "X$precious_files_regex" != "X"; then
+	         if echo $p | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
+	         then
+		   continue
+		 fi
+	       fi
+	       removelist="$removelist $p"
+	       ;;
+	    *) ;;
+	  esac
+	done
+	if test -n "$removelist"; then
+	  $show "${rm}r $removelist"
+	  $run ${rm}r $removelist
+	fi
+      fi
+
+      # Now set the variables for building old libraries.
+      if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
+	oldlibs="$oldlibs $output_objdir/$libname.$libext"
+
+	# Transform .lo files to .o files.
+	oldobjs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP`
+      fi
+
+      # Eliminate all temporary directories.
+      for path in $notinst_path; do
+	lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
+	deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
+	dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
+      done
+
+      if test -n "$xrpath"; then
+	# If the user specified any rpath flags, then add them.
+	temp_xrpath=
+	for libdir in $xrpath; do
+	  temp_xrpath="$temp_xrpath -R$libdir"
+	  case "$finalize_rpath " in
+	  *" $libdir "*) ;;
+	  *) finalize_rpath="$finalize_rpath $libdir" ;;
+	  esac
+	done
+	if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
+	  dependency_libs="$temp_xrpath $dependency_libs"
+	fi
+      fi
+
+      # Make sure dlfiles contains only unique files that won't be dlpreopened
+      old_dlfiles="$dlfiles"
+      dlfiles=
+      for lib in $old_dlfiles; do
+	case " $dlprefiles $dlfiles " in
+	*" $lib "*) ;;
+	*) dlfiles="$dlfiles $lib" ;;
+	esac
+      done
+
+      # Make sure dlprefiles contains only unique files
+      old_dlprefiles="$dlprefiles"
+      dlprefiles=
+      for lib in $old_dlprefiles; do
+	case "$dlprefiles " in
+	*" $lib "*) ;;
+	*) dlprefiles="$dlprefiles $lib" ;;
+	esac
+      done
+
+      if test "$build_libtool_libs" = yes; then
+	if test -n "$rpath"; then
+	  case $host in
+	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*)
+	    # these systems don't actually have a c library (as such)!
+	    ;;
+	  *-*-rhapsody* | *-*-darwin1.[012])
+	    # Rhapsody C library is in the System framework
+	    deplibs="$deplibs -framework System"
+	    ;;
+	  *-*-netbsd*)
+	    # Don't link with libc until the a.out ld.so is fixed.
+	    ;;
+	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+	    # Do not include libc due to us having libc/libc_r.
+	    ;;
+	  *-*-sco3.2v5* | *-*-sco5v6*)
+	    # Causes problems with __ctype
+	    ;;
+	  *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
+	    # Compiler inserts libc in the correct place for threads to work
+	    ;;
+ 	  *)
+	    # Add libc to deplibs on all other systems if necessary.
+	    if test "$build_libtool_need_lc" = "yes"; then
+	      deplibs="$deplibs -lc"
+	    fi
+	    ;;
+	  esac
+	fi
+
+	# Transform deplibs into only deplibs that can be linked in shared.
+	name_save=$name
+	libname_save=$libname
+	release_save=$release
+	versuffix_save=$versuffix
+	major_save=$major
+	# I'm not sure if I'm treating the release correctly.  I think
+	# release should show up in the -l (ie -lgmp5) so we don't want to
+	# add it in twice.  Is that correct?
+	release=""
+	versuffix=""
+	major=""
+	newdeplibs=
+	droppeddeps=no
+	case $deplibs_check_method in
+	pass_all)
+	  # Don't check for shared/static.  Everything works.
+	  # This might be a little naive.  We might want to check
+	  # whether the library exists or not.  But this is on
+	  # osf3 & osf4 and I'm not really sure... Just
+	  # implementing what was already the behavior.
+	  newdeplibs=$deplibs
+	  ;;
+	test_compile)
+	  # This code stresses the "libraries are programs" paradigm to its
+	  # limits. Maybe even breaks it.  We compile a program, linking it
+	  # against the deplibs as a proxy for the library.  Then we can check
+	  # whether they linked in statically or dynamically with ldd.
+	  $rm conftest.c
+	  cat > conftest.c <<EOF
+	  int main() { return 0; }
+EOF
+	  $rm conftest
+	  $LTCC $LTCFLAGS -o conftest conftest.c $deplibs
+	  if test "$?" -eq 0 ; then
+	    ldd_output=`ldd conftest`
+	    for i in $deplibs; do
+	      name=`expr $i : '-l\(.*\)'`
+	      # If $name is empty we are operating on a -L argument.
+              if test "$name" != "" && test "$name" -ne "0"; then
+		if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+		  case " $predeps $postdeps " in
+		  *" $i "*)
+		    newdeplibs="$newdeplibs $i"
+		    i=""
+		    ;;
+		  esac
+	        fi
+		if test -n "$i" ; then
+		  libname=`eval \\$echo \"$libname_spec\"`
+		  deplib_matches=`eval \\$echo \"$library_names_spec\"`
+		  set dummy $deplib_matches
+		  deplib_match=$2
+		  if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
+		    newdeplibs="$newdeplibs $i"
+		  else
+		    droppeddeps=yes
+		    $echo
+		    $echo "*** Warning: dynamic linker does not accept needed library $i."
+		    $echo "*** I have the capability to make that library automatically link in when"
+		    $echo "*** you link to this library.  But I can only do this if you have a"
+		    $echo "*** shared version of the library, which I believe you do not have"
+		    $echo "*** because a test_compile did reveal that the linker did not use it for"
+		    $echo "*** its dynamic dependency list that programs get resolved with at runtime."
+		  fi
+		fi
+	      else
+		newdeplibs="$newdeplibs $i"
+	      fi
+	    done
+	  else
+	    # Error occurred in the first compile.  Let's try to salvage
+	    # the situation: Compile a separate program for each library.
+	    for i in $deplibs; do
+	      name=`expr $i : '-l\(.*\)'`
+	      # If $name is empty we are operating on a -L argument.
+              if test "$name" != "" && test "$name" != "0"; then
+		$rm conftest
+		$LTCC $LTCFLAGS -o conftest conftest.c $i
+		# Did it work?
+		if test "$?" -eq 0 ; then
+		  ldd_output=`ldd conftest`
+		  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+		    case " $predeps $postdeps " in
+		    *" $i "*)
+		      newdeplibs="$newdeplibs $i"
+		      i=""
+		      ;;
+		    esac
+		  fi
+		  if test -n "$i" ; then
+		    libname=`eval \\$echo \"$libname_spec\"`
+		    deplib_matches=`eval \\$echo \"$library_names_spec\"`
+		    set dummy $deplib_matches
+		    deplib_match=$2
+		    if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
+		      newdeplibs="$newdeplibs $i"
+		    else
+		      droppeddeps=yes
+		      $echo
+		      $echo "*** Warning: dynamic linker does not accept needed library $i."
+		      $echo "*** I have the capability to make that library automatically link in when"
+		      $echo "*** you link to this library.  But I can only do this if you have a"
+		      $echo "*** shared version of the library, which you do not appear to have"
+		      $echo "*** because a test_compile did reveal that the linker did not use this one"
+		      $echo "*** as a dynamic dependency that programs can get resolved with at runtime."
+		    fi
+		  fi
+		else
+		  droppeddeps=yes
+		  $echo
+		  $echo "*** Warning!  Library $i is needed by this library but I was not able to"
+		  $echo "***  make it link in!  You will probably need to install it or some"
+		  $echo "*** library that it depends on before this library will be fully"
+		  $echo "*** functional.  Installing it before continuing would be even better."
+		fi
+	      else
+		newdeplibs="$newdeplibs $i"
+	      fi
+	    done
+	  fi
+	  ;;
+	file_magic*)
+	  set dummy $deplibs_check_method
+	  file_magic_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
+	  for a_deplib in $deplibs; do
+	    name=`expr $a_deplib : '-l\(.*\)'`
+	    # If $name is empty we are operating on a -L argument.
+            if test "$name" != "" && test  "$name" != "0"; then
+	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+		case " $predeps $postdeps " in
+		*" $a_deplib "*)
+		  newdeplibs="$newdeplibs $a_deplib"
+		  a_deplib=""
+		  ;;
+		esac
+	      fi
+	      if test -n "$a_deplib" ; then
+		libname=`eval \\$echo \"$libname_spec\"`
+		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
+		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
+		  for potent_lib in $potential_libs; do
+		      # Follow soft links.
+		      if ls -lLd "$potent_lib" 2>/dev/null \
+			 | grep " -> " >/dev/null; then
+			continue
+		      fi
+		      # The statement above tries to avoid entering an
+		      # endless loop below, in case of cyclic links.
+		      # We might still enter an endless loop, since a link
+		      # loop can be closed while we follow links,
+		      # but so what?
+		      potlib="$potent_lib"
+		      while test -h "$potlib" 2>/dev/null; do
+			potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
+			case $potliblink in
+			[\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
+			*) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
+			esac
+		      done
+		      if eval $file_magic_cmd \"\$potlib\" 2>/dev/null \
+			 | ${SED} 10q \
+			 | $EGREP "$file_magic_regex" > /dev/null; then
+			newdeplibs="$newdeplibs $a_deplib"
+			a_deplib=""
+			break 2
+		      fi
+		  done
+		done
+	      fi
+	      if test -n "$a_deplib" ; then
+		droppeddeps=yes
+		$echo
+		$echo "*** Warning: linker path does not have real file for library $a_deplib."
+		$echo "*** I have the capability to make that library automatically link in when"
+		$echo "*** you link to this library.  But I can only do this if you have a"
+		$echo "*** shared version of the library, which you do not appear to have"
+		$echo "*** because I did check the linker path looking for a file starting"
+		if test -z "$potlib" ; then
+		  $echo "*** with $libname but no candidates were found. (...for file magic test)"
+		else
+		  $echo "*** with $libname and none of the candidates passed a file format test"
+		  $echo "*** using a file magic. Last file checked: $potlib"
+		fi
+	      fi
+	    else
+	      # Add a -L argument.
+	      newdeplibs="$newdeplibs $a_deplib"
+	    fi
+	  done # Gone through all deplibs.
+	  ;;
+	match_pattern*)
+	  set dummy $deplibs_check_method
+	  match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
+	  for a_deplib in $deplibs; do
+	    name=`expr $a_deplib : '-l\(.*\)'`
+	    # If $name is empty we are operating on a -L argument.
+	    if test -n "$name" && test "$name" != "0"; then
+	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+		case " $predeps $postdeps " in
+		*" $a_deplib "*)
+		  newdeplibs="$newdeplibs $a_deplib"
+		  a_deplib=""
+		  ;;
+		esac
+	      fi
+	      if test -n "$a_deplib" ; then
+		libname=`eval \\$echo \"$libname_spec\"`
+		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
+		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
+		  for potent_lib in $potential_libs; do
+		    potlib="$potent_lib" # see symlink-check above in file_magic test
+		    if eval $echo \"$potent_lib\" 2>/dev/null \
+		        | ${SED} 10q \
+		        | $EGREP "$match_pattern_regex" > /dev/null; then
+		      newdeplibs="$newdeplibs $a_deplib"
+		      a_deplib=""
+		      break 2
+		    fi
+		  done
+		done
+	      fi
+	      if test -n "$a_deplib" ; then
+		droppeddeps=yes
+		$echo
+		$echo "*** Warning: linker path does not have real file for library $a_deplib."
+		$echo "*** I have the capability to make that library automatically link in when"
+		$echo "*** you link to this library.  But I can only do this if you have a"
+		$echo "*** shared version of the library, which you do not appear to have"
+		$echo "*** because I did check the linker path looking for a file starting"
+		if test -z "$potlib" ; then
+		  $echo "*** with $libname but no candidates were found. (...for regex pattern test)"
+		else
+		  $echo "*** with $libname and none of the candidates passed a file format test"
+		  $echo "*** using a regex pattern. Last file checked: $potlib"
+		fi
+	      fi
+	    else
+	      # Add a -L argument.
+	      newdeplibs="$newdeplibs $a_deplib"
+	    fi
+	  done # Gone through all deplibs.
+	  ;;
+	none | unknown | *)
+	  newdeplibs=""
+	  tmp_deplibs=`$echo "X $deplibs" | $Xsed -e 's/ -lc$//' \
+	    -e 's/ -[LR][^ ]*//g'`
+	  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+	    for i in $predeps $postdeps ; do
+	      # can't use Xsed below, because $i might contain '/'
+	      tmp_deplibs=`$echo "X $tmp_deplibs" | ${SED} -e "1s,^X,," -e "s,$i,,"`
+	    done
+	  fi
+	  if $echo "X $tmp_deplibs" | $Xsed -e 's/[ 	]//g' \
+	    | grep . >/dev/null; then
+	    $echo
+	    if test "X$deplibs_check_method" = "Xnone"; then
+	      $echo "*** Warning: inter-library dependencies are not supported in this platform."
+	    else
+	      $echo "*** Warning: inter-library dependencies are not known to be supported."
+	    fi
+	    $echo "*** All declared inter-library dependencies are being dropped."
+	    droppeddeps=yes
+	  fi
+	  ;;
+	esac
+	versuffix=$versuffix_save
+	major=$major_save
+	release=$release_save
+	libname=$libname_save
+	name=$name_save
+
+	case $host in
+	*-*-rhapsody* | *-*-darwin1.[012])
+	  # On Rhapsody replace the C library is the System framework
+	  newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's/ -lc / -framework System /'`
+	  ;;
+	esac
+
+	if test "$droppeddeps" = yes; then
+	  if test "$module" = yes; then
+	    $echo
+	    $echo "*** Warning: libtool could not satisfy all declared inter-library"
+	    $echo "*** dependencies of module $libname.  Therefore, libtool will create"
+	    $echo "*** a static module, that should work as long as the dlopening"
+	    $echo "*** application is linked with the -dlopen flag."
+	    if test -z "$global_symbol_pipe"; then
+	      $echo
+	      $echo "*** However, this would only work if libtool was able to extract symbol"
+	      $echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
+	      $echo "*** not find such a program.  So, this module is probably useless."
+	      $echo "*** \`nm' from GNU binutils and a full rebuild may help."
+	    fi
+	    if test "$build_old_libs" = no; then
+	      oldlibs="$output_objdir/$libname.$libext"
+	      build_libtool_libs=module
+	      build_old_libs=yes
+	    else
+	      build_libtool_libs=no
+	    fi
+	  else
+	    $echo "*** The inter-library dependencies that have been dropped here will be"
+	    $echo "*** automatically added whenever a program is linked with this library"
+	    $echo "*** or is declared to -dlopen it."
+
+	    if test "$allow_undefined" = no; then
+	      $echo
+	      $echo "*** Since this library must not contain undefined symbols,"
+	      $echo "*** because either the platform does not support them or"
+	      $echo "*** it was explicitly requested with -no-undefined,"
+	      $echo "*** libtool will only create a static version of it."
+	      if test "$build_old_libs" = no; then
+		oldlibs="$output_objdir/$libname.$libext"
+		build_libtool_libs=module
+		build_old_libs=yes
+	      else
+		build_libtool_libs=no
+	      fi
+	    fi
+	  fi
+	fi
+	# Done checking deplibs!
+	deplibs=$newdeplibs
+      fi
+
+
+      # move library search paths that coincide with paths to not yet
+      # installed libraries to the beginning of the library search list
+      new_libs=
+      for path in $notinst_path; do
+	case " $new_libs " in
+	*" -L$path/$objdir "*) ;;
+	*)
+	  case " $deplibs " in
+	  *" -L$path/$objdir "*)
+	    new_libs="$new_libs -L$path/$objdir" ;;
+	  esac
+	  ;;
+	esac
+      done
+      for deplib in $deplibs; do
+	case $deplib in
+	-L*)
+	  case " $new_libs " in
+	  *" $deplib "*) ;;
+	  *) new_libs="$new_libs $deplib" ;;
+	  esac
+	  ;;
+	*) new_libs="$new_libs $deplib" ;;
+	esac
+      done
+      deplibs="$new_libs"
+
+
+      # All the library-specific variables (install_libdir is set above).
+      library_names=
+      old_library=
+      dlname=
+
+      # Test again, we may have decided not to build it any more
+      if test "$build_libtool_libs" = yes; then
+	if test "$hardcode_into_libs" = yes; then
+	  # Hardcode the library paths
+	  hardcode_libdirs=
+	  dep_rpath=
+	  rpath="$finalize_rpath"
+	  test "$mode" != relink && rpath="$compile_rpath$rpath"
+	  for libdir in $rpath; do
+	    if test -n "$hardcode_libdir_flag_spec"; then
+	      if test -n "$hardcode_libdir_separator"; then
+		if test -z "$hardcode_libdirs"; then
+		  hardcode_libdirs="$libdir"
+		else
+		  # Just accumulate the unique libdirs.
+		  case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
+		  *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
+		    ;;
+		  *)
+		    hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
+		    ;;
+		  esac
+		fi
+	      else
+		eval flag=\"$hardcode_libdir_flag_spec\"
+		dep_rpath="$dep_rpath $flag"
+	      fi
+	    elif test -n "$runpath_var"; then
+	      case "$perm_rpath " in
+	      *" $libdir "*) ;;
+	      *) perm_rpath="$perm_rpath $libdir" ;;
+	      esac
+	    fi
+	  done
+	  # Substitute the hardcoded libdirs into the rpath.
+	  if test -n "$hardcode_libdir_separator" &&
+	     test -n "$hardcode_libdirs"; then
+	    libdir="$hardcode_libdirs"
+	    if test -n "$hardcode_libdir_flag_spec_ld"; then
+	      eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
+	    else
+	      eval dep_rpath=\"$hardcode_libdir_flag_spec\"
+	    fi
+	  fi
+	  if test -n "$runpath_var" && test -n "$perm_rpath"; then
+	    # We should set the runpath_var.
+	    rpath=
+	    for dir in $perm_rpath; do
+	      rpath="$rpath$dir:"
+	    done
+	    eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
+	  fi
+	  test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
+	fi
+
+	shlibpath="$finalize_shlibpath"
+	test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
+	if test -n "$shlibpath"; then
+	  eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
+	fi
+
+	# Get the real and link names of the library.
+	eval shared_ext=\"$shrext_cmds\"
+	eval library_names=\"$library_names_spec\"
+	set dummy $library_names
+	realname="$2"
+	shift; shift
+
+	if test -n "$soname_spec"; then
+	  eval soname=\"$soname_spec\"
+	else
+	  soname="$realname"
+	fi
+	if test -z "$dlname"; then
+	  dlname=$soname
+	fi
+
+	lib="$output_objdir/$realname"
+	linknames=
+	for link
+	do
+	  linknames="$linknames $link"
+	done
+
+	# Use standard objects if they are pic
+	test -z "$pic_flag" && libobjs=`$echo "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+
+	# Prepare the list of exported symbols
+	if test -z "$export_symbols"; then
+	  if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then
+	    $show "generating symbol list for \`$libname.la'"
+	    export_symbols="$output_objdir/$libname.exp"
+	    $run $rm $export_symbols
+	    cmds=$export_symbols_cmds
+	    save_ifs="$IFS"; IFS='~'
+	    for cmd in $cmds; do
+	      IFS="$save_ifs"
+	      eval cmd=\"$cmd\"
+	      if len=`expr "X$cmd" : ".*"` &&
+	       test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+	        $show "$cmd"
+	        $run eval "$cmd" || exit $?
+	        skipped_export=false
+	      else
+	        # The command line is too long to execute in one step.
+	        $show "using reloadable object file for export list..."
+	        skipped_export=:
+		# Break out early, otherwise skipped_export may be
+		# set to false by a later but shorter cmd.
+		break
+	      fi
+	    done
+	    IFS="$save_ifs"
+	    if test -n "$export_symbols_regex"; then
+	      $show "$EGREP -e \"$export_symbols_regex\" \"$export_symbols\" > \"${export_symbols}T\""
+	      $run eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
+	      $show "$mv \"${export_symbols}T\" \"$export_symbols\""
+	      $run eval '$mv "${export_symbols}T" "$export_symbols"'
+	    fi
+	  fi
+	fi
+
+	if test -n "$export_symbols" && test -n "$include_expsyms"; then
+	  $run eval '$echo "X$include_expsyms" | $SP2NL >> "$export_symbols"'
+	fi
+
+	tmp_deplibs=
+	for test_deplib in $deplibs; do
+		case " $convenience " in
+		*" $test_deplib "*) ;;
+		*)
+			tmp_deplibs="$tmp_deplibs $test_deplib"
+			;;
+		esac
+	done
+	deplibs="$tmp_deplibs"
+
+	if test -n "$convenience"; then
+	  if test -n "$whole_archive_flag_spec"; then
+	    save_libobjs=$libobjs
+	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
+	  else
+	    gentop="$output_objdir/${outputname}x"
+	    generated="$generated $gentop"
+
+	    func_extract_archives $gentop $convenience
+	    libobjs="$libobjs $func_extract_archives_result"
+	  fi
+	fi
+	
+	if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
+	  eval flag=\"$thread_safe_flag_spec\"
+	  linker_flags="$linker_flags $flag"
+	fi
+
+	# Make a backup of the uninstalled library when relinking
+	if test "$mode" = relink; then
+	  $run eval '(cd $output_objdir && $rm ${realname}U && $mv $realname ${realname}U)' || exit $?
+	fi
+
+	# Do each of the archive commands.
+	if test "$module" = yes && test -n "$module_cmds" ; then
+	  if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
+	    eval test_cmds=\"$module_expsym_cmds\"
+	    cmds=$module_expsym_cmds
+	  else
+	    eval test_cmds=\"$module_cmds\"
+	    cmds=$module_cmds
+	  fi
+	else
+	if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
+	  eval test_cmds=\"$archive_expsym_cmds\"
+	  cmds=$archive_expsym_cmds
+	else
+	  eval test_cmds=\"$archive_cmds\"
+	  cmds=$archive_cmds
+	  fi
+	fi
+
+	if test "X$skipped_export" != "X:" &&
+	   len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
+	   test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+	  :
+	else
+	  # The command line is too long to link in one step, link piecewise.
+	  $echo "creating reloadable object files..."
+
+	  # Save the value of $output and $libobjs because we want to
+	  # use them later.  If we have whole_archive_flag_spec, we
+	  # want to use save_libobjs as it was before
+	  # whole_archive_flag_spec was expanded, because we can't
+	  # assume the linker understands whole_archive_flag_spec.
+	  # This may have to be revisited, in case too many
+	  # convenience libraries get linked in and end up exceeding
+	  # the spec.
+	  if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then
+	    save_libobjs=$libobjs
+	  fi
+	  save_output=$output
+	  output_la=`$echo "X$output" | $Xsed -e "$basename"`
+
+	  # Clear the reloadable object creation command queue and
+	  # initialize k to one.
+	  test_cmds=
+	  concat_cmds=
+	  objlist=
+	  delfiles=
+	  last_robj=
+	  k=1
+	  output=$output_objdir/$output_la-${k}.$objext
+	  # Loop over the list of objects to be linked.
+	  for obj in $save_libobjs
+	  do
+	    eval test_cmds=\"$reload_cmds $objlist $last_robj\"
+	    if test "X$objlist" = X ||
+	       { len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
+		 test "$len" -le "$max_cmd_len"; }; then
+	      objlist="$objlist $obj"
+	    else
+	      # The command $test_cmds is almost too long, add a
+	      # command to the queue.
+	      if test "$k" -eq 1 ; then
+		# The first file doesn't have a previous command to add.
+		eval concat_cmds=\"$reload_cmds $objlist $last_robj\"
+	      else
+		# All subsequent reloadable object files will link in
+		# the last one created.
+		eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\"
+	      fi
+	      last_robj=$output_objdir/$output_la-${k}.$objext
+	      k=`expr $k + 1`
+	      output=$output_objdir/$output_la-${k}.$objext
+	      objlist=$obj
+	      len=1
+	    fi
+	  done
+	  # Handle the remaining objects by creating one last
+	  # reloadable object file.  All subsequent reloadable object
+	  # files will link in the last one created.
+	  test -z "$concat_cmds" || concat_cmds=$concat_cmds~
+	  eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\"
+
+	  if ${skipped_export-false}; then
+	    $show "generating symbol list for \`$libname.la'"
+	    export_symbols="$output_objdir/$libname.exp"
+	    $run $rm $export_symbols
+	    libobjs=$output
+	    # Append the command to create the export file.
+	    eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\"
+          fi
+
+	  # Set up a command to remove the reloadable object files
+	  # after they are used.
+	  i=0
+	  while test "$i" -lt "$k"
+	  do
+	    i=`expr $i + 1`
+	    delfiles="$delfiles $output_objdir/$output_la-${i}.$objext"
+	  done
+
+	  $echo "creating a temporary reloadable object file: $output"
+
+	  # Loop through the commands generated above and execute them.
+	  save_ifs="$IFS"; IFS='~'
+	  for cmd in $concat_cmds; do
+	    IFS="$save_ifs"
+	    $show "$cmd"
+	    $run eval "$cmd" || exit $?
+	  done
+	  IFS="$save_ifs"
+
+	  libobjs=$output
+	  # Restore the value of output.
+	  output=$save_output
+
+	  if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then
+	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
+	  fi
+	  # Expand the library linking commands again to reset the
+	  # value of $libobjs for piecewise linking.
+
+	  # Do each of the archive commands.
+	  if test "$module" = yes && test -n "$module_cmds" ; then
+	    if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
+	      cmds=$module_expsym_cmds
+	    else
+	      cmds=$module_cmds
+	    fi
+	  else
+	  if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
+	    cmds=$archive_expsym_cmds
+	  else
+	    cmds=$archive_cmds
+	    fi
+	  fi
+
+	  # Append the command to remove the reloadable object files
+	  # to the just-reset $cmds.
+	  eval cmds=\"\$cmds~\$rm $delfiles\"
+	fi
+	save_ifs="$IFS"; IFS='~'
+	for cmd in $cmds; do
+	  IFS="$save_ifs"
+	  eval cmd=\"$cmd\"
+	  $show "$cmd"
+	  $run eval "$cmd" || {
+	    lt_exit=$?
+
+	    # Restore the uninstalled library and exit
+	    if test "$mode" = relink; then
+	      $run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)'
+	    fi
+
+	    exit $lt_exit
+	  }
+	done
+	IFS="$save_ifs"
+
+	# Restore the uninstalled library and exit
+	if test "$mode" = relink; then
+	  $run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $?
+
+	  if test -n "$convenience"; then
+	    if test -z "$whole_archive_flag_spec"; then
+	      $show "${rm}r $gentop"
+	      $run ${rm}r "$gentop"
+	    fi
+	  fi
+
+	  exit $EXIT_SUCCESS
+	fi
+
+	# Create links to the real library.
+	for linkname in $linknames; do
+	  if test "$realname" != "$linkname"; then
+	    $show "(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)"
+	    $run eval '(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)' || exit $?
+	  fi
+	done
+
+	# If -module or -export-dynamic was specified, set the dlname.
+	if test "$module" = yes || test "$export_dynamic" = yes; then
+	  # On all known operating systems, these are identical.
+	  dlname="$soname"
+	fi
+      fi
+      ;;
+
+    obj)
+      if test -n "$deplibs"; then
+	$echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2
+      fi
+
+      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
+	$echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2
+      fi
+
+      if test -n "$rpath"; then
+	$echo "$modename: warning: \`-rpath' is ignored for objects" 1>&2
+      fi
+
+      if test -n "$xrpath"; then
+	$echo "$modename: warning: \`-R' is ignored for objects" 1>&2
+      fi
+
+      if test -n "$vinfo"; then
+	$echo "$modename: warning: \`-version-info' is ignored for objects" 1>&2
+      fi
+
+      if test -n "$release"; then
+	$echo "$modename: warning: \`-release' is ignored for objects" 1>&2
+      fi
+
+      case $output in
+      *.lo)
+	if test -n "$objs$old_deplibs"; then
+	  $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2
+	  exit $EXIT_FAILURE
+	fi
+	libobj="$output"
+	obj=`$echo "X$output" | $Xsed -e "$lo2o"`
+	;;
+      *)
+	libobj=
+	obj="$output"
+	;;
+      esac
+
+      # Delete the old objects.
+      $run $rm $obj $libobj
+
+      # Objects from convenience libraries.  This assumes
+      # single-version convenience libraries.  Whenever we create
+      # different ones for PIC/non-PIC, this we'll have to duplicate
+      # the extraction.
+      reload_conv_objs=
+      gentop=
+      # reload_cmds runs $LD directly, so let us get rid of
+      # -Wl from whole_archive_flag_spec
+      wl=
+
+      if test -n "$convenience"; then
+	if test -n "$whole_archive_flag_spec"; then
+	  eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
+	else
+	  gentop="$output_objdir/${obj}x"
+	  generated="$generated $gentop"
+
+	  func_extract_archives $gentop $convenience
+	  reload_conv_objs="$reload_objs $func_extract_archives_result"
+	fi
+      fi
+
+      # Create the old-style object.
+      reload_objs="$objs$old_deplibs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
+
+      output="$obj"
+      cmds=$reload_cmds
+      save_ifs="$IFS"; IFS='~'
+      for cmd in $cmds; do
+	IFS="$save_ifs"
+	eval cmd=\"$cmd\"
+	$show "$cmd"
+	$run eval "$cmd" || exit $?
+      done
+      IFS="$save_ifs"
+
+      # Exit if we aren't doing a library object file.
+      if test -z "$libobj"; then
+	if test -n "$gentop"; then
+	  $show "${rm}r $gentop"
+	  $run ${rm}r $gentop
+	fi
+
+	exit $EXIT_SUCCESS
+      fi
+
+      if test "$build_libtool_libs" != yes; then
+	if test -n "$gentop"; then
+	  $show "${rm}r $gentop"
+	  $run ${rm}r $gentop
+	fi
+
+	# Create an invalid libtool object if no PIC, so that we don't
+	# accidentally link it into a program.
+	# $show "echo timestamp > $libobj"
+	# $run eval "echo timestamp > $libobj" || exit $?
+	exit $EXIT_SUCCESS
+      fi
+
+      if test -n "$pic_flag" || test "$pic_mode" != default; then
+	# Only do commands if we really have different PIC objects.
+	reload_objs="$libobjs $reload_conv_objs"
+	output="$libobj"
+	cmds=$reload_cmds
+	save_ifs="$IFS"; IFS='~'
+	for cmd in $cmds; do
+	  IFS="$save_ifs"
+	  eval cmd=\"$cmd\"
+	  $show "$cmd"
+	  $run eval "$cmd" || exit $?
+	done
+	IFS="$save_ifs"
+      fi
+
+      if test -n "$gentop"; then
+	$show "${rm}r $gentop"
+	$run ${rm}r $gentop
+      fi
+
+      exit $EXIT_SUCCESS
+      ;;
+
+    prog)
+      case $host in
+	*cygwin*) output=`$echo $output | ${SED} -e 's,.exe$,,;s,$,.exe,'` ;;
+      esac
+      if test -n "$vinfo"; then
+	$echo "$modename: warning: \`-version-info' is ignored for programs" 1>&2
+      fi
+
+      if test -n "$release"; then
+	$echo "$modename: warning: \`-release' is ignored for programs" 1>&2
+      fi
+
+      if test "$preload" = yes; then
+	if test "$dlopen_support" = unknown && test "$dlopen_self" = unknown &&
+	   test "$dlopen_self_static" = unknown; then
+	  $echo "$modename: warning: \`AC_LIBTOOL_DLOPEN' not used. Assuming no dlopen support."
+	fi
+      fi
+
+      case $host in
+      *-*-rhapsody* | *-*-darwin1.[012])
+	# On Rhapsody replace the C library is the System framework
+	compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
+	finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
+	;;
+      esac
+
+      case $host in
+      *darwin*)
+        # Don't allow lazy linking, it breaks C++ global constructors
+        if test "$tagname" = CXX ; then
+        compile_command="$compile_command ${wl}-bind_at_load"
+        finalize_command="$finalize_command ${wl}-bind_at_load"
+        fi
+        ;;
+      esac
+
+
+      # move library search paths that coincide with paths to not yet
+      # installed libraries to the beginning of the library search list
+      new_libs=
+      for path in $notinst_path; do
+	case " $new_libs " in
+	*" -L$path/$objdir "*) ;;
+	*)
+	  case " $compile_deplibs " in
+	  *" -L$path/$objdir "*)
+	    new_libs="$new_libs -L$path/$objdir" ;;
+	  esac
+	  ;;
+	esac
+      done
+      for deplib in $compile_deplibs; do
+	case $deplib in
+	-L*)
+	  case " $new_libs " in
+	  *" $deplib "*) ;;
+	  *) new_libs="$new_libs $deplib" ;;
+	  esac
+	  ;;
+	*) new_libs="$new_libs $deplib" ;;
+	esac
+      done
+      compile_deplibs="$new_libs"
+
+
+      compile_command="$compile_command $compile_deplibs"
+      finalize_command="$finalize_command $finalize_deplibs"
+
+      if test -n "$rpath$xrpath"; then
+	# If the user specified any rpath flags, then add them.
+	for libdir in $rpath $xrpath; do
+	  # This is the magic to use -rpath.
+	  case "$finalize_rpath " in
+	  *" $libdir "*) ;;
+	  *) finalize_rpath="$finalize_rpath $libdir" ;;
+	  esac
+	done
+      fi
+
+      # Now hardcode the library paths
+      rpath=
+      hardcode_libdirs=
+      for libdir in $compile_rpath $finalize_rpath; do
+	if test -n "$hardcode_libdir_flag_spec"; then
+	  if test -n "$hardcode_libdir_separator"; then
+	    if test -z "$hardcode_libdirs"; then
+	      hardcode_libdirs="$libdir"
+	    else
+	      # Just accumulate the unique libdirs.
+	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
+	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
+		;;
+	      *)
+		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
+		;;
+	      esac
+	    fi
+	  else
+	    eval flag=\"$hardcode_libdir_flag_spec\"
+	    rpath="$rpath $flag"
+	  fi
+	elif test -n "$runpath_var"; then
+	  case "$perm_rpath " in
+	  *" $libdir "*) ;;
+	  *) perm_rpath="$perm_rpath $libdir" ;;
+	  esac
+	fi
+	case $host in
+	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
+	  testbindir=`$echo "X$libdir" | $Xsed -e 's*/lib$*/bin*'`
+	  case :$dllsearchpath: in
+	  *":$libdir:"*) ;;
+	  *) dllsearchpath="$dllsearchpath:$libdir";;
+	  esac
+	  case :$dllsearchpath: in
+	  *":$testbindir:"*) ;;
+	  *) dllsearchpath="$dllsearchpath:$testbindir";;
+	  esac
+	  ;;
+	esac
+      done
+      # Substitute the hardcoded libdirs into the rpath.
+      if test -n "$hardcode_libdir_separator" &&
+	 test -n "$hardcode_libdirs"; then
+	libdir="$hardcode_libdirs"
+	eval rpath=\" $hardcode_libdir_flag_spec\"
+      fi
+      compile_rpath="$rpath"
+
+      rpath=
+      hardcode_libdirs=
+      for libdir in $finalize_rpath; do
+	if test -n "$hardcode_libdir_flag_spec"; then
+	  if test -n "$hardcode_libdir_separator"; then
+	    if test -z "$hardcode_libdirs"; then
+	      hardcode_libdirs="$libdir"
+	    else
+	      # Just accumulate the unique libdirs.
+	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
+	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
+		;;
+	      *)
+		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
+		;;
+	      esac
+	    fi
+	  else
+	    eval flag=\"$hardcode_libdir_flag_spec\"
+	    rpath="$rpath $flag"
+	  fi
+	elif test -n "$runpath_var"; then
+	  case "$finalize_perm_rpath " in
+	  *" $libdir "*) ;;
+	  *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;;
+	  esac
+	fi
+      done
+      # Substitute the hardcoded libdirs into the rpath.
+      if test -n "$hardcode_libdir_separator" &&
+	 test -n "$hardcode_libdirs"; then
+	libdir="$hardcode_libdirs"
+	eval rpath=\" $hardcode_libdir_flag_spec\"
+      fi
+      finalize_rpath="$rpath"
+
+      if test -n "$libobjs" && test "$build_old_libs" = yes; then
+	# Transform all the library objects into standard objects.
+	compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+	finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+      fi
+
+      dlsyms=
+      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
+	if test -n "$NM" && test -n "$global_symbol_pipe"; then
+	  dlsyms="${outputname}S.c"
+	else
+	  $echo "$modename: not configured to extract global symbols from dlpreopened files" 1>&2
+	fi
+      fi
+
+      if test -n "$dlsyms"; then
+	case $dlsyms in
+	"") ;;
+	*.c)
+	  # Discover the nlist of each of the dlfiles.
+	  nlist="$output_objdir/${outputname}.nm"
+
+	  $show "$rm $nlist ${nlist}S ${nlist}T"
+	  $run $rm "$nlist" "${nlist}S" "${nlist}T"
+
+	  # Parse the name list into a source file.
+	  $show "creating $output_objdir/$dlsyms"
+
+	  test -z "$run" && $echo > "$output_objdir/$dlsyms" "\
+/* $dlsyms - symbol resolution table for \`$outputname' dlsym emulation. */
+/* Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP */
+
+#ifdef __cplusplus
+extern \"C\" {
+#endif
+
+/* Prevent the only kind of declaration conflicts we can make. */
+#define lt_preloaded_symbols some_other_symbol
+
+/* External symbol declarations for the compiler. */\
+"
+
+	  if test "$dlself" = yes; then
+	    $show "generating symbol list for \`$output'"
+
+	    test -z "$run" && $echo ': @PROGRAM@ ' > "$nlist"
+
+	    # Add our own program objects to the symbol list.
+	    progfiles=`$echo "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+	    for arg in $progfiles; do
+	      $show "extracting global C symbols from \`$arg'"
+	      $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
+	    done
+
+	    if test -n "$exclude_expsyms"; then
+	      $run eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
+	      $run eval '$mv "$nlist"T "$nlist"'
+	    fi
+
+	    if test -n "$export_symbols_regex"; then
+	      $run eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T'
+	      $run eval '$mv "$nlist"T "$nlist"'
+	    fi
+
+	    # Prepare the list of exported symbols
+	    if test -z "$export_symbols"; then
+	      export_symbols="$output_objdir/$outputname.exp"
+	      $run $rm $export_symbols
+	      $run eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
+              case $host in
+              *cygwin* | *mingw* )
+	        $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
+		$run eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
+                ;;
+              esac
+	    else
+	      $run eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
+	      $run eval 'grep -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
+	      $run eval 'mv "$nlist"T "$nlist"'
+              case $host in
+              *cygwin* | *mingw* )
+	        $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
+		$run eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
+                ;;
+              esac
+	    fi
+	  fi
+
+	  for arg in $dlprefiles; do
+	    $show "extracting global C symbols from \`$arg'"
+	    name=`$echo "$arg" | ${SED} -e 's%^.*/%%'`
+	    $run eval '$echo ": $name " >> "$nlist"'
+	    $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
+	  done
+
+	  if test -z "$run"; then
+	    # Make sure we have at least an empty file.
+	    test -f "$nlist" || : > "$nlist"
+
+	    if test -n "$exclude_expsyms"; then
+	      $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
+	      $mv "$nlist"T "$nlist"
+	    fi
+
+	    # Try sorting and uniquifying the output.
+	    if grep -v "^: " < "$nlist" |
+		if sort -k 3 </dev/null >/dev/null 2>&1; then
+		  sort -k 3
+		else
+		  sort +2
+		fi |
+		uniq > "$nlist"S; then
+	      :
+	    else
+	      grep -v "^: " < "$nlist" > "$nlist"S
+	    fi
+
+	    if test -f "$nlist"S; then
+	      eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$dlsyms"'
+	    else
+	      $echo '/* NONE */' >> "$output_objdir/$dlsyms"
+	    fi
+
+	    $echo >> "$output_objdir/$dlsyms" "\
+
+#undef lt_preloaded_symbols
+
+#if defined (__STDC__) && __STDC__
+# define lt_ptr void *
+#else
+# define lt_ptr char *
+# define const
+#endif
+
+/* The mapping between symbol names and symbols. */
+"
+
+	    case $host in
+	    *cygwin* | *mingw* )
+	  $echo >> "$output_objdir/$dlsyms" "\
+/* DATA imports from DLLs on WIN32 can't be const, because
+   runtime relocations are performed -- see ld's documentation
+   on pseudo-relocs */
+struct {
+"
+	      ;;
+	    * )
+	  $echo >> "$output_objdir/$dlsyms" "\
+const struct {
+"
+	      ;;
+	    esac
+
+
+	  $echo >> "$output_objdir/$dlsyms" "\
+  const char *name;
+  lt_ptr address;
+}
+lt_preloaded_symbols[] =
+{\
+"
+
+	    eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$dlsyms"
+
+	    $echo >> "$output_objdir/$dlsyms" "\
+  {0, (lt_ptr) 0}
+};
+
+/* This works around a problem in FreeBSD linker */
+#ifdef FREEBSD_WORKAROUND
+static const void *lt_preloaded_setup() {
+  return lt_preloaded_symbols;
+}
+#endif
+
+#ifdef __cplusplus
+}
+#endif\
+"
+	  fi
+
+	  pic_flag_for_symtable=
+	  case $host in
+	  # compiling the symbol table file with pic_flag works around
+	  # a FreeBSD bug that causes programs to crash when -lm is
+	  # linked before any other PIC object.  But we must not use
+	  # pic_flag when linking with -static.  The problem exists in
+	  # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
+	  *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
+	    case "$compile_command " in
+	    *" -static "*) ;;
+	    *) pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND";;
+	    esac;;
+	  *-*-hpux*)
+	    case "$compile_command " in
+	    *" -static "*) ;;
+	    *) pic_flag_for_symtable=" $pic_flag";;
+	    esac
+	  esac
+
+	  # Now compile the dynamic symbol file.
+	  $show "(cd $output_objdir && $LTCC  $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")"
+	  $run eval '(cd $output_objdir && $LTCC  $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $?
+
+	  # Clean up the generated files.
+	  $show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T"
+	  $run $rm "$output_objdir/$dlsyms" "$nlist" "${nlist}S" "${nlist}T"
+
+	  # Transform the symbol file into the correct name.
+          case $host in
+          *cygwin* | *mingw* )
+            if test -f "$output_objdir/${outputname}.def" ; then
+              compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
+              finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
+            else
+              compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+              finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+             fi
+            ;;
+          * )
+            compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+            finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+            ;;
+          esac
+	  ;;
+	*)
+	  $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2
+	  exit $EXIT_FAILURE
+	  ;;
+	esac
+      else
+	# We keep going just in case the user didn't refer to
+	# lt_preloaded_symbols.  The linker will fail if global_symbol_pipe
+	# really was required.
+
+	# Nullify the symbol file.
+	compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
+	finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
+      fi
+
+      if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
+	# Replace the output file specification.
+	compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
+	link_command="$compile_command$compile_rpath"
+
+	# We have no uninstalled library dependencies, so finalize right now.
+	$show "$link_command"
+	$run eval "$link_command"
+	exit_status=$?
+
+	# Delete the generated files.
+	if test -n "$dlsyms"; then
+	  $show "$rm $output_objdir/${outputname}S.${objext}"
+	  $run $rm "$output_objdir/${outputname}S.${objext}"
+	fi
+
+	exit $exit_status
+      fi
+
+      if test -n "$shlibpath_var"; then
+	# We should set the shlibpath_var
+	rpath=
+	for dir in $temp_rpath; do
+	  case $dir in
+	  [\\/]* | [A-Za-z]:[\\/]*)
+	    # Absolute path.
+	    rpath="$rpath$dir:"
+	    ;;
+	  *)
+	    # Relative path: add a thisdir entry.
+	    rpath="$rpath\$thisdir/$dir:"
+	    ;;
+	  esac
+	done
+	temp_rpath="$rpath"
+      fi
+
+      if test -n "$compile_shlibpath$finalize_shlibpath"; then
+	compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command"
+      fi
+      if test -n "$finalize_shlibpath"; then
+	finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command"
+      fi
+
+      compile_var=
+      finalize_var=
+      if test -n "$runpath_var"; then
+	if test -n "$perm_rpath"; then
+	  # We should set the runpath_var.
+	  rpath=
+	  for dir in $perm_rpath; do
+	    rpath="$rpath$dir:"
+	  done
+	  compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
+	fi
+	if test -n "$finalize_perm_rpath"; then
+	  # We should set the runpath_var.
+	  rpath=
+	  for dir in $finalize_perm_rpath; do
+	    rpath="$rpath$dir:"
+	  done
+	  finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
+	fi
+      fi
+
+      if test "$no_install" = yes; then
+	# We don't need to create a wrapper script.
+	link_command="$compile_var$compile_command$compile_rpath"
+	# Replace the output file specification.
+	link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
+	# Delete the old output file.
+	$run $rm $output
+	# Link the executable and exit
+	$show "$link_command"
+	$run eval "$link_command" || exit $?
+	exit $EXIT_SUCCESS
+      fi
+
+      if test "$hardcode_action" = relink; then
+	# Fast installation is not supported
+	link_command="$compile_var$compile_command$compile_rpath"
+	relink_command="$finalize_var$finalize_command$finalize_rpath"
+
+	$echo "$modename: warning: this platform does not like uninstalled shared libraries" 1>&2
+	$echo "$modename: \`$output' will be relinked during installation" 1>&2
+      else
+	if test "$fast_install" != no; then
+	  link_command="$finalize_var$compile_command$finalize_rpath"
+	  if test "$fast_install" = yes; then
+	    relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
+	  else
+	    # fast_install is set to needless
+	    relink_command=
+	  fi
+	else
+	  link_command="$compile_var$compile_command$compile_rpath"
+	  relink_command="$finalize_var$finalize_command$finalize_rpath"
+	fi
+      fi
+
+      # Replace the output file specification.
+      link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
+
+      # Delete the old output files.
+      $run $rm $output $output_objdir/$outputname $output_objdir/lt-$outputname
+
+      $show "$link_command"
+      $run eval "$link_command" || exit $?
+
+      # Now create the wrapper script.
+      $show "creating $output"
+
+      # Quote the relink command for shipping.
+      if test -n "$relink_command"; then
+	# Preserve any variables that may affect compiler behavior
+	for var in $variables_saved_for_relink; do
+	  if eval test -z \"\${$var+set}\"; then
+	    relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command"
+	  elif eval var_value=\$$var; test -z "$var_value"; then
+	    relink_command="$var=; export $var; $relink_command"
+	  else
+	    var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"`
+	    relink_command="$var=\"$var_value\"; export $var; $relink_command"
+	  fi
+	done
+	relink_command="(cd `pwd`; $relink_command)"
+	relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+      fi
+
+      # Quote $echo for shipping.
+      if test "X$echo" = "X$SHELL $progpath --fallback-echo"; then
+	case $progpath in
+	[\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";;
+	*) qecho="$SHELL `pwd`/$progpath --fallback-echo";;
+	esac
+	qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"`
+      else
+	qecho=`$echo "X$echo" | $Xsed -e "$sed_quote_subst"`
+      fi
+
+      # Only actually do things if our run command is non-null.
+      if test -z "$run"; then
+	# win32 will think the script is a binary if it has
+	# a .exe suffix, so we strip it off here.
+	case $output in
+	  *.exe) output=`$echo $output|${SED} 's,.exe$,,'` ;;
+	esac
+	# test for cygwin because mv fails w/o .exe extensions
+	case $host in
+	  *cygwin*)
+	    exeext=.exe
+	    outputname=`$echo $outputname|${SED} 's,.exe$,,'` ;;
+	  *) exeext= ;;
+	esac
+	case $host in
+	  *cygwin* | *mingw* )
+            output_name=`basename $output`
+            output_path=`dirname $output`
+            cwrappersource="$output_path/$objdir/lt-$output_name.c"
+            cwrapper="$output_path/$output_name.exe"
+            $rm $cwrappersource $cwrapper
+            trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
+
+	    cat > $cwrappersource <<EOF
+
+/* $cwrappersource - temporary wrapper executable for $objdir/$outputname
+   Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
+
+   The $output program cannot be directly executed until all the libtool
+   libraries that it depends on are installed.
+
+   This wrapper executable should never be moved out of the build directory.
+   If it is, it will not operate correctly.
+
+   Currently, it simply execs the wrapper *script* "/bin/sh $output",
+   but could eventually absorb all of the scripts functionality and
+   exec $objdir/$outputname directly.
+*/
+EOF
+	    cat >> $cwrappersource<<"EOF"
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <malloc.h>
+#include <stdarg.h>
+#include <assert.h>
+#include <string.h>
+#include <ctype.h>
+#include <sys/stat.h>
+
+#if defined(PATH_MAX)
+# define LT_PATHMAX PATH_MAX
+#elif defined(MAXPATHLEN)
+# define LT_PATHMAX MAXPATHLEN
+#else
+# define LT_PATHMAX 1024
+#endif
+
+#ifndef DIR_SEPARATOR
+# define DIR_SEPARATOR '/'
+# define PATH_SEPARATOR ':'
+#endif
+
+#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
+  defined (__OS2__)
+# define HAVE_DOS_BASED_FILE_SYSTEM
+# ifndef DIR_SEPARATOR_2
+#  define DIR_SEPARATOR_2 '\\'
+# endif
+# ifndef PATH_SEPARATOR_2
+#  define PATH_SEPARATOR_2 ';'
+# endif
+#endif
+
+#ifndef DIR_SEPARATOR_2
+# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR)
+#else /* DIR_SEPARATOR_2 */
+# define IS_DIR_SEPARATOR(ch) \
+        (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
+#endif /* DIR_SEPARATOR_2 */
+
+#ifndef PATH_SEPARATOR_2
+# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR)
+#else /* PATH_SEPARATOR_2 */
+# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2)
+#endif /* PATH_SEPARATOR_2 */
+
+#define XMALLOC(type, num)      ((type *) xmalloc ((num) * sizeof(type)))
+#define XFREE(stale) do { \
+  if (stale) { free ((void *) stale); stale = 0; } \
+} while (0)
+
+/* -DDEBUG is fairly common in CFLAGS.  */
+#undef DEBUG
+#if defined DEBUGWRAPPER
+# define DEBUG(format, ...) fprintf(stderr, format, __VA_ARGS__)
+#else
+# define DEBUG(format, ...)
+#endif
+
+const char *program_name = NULL;
+
+void * xmalloc (size_t num);
+char * xstrdup (const char *string);
+const char * base_name (const char *name);
+char * find_executable(const char *wrapper);
+int    check_executable(const char *path);
+char * strendzap(char *str, const char *pat);
+void lt_fatal (const char *message, ...);
+
+int
+main (int argc, char *argv[])
+{
+  char **newargz;
+  int i;
+
+  program_name = (char *) xstrdup (base_name (argv[0]));
+  DEBUG("(main) argv[0]      : %s\n",argv[0]);
+  DEBUG("(main) program_name : %s\n",program_name);
+  newargz = XMALLOC(char *, argc+2);
+EOF
+
+            cat >> $cwrappersource <<EOF
+  newargz[0] = (char *) xstrdup("$SHELL");
+EOF
+
+            cat >> $cwrappersource <<"EOF"
+  newargz[1] = find_executable(argv[0]);
+  if (newargz[1] == NULL)
+    lt_fatal("Couldn't find %s", argv[0]);
+  DEBUG("(main) found exe at : %s\n",newargz[1]);
+  /* we know the script has the same name, without the .exe */
+  /* so make sure newargz[1] doesn't end in .exe */
+  strendzap(newargz[1],".exe");
+  for (i = 1; i < argc; i++)
+    newargz[i+1] = xstrdup(argv[i]);
+  newargz[argc+1] = NULL;
+
+  for (i=0; i<argc+1; i++)
+  {
+    DEBUG("(main) newargz[%d]   : %s\n",i,newargz[i]);
+    ;
+  }
+
+EOF
+
+            case $host_os in
+              mingw*)
+                cat >> $cwrappersource <<EOF
+  execv("$SHELL",(char const **)newargz);
+EOF
+              ;;
+              *)
+                cat >> $cwrappersource <<EOF
+  execv("$SHELL",newargz);
+EOF
+              ;;
+            esac
+
+            cat >> $cwrappersource <<"EOF"
+  return 127;
+}
+
+void *
+xmalloc (size_t num)
+{
+  void * p = (void *) malloc (num);
+  if (!p)
+    lt_fatal ("Memory exhausted");
+
+  return p;
+}
+
+char *
+xstrdup (const char *string)
+{
+  return string ? strcpy ((char *) xmalloc (strlen (string) + 1), string) : NULL
+;
+}
+
+const char *
+base_name (const char *name)
+{
+  const char *base;
+
+#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+  /* Skip over the disk name in MSDOS pathnames. */
+  if (isalpha ((unsigned char)name[0]) && name[1] == ':')
+    name += 2;
+#endif
+
+  for (base = name; *name; name++)
+    if (IS_DIR_SEPARATOR (*name))
+      base = name + 1;
+  return base;
+}
+
+int
+check_executable(const char * path)
+{
+  struct stat st;
+
+  DEBUG("(check_executable)  : %s\n", path ? (*path ? path : "EMPTY!") : "NULL!");
+  if ((!path) || (!*path))
+    return 0;
+
+  if ((stat (path, &st) >= 0) &&
+      (
+        /* MinGW & native WIN32 do not support S_IXOTH or S_IXGRP */
+#if defined (S_IXOTH)
+       ((st.st_mode & S_IXOTH) == S_IXOTH) ||
+#endif
+#if defined (S_IXGRP)
+       ((st.st_mode & S_IXGRP) == S_IXGRP) ||
+#endif
+       ((st.st_mode & S_IXUSR) == S_IXUSR))
+      )
+    return 1;
+  else
+    return 0;
+}
+
+/* Searches for the full path of the wrapper.  Returns
+   newly allocated full path name if found, NULL otherwise */
+char *
+find_executable (const char* wrapper)
+{
+  int has_slash = 0;
+  const char* p;
+  const char* p_next;
+  /* static buffer for getcwd */
+  char tmp[LT_PATHMAX + 1];
+  int tmp_len;
+  char* concat_name;
+
+  DEBUG("(find_executable)  : %s\n", wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!");
+
+  if ((wrapper == NULL) || (*wrapper == '\0'))
+    return NULL;
+
+  /* Absolute path? */
+#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+  if (isalpha ((unsigned char)wrapper[0]) && wrapper[1] == ':')
+  {
+    concat_name = xstrdup (wrapper);
+    if (check_executable(concat_name))
+      return concat_name;
+    XFREE(concat_name);
+  }
+  else
+  {
+#endif
+    if (IS_DIR_SEPARATOR (wrapper[0]))
+    {
+      concat_name = xstrdup (wrapper);
+      if (check_executable(concat_name))
+        return concat_name;
+      XFREE(concat_name);
+    }
+#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+  }
+#endif
+
+  for (p = wrapper; *p; p++)
+    if (*p == '/')
+    {
+      has_slash = 1;
+      break;
+    }
+  if (!has_slash)
+  {
+    /* no slashes; search PATH */
+    const char* path = getenv ("PATH");
+    if (path != NULL)
+    {
+      for (p = path; *p; p = p_next)
+      {
+        const char* q;
+        size_t p_len;
+        for (q = p; *q; q++)
+          if (IS_PATH_SEPARATOR(*q))
+            break;
+        p_len = q - p;
+        p_next = (*q == '\0' ? q : q + 1);
+        if (p_len == 0)
+        {
+          /* empty path: current directory */
+          if (getcwd (tmp, LT_PATHMAX) == NULL)
+            lt_fatal ("getcwd failed");
+          tmp_len = strlen(tmp);
+          concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1);
+          memcpy (concat_name, tmp, tmp_len);
+          concat_name[tmp_len] = '/';
+          strcpy (concat_name + tmp_len + 1, wrapper);
+        }
+        else
+        {
+          concat_name = XMALLOC(char, p_len + 1 + strlen(wrapper) + 1);
+          memcpy (concat_name, p, p_len);
+          concat_name[p_len] = '/';
+          strcpy (concat_name + p_len + 1, wrapper);
+        }
+        if (check_executable(concat_name))
+          return concat_name;
+        XFREE(concat_name);
+      }
+    }
+    /* not found in PATH; assume curdir */
+  }
+  /* Relative path | not found in path: prepend cwd */
+  if (getcwd (tmp, LT_PATHMAX) == NULL)
+    lt_fatal ("getcwd failed");
+  tmp_len = strlen(tmp);
+  concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1);
+  memcpy (concat_name, tmp, tmp_len);
+  concat_name[tmp_len] = '/';
+  strcpy (concat_name + tmp_len + 1, wrapper);
+
+  if (check_executable(concat_name))
+    return concat_name;
+  XFREE(concat_name);
+  return NULL;
+}
+
+char *
+strendzap(char *str, const char *pat)
+{
+  size_t len, patlen;
+
+  assert(str != NULL);
+  assert(pat != NULL);
+
+  len = strlen(str);
+  patlen = strlen(pat);
+
+  if (patlen <= len)
+  {
+    str += len - patlen;
+    if (strcmp(str, pat) == 0)
+      *str = '\0';
+  }
+  return str;
+}
+
+static void
+lt_error_core (int exit_status, const char * mode,
+          const char * message, va_list ap)
+{
+  fprintf (stderr, "%s: %s: ", program_name, mode);
+  vfprintf (stderr, message, ap);
+  fprintf (stderr, ".\n");
+
+  if (exit_status >= 0)
+    exit (exit_status);
+}
+
+void
+lt_fatal (const char *message, ...)
+{
+  va_list ap;
+  va_start (ap, message);
+  lt_error_core (EXIT_FAILURE, "FATAL", message, ap);
+  va_end (ap);
+}
+EOF
+          # we should really use a build-platform specific compiler
+          # here, but OTOH, the wrappers (shell script and this C one)
+          # are only useful if you want to execute the "real" binary.
+          # Since the "real" binary is built for $host, then this
+          # wrapper might as well be built for $host, too.
+          $run $LTCC $LTCFLAGS -s -o $cwrapper $cwrappersource
+          ;;
+        esac
+        $rm $output
+        trap "$rm $output; exit $EXIT_FAILURE" 1 2 15
+
+	$echo > $output "\
+#! $SHELL
+
+# $output - temporary wrapper script for $objdir/$outputname
+# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
+#
+# The $output program cannot be directly executed until all the libtool
+# libraries that it depends on are installed.
+#
+# This wrapper script should never be moved out of the build directory.
+# If it is, it will not operate correctly.
+
+# Sed substitution that helps us do robust quoting.  It backslashifies
+# metacharacters that are still active within double-quoted strings.
+Xsed='${SED} -e 1s/^X//'
+sed_quote_subst='$sed_quote_subst'
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+relink_command=\"$relink_command\"
+
+# This environment variable determines our operation mode.
+if test \"\$libtool_install_magic\" = \"$magic\"; then
+  # install mode needs the following variable:
+  notinst_deplibs='$notinst_deplibs'
+else
+  # When we are sourced in execute mode, \$file and \$echo are already set.
+  if test \"\$libtool_execute_magic\" != \"$magic\"; then
+    echo=\"$qecho\"
+    file=\"\$0\"
+    # Make sure echo works.
+    if test \"X\$1\" = X--no-reexec; then
+      # Discard the --no-reexec flag, and continue.
+      shift
+    elif test \"X\`(\$echo '\t') 2>/dev/null\`\" = 'X\t'; then
+      # Yippee, \$echo works!
+      :
+    else
+      # Restart under the correct shell, and then maybe \$echo will work.
+      exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"}
+    fi
+  fi\
+"
+	$echo >> $output "\
+
+  # Find the directory that this script lives in.
+  thisdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\`
+  test \"x\$thisdir\" = \"x\$file\" && thisdir=.
+
+  # Follow symbolic links until we get to the real thisdir.
+  file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\`
+  while test -n \"\$file\"; do
+    destdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\`
+
+    # If there was a directory component, then change thisdir.
+    if test \"x\$destdir\" != \"x\$file\"; then
+      case \"\$destdir\" in
+      [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;;
+      *) thisdir=\"\$thisdir/\$destdir\" ;;
+      esac
+    fi
+
+    file=\`\$echo \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
+    file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\`
+  done
+
+  # Try to get the absolute directory name.
+  absdir=\`cd \"\$thisdir\" && pwd\`
+  test -n \"\$absdir\" && thisdir=\"\$absdir\"
+"
+
+	if test "$fast_install" = yes; then
+	  $echo >> $output "\
+  program=lt-'$outputname'$exeext
+  progdir=\"\$thisdir/$objdir\"
+
+  if test ! -f \"\$progdir/\$program\" || \\
+     { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\
+       test \"X\$file\" != \"X\$progdir/\$program\"; }; then
+
+    file=\"\$\$-\$program\"
+
+    if test ! -d \"\$progdir\"; then
+      $mkdir \"\$progdir\"
+    else
+      $rm \"\$progdir/\$file\"
+    fi"
+
+	  $echo >> $output "\
+
+    # relink executable if necessary
+    if test -n \"\$relink_command\"; then
+      if relink_command_output=\`eval \$relink_command 2>&1\`; then :
+      else
+	$echo \"\$relink_command_output\" >&2
+	$rm \"\$progdir/\$file\"
+	exit $EXIT_FAILURE
+      fi
+    fi
+
+    $mv \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null ||
+    { $rm \"\$progdir/\$program\";
+      $mv \"\$progdir/\$file\" \"\$progdir/\$program\"; }
+    $rm \"\$progdir/\$file\"
+  fi"
+	else
+	  $echo >> $output "\
+  program='$outputname'
+  progdir=\"\$thisdir/$objdir\"
+"
+	fi
+
+	$echo >> $output "\
+
+  if test -f \"\$progdir/\$program\"; then"
+
+	# Export our shlibpath_var if we have one.
+	if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
+	  $echo >> $output "\
+    # Add our own library path to $shlibpath_var
+    $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
+
+    # Some systems cannot cope with colon-terminated $shlibpath_var
+    # The second colon is a workaround for a bug in BeOS R4 sed
+    $shlibpath_var=\`\$echo \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\`
+
+    export $shlibpath_var
+"
+	fi
+
+	# fixup the dll searchpath if we need to.
+	if test -n "$dllsearchpath"; then
+	  $echo >> $output "\
+    # Add the dll search path components to the executable PATH
+    PATH=$dllsearchpath:\$PATH
+"
+	fi
+
+	$echo >> $output "\
+    if test \"\$libtool_execute_magic\" != \"$magic\"; then
+      # Run the actual program with our arguments.
+"
+	case $host in
+	# Backslashes separate directories on plain windows
+	*-*-mingw | *-*-os2*)
+	  $echo >> $output "\
+      exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
+"
+	  ;;
+
+	*)
+	  $echo >> $output "\
+      exec \"\$progdir/\$program\" \${1+\"\$@\"}
+"
+	  ;;
+	esac
+	$echo >> $output "\
+      \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
+      exit $EXIT_FAILURE
+    fi
+  else
+    # The program doesn't exist.
+    \$echo \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2
+    \$echo \"This script is just a wrapper for \$program.\" 1>&2
+    $echo \"See the $PACKAGE documentation for more information.\" 1>&2
+    exit $EXIT_FAILURE
+  fi
+fi\
+"
+	chmod +x $output
+      fi
+      exit $EXIT_SUCCESS
+      ;;
+    esac
+
+    # See if we need to build an old-fashioned archive.
+    for oldlib in $oldlibs; do
+
+      if test "$build_libtool_libs" = convenience; then
+	oldobjs="$libobjs_save"
+	addlibs="$convenience"
+	build_libtool_libs=no
+      else
+	if test "$build_libtool_libs" = module; then
+	  oldobjs="$libobjs_save"
+	  build_libtool_libs=no
+	else
+	  oldobjs="$old_deplibs $non_pic_objects"
+	fi
+	addlibs="$old_convenience"
+      fi
+
+      if test -n "$addlibs"; then
+	gentop="$output_objdir/${outputname}x"
+	generated="$generated $gentop"
+
+	func_extract_archives $gentop $addlibs
+	oldobjs="$oldobjs $func_extract_archives_result"
+      fi
+
+      # Do each command in the archive commands.
+      if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
+       cmds=$old_archive_from_new_cmds
+      else
+	# POSIX demands no paths to be encoded in archives.  We have
+	# to avoid creating archives with duplicate basenames if we
+	# might have to extract them afterwards, e.g., when creating a
+	# static archive out of a convenience library, or when linking
+	# the entirety of a libtool archive into another (currently
+	# not supported by libtool).
+	if (for obj in $oldobjs
+	    do
+	      $echo "X$obj" | $Xsed -e 's%^.*/%%'
+	    done | sort | sort -uc >/dev/null 2>&1); then
+	  :
+	else
+	  $echo "copying selected object files to avoid basename conflicts..."
+
+	  if test -z "$gentop"; then
+	    gentop="$output_objdir/${outputname}x"
+	    generated="$generated $gentop"
+
+	    $show "${rm}r $gentop"
+	    $run ${rm}r "$gentop"
+	    $show "$mkdir $gentop"
+	    $run $mkdir "$gentop"
+	    exit_status=$?
+	    if test "$exit_status" -ne 0 && test ! -d "$gentop"; then
+	      exit $exit_status
+	    fi
+	  fi
+
+	  save_oldobjs=$oldobjs
+	  oldobjs=
+	  counter=1
+	  for obj in $save_oldobjs
+	  do
+	    objbase=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
+	    case " $oldobjs " in
+	    " ") oldobjs=$obj ;;
+	    *[\ /]"$objbase "*)
+	      while :; do
+		# Make sure we don't pick an alternate name that also
+		# overlaps.
+		newobj=lt$counter-$objbase
+		counter=`expr $counter + 1`
+		case " $oldobjs " in
+		*[\ /]"$newobj "*) ;;
+		*) if test ! -f "$gentop/$newobj"; then break; fi ;;
+		esac
+	      done
+	      $show "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
+	      $run ln "$obj" "$gentop/$newobj" ||
+	      $run cp "$obj" "$gentop/$newobj"
+	      oldobjs="$oldobjs $gentop/$newobj"
+	      ;;
+	    *) oldobjs="$oldobjs $obj" ;;
+	    esac
+	  done
+	fi
+
+	eval cmds=\"$old_archive_cmds\"
+
+	if len=`expr "X$cmds" : ".*"` &&
+	     test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+	  cmds=$old_archive_cmds
+	else
+	  # the command line is too long to link in one step, link in parts
+	  $echo "using piecewise archive linking..."
+	  save_RANLIB=$RANLIB
+	  RANLIB=:
+	  objlist=
+	  concat_cmds=
+	  save_oldobjs=$oldobjs
+
+	  # Is there a better way of finding the last object in the list?
+	  for obj in $save_oldobjs
+	  do
+	    last_oldobj=$obj
+	  done
+	  for obj in $save_oldobjs
+	  do
+	    oldobjs="$objlist $obj"
+	    objlist="$objlist $obj"
+	    eval test_cmds=\"$old_archive_cmds\"
+	    if len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
+	       test "$len" -le "$max_cmd_len"; then
+	      :
+	    else
+	      # the above command should be used before it gets too long
+	      oldobjs=$objlist
+	      if test "$obj" = "$last_oldobj" ; then
+	        RANLIB=$save_RANLIB
+	      fi
+	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
+	      eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
+	      objlist=
+	    fi
+	  done
+	  RANLIB=$save_RANLIB
+	  oldobjs=$objlist
+	  if test "X$oldobjs" = "X" ; then
+	    eval cmds=\"\$concat_cmds\"
+	  else
+	    eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
+	  fi
+	fi
+      fi
+      save_ifs="$IFS"; IFS='~'
+      for cmd in $cmds; do
+        eval cmd=\"$cmd\"
+	IFS="$save_ifs"
+	$show "$cmd"
+	$run eval "$cmd" || exit $?
+      done
+      IFS="$save_ifs"
+    done
+
+    if test -n "$generated"; then
+      $show "${rm}r$generated"
+      $run ${rm}r$generated
+    fi
+
+    # Now create the libtool archive.
+    case $output in
+    *.la)
+      old_library=
+      test "$build_old_libs" = yes && old_library="$libname.$libext"
+      $show "creating $output"
+
+      # Preserve any variables that may affect compiler behavior
+      for var in $variables_saved_for_relink; do
+	if eval test -z \"\${$var+set}\"; then
+	  relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command"
+	elif eval var_value=\$$var; test -z "$var_value"; then
+	  relink_command="$var=; export $var; $relink_command"
+	else
+	  var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"`
+	  relink_command="$var=\"$var_value\"; export $var; $relink_command"
+	fi
+      done
+      # Quote the link command for shipping.
+      relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
+      relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+      if test "$hardcode_automatic" = yes ; then
+	relink_command=
+      fi
+
+
+      # Only create the output if not a dry run.
+      if test -z "$run"; then
+	for installed in no yes; do
+	  if test "$installed" = yes; then
+	    if test -z "$install_libdir"; then
+	      break
+	    fi
+	    output="$output_objdir/$outputname"i
+	    # Replace all uninstalled libtool libraries with the installed ones
+	    newdependency_libs=
+	    for deplib in $dependency_libs; do
+	      case $deplib in
+	      *.la)
+		name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'`
+		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+		if test -z "$libdir"; then
+		  $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
+		  exit $EXIT_FAILURE
+		fi
+		newdependency_libs="$newdependency_libs $libdir/$name"
+		;;
+	      *) newdependency_libs="$newdependency_libs $deplib" ;;
+	      esac
+	    done
+	    dependency_libs="$newdependency_libs"
+	    newdlfiles=
+	    for lib in $dlfiles; do
+	      name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
+	      eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+	      if test -z "$libdir"; then
+		$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
+		exit $EXIT_FAILURE
+	      fi
+	      newdlfiles="$newdlfiles $libdir/$name"
+	    done
+	    dlfiles="$newdlfiles"
+	    newdlprefiles=
+	    for lib in $dlprefiles; do
+	      name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
+	      eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+	      if test -z "$libdir"; then
+		$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
+		exit $EXIT_FAILURE
+	      fi
+	      newdlprefiles="$newdlprefiles $libdir/$name"
+	    done
+	    dlprefiles="$newdlprefiles"
+	  else
+	    newdlfiles=
+	    for lib in $dlfiles; do
+	      case $lib in
+		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
+		*) abs=`pwd`"/$lib" ;;
+	      esac
+	      newdlfiles="$newdlfiles $abs"
+	    done
+	    dlfiles="$newdlfiles"
+	    newdlprefiles=
+	    for lib in $dlprefiles; do
+	      case $lib in
+		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
+		*) abs=`pwd`"/$lib" ;;
+	      esac
+	      newdlprefiles="$newdlprefiles $abs"
+	    done
+	    dlprefiles="$newdlprefiles"
+	  fi
+	  $rm $output
+	  # place dlname in correct position for cygwin
+	  tdlname=$dlname
+	  case $host,$output,$installed,$module,$dlname in
+	    *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
+	  esac
+	  $echo > $output "\
+# $outputname - a libtool library file
+# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
+#
+# Please DO NOT delete this file!
+# It is necessary for linking the library.
+
+# The name that we can dlopen(3).
+dlname='$tdlname'
+
+# Names of this library.
+library_names='$library_names'
+
+# The name of the static archive.
+old_library='$old_library'
+
+# Libraries that this one depends upon.
+dependency_libs='$dependency_libs'
+
+# Version information for $libname.
+current=$current
+age=$age
+revision=$revision
+
+# Is this an already installed library?
+installed=$installed
+
+# Should we warn about portability when linking against -modules?
+shouldnotlink=$module
+
+# Files to dlopen/dlpreopen
+dlopen='$dlfiles'
+dlpreopen='$dlprefiles'
+
+# Directory that this library needs to be installed in:
+libdir='$install_libdir'"
+	  if test "$installed" = no && test "$need_relink" = yes; then
+	    $echo >> $output "\
+relink_command=\"$relink_command\""
+	  fi
+	done
+      fi
+
+      # Do a symbolic link so that the libtool archive can be found in
+      # LD_LIBRARY_PATH before the program is installed.
+      $show "(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)"
+      $run eval '(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)' || exit $?
+      ;;
+    esac
+    exit $EXIT_SUCCESS
+    ;;
+
+  # libtool install mode
+  install)
+    modename="$modename: install"
+
+    # There may be an optional sh(1) argument at the beginning of
+    # install_prog (especially on Windows NT).
+    if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
+       # Allow the use of GNU shtool's install command.
+       $echo "X$nonopt" | grep shtool > /dev/null; then
+      # Aesthetically quote it.
+      arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"`
+      case $arg in
+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+	arg="\"$arg\""
+	;;
+      esac
+      install_prog="$arg "
+      arg="$1"
+      shift
+    else
+      install_prog=
+      arg=$nonopt
+    fi
+
+    # The real first argument should be the name of the installation program.
+    # Aesthetically quote it.
+    arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
+    case $arg in
+    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+      arg="\"$arg\""
+      ;;
+    esac
+    install_prog="$install_prog$arg"
+
+    # We need to accept at least all the BSD install flags.
+    dest=
+    files=
+    opts=
+    prev=
+    install_type=
+    isdir=no
+    stripme=
+    for arg
+    do
+      if test -n "$dest"; then
+	files="$files $dest"
+	dest=$arg
+	continue
+      fi
+
+      case $arg in
+      -d) isdir=yes ;;
+      -f) 
+      	case " $install_prog " in
+	*[\\\ /]cp\ *) ;;
+	*) prev=$arg ;;
+	esac
+	;;
+      -g | -m | -o) prev=$arg ;;
+      -s)
+	stripme=" -s"
+	continue
+	;;
+      -*)
+	;;
+      *)
+	# If the previous option needed an argument, then skip it.
+	if test -n "$prev"; then
+	  prev=
+	else
+	  dest=$arg
+	  continue
+	fi
+	;;
+      esac
+
+      # Aesthetically quote the argument.
+      arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
+      case $arg in
+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+	arg="\"$arg\""
+	;;
+      esac
+      install_prog="$install_prog $arg"
+    done
+
+    if test -z "$install_prog"; then
+      $echo "$modename: you must specify an install program" 1>&2
+      $echo "$help" 1>&2
+      exit $EXIT_FAILURE
+    fi
+
+    if test -n "$prev"; then
+      $echo "$modename: the \`$prev' option requires an argument" 1>&2
+      $echo "$help" 1>&2
+      exit $EXIT_FAILURE
+    fi
+
+    if test -z "$files"; then
+      if test -z "$dest"; then
+	$echo "$modename: no file or destination specified" 1>&2
+      else
+	$echo "$modename: you must specify a destination" 1>&2
+      fi
+      $echo "$help" 1>&2
+      exit $EXIT_FAILURE
+    fi
+
+    # Strip any trailing slash from the destination.
+    dest=`$echo "X$dest" | $Xsed -e 's%/$%%'`
+
+    # Check to see that the destination is a directory.
+    test -d "$dest" && isdir=yes
+    if test "$isdir" = yes; then
+      destdir="$dest"
+      destname=
+    else
+      destdir=`$echo "X$dest" | $Xsed -e 's%/[^/]*$%%'`
+      test "X$destdir" = "X$dest" && destdir=.
+      destname=`$echo "X$dest" | $Xsed -e 's%^.*/%%'`
+
+      # Not a directory, so check to see that there is only one file specified.
+      set dummy $files
+      if test "$#" -gt 2; then
+	$echo "$modename: \`$dest' is not a directory" 1>&2
+	$echo "$help" 1>&2
+	exit $EXIT_FAILURE
+      fi
+    fi
+    case $destdir in
+    [\\/]* | [A-Za-z]:[\\/]*) ;;
+    *)
+      for file in $files; do
+	case $file in
+	*.lo) ;;
+	*)
+	  $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2
+	  $echo "$help" 1>&2
+	  exit $EXIT_FAILURE
+	  ;;
+	esac
+      done
+      ;;
+    esac
+
+    # This variable tells wrapper scripts just to set variables rather
+    # than running their programs.
+    libtool_install_magic="$magic"
+
+    staticlibs=
+    future_libdirs=
+    current_libdirs=
+    for file in $files; do
+
+      # Do each installation.
+      case $file in
+      *.$libext)
+	# Do the static libraries later.
+	staticlibs="$staticlibs $file"
+	;;
+
+      *.la)
+	# Check to see that this really is a libtool archive.
+	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
+	else
+	  $echo "$modename: \`$file' is not a valid libtool archive" 1>&2
+	  $echo "$help" 1>&2
+	  exit $EXIT_FAILURE
+	fi
+
+	library_names=
+	old_library=
+	relink_command=
+	# If there is no directory component, then add one.
+	case $file in
+	*/* | *\\*) . $file ;;
+	*) . ./$file ;;
+	esac
+
+	# Add the libdir to current_libdirs if it is the destination.
+	if test "X$destdir" = "X$libdir"; then
+	  case "$current_libdirs " in
+	  *" $libdir "*) ;;
+	  *) current_libdirs="$current_libdirs $libdir" ;;
+	  esac
+	else
+	  # Note the libdir as a future libdir.
+	  case "$future_libdirs " in
+	  *" $libdir "*) ;;
+	  *) future_libdirs="$future_libdirs $libdir" ;;
+	  esac
+	fi
+
+	dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`/
+	test "X$dir" = "X$file/" && dir=
+	dir="$dir$objdir"
+
+	if test -n "$relink_command"; then
+	  # Determine the prefix the user has applied to our future dir.
+	  inst_prefix_dir=`$echo "$destdir" | $SED "s%$libdir\$%%"`
+
+	  # Don't allow the user to place us outside of our expected
+	  # location b/c this prevents finding dependent libraries that
+	  # are installed to the same prefix.
+	  # At present, this check doesn't affect windows .dll's that
+	  # are installed into $libdir/../bin (currently, that works fine)
+	  # but it's something to keep an eye on.
+	  if test "$inst_prefix_dir" = "$destdir"; then
+	    $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
+	    exit $EXIT_FAILURE
+	  fi
+
+	  if test -n "$inst_prefix_dir"; then
+	    # Stick the inst_prefix_dir data into the link command.
+	    relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
+	  else
+	    relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
+	  fi
+
+	  $echo "$modename: warning: relinking \`$file'" 1>&2
+	  $show "$relink_command"
+	  if $run eval "$relink_command"; then :
+	  else
+	    $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
+	    exit $EXIT_FAILURE
+	  fi
+	fi
+
+	# See the names of the shared library.
+	set dummy $library_names
+	if test -n "$2"; then
+	  realname="$2"
+	  shift
+	  shift
+
+	  srcname="$realname"
+	  test -n "$relink_command" && srcname="$realname"T
+
+	  # Install the shared library and build the symlinks.
+	  $show "$install_prog $dir/$srcname $destdir/$realname"
+	  $run eval "$install_prog $dir/$srcname $destdir/$realname" || exit $?
+	  if test -n "$stripme" && test -n "$striplib"; then
+	    $show "$striplib $destdir/$realname"
+	    $run eval "$striplib $destdir/$realname" || exit $?
+	  fi
+
+	  if test "$#" -gt 0; then
+	    # Delete the old symlinks, and create new ones.
+	    # Try `ln -sf' first, because the `ln' binary might depend on
+	    # the symlink we replace!  Solaris /bin/ln does not understand -f,
+	    # so we also need to try rm && ln -s.
+	    for linkname
+	    do
+	      if test "$linkname" != "$realname"; then
+                $show "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })"
+                $run eval "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })"
+	      fi
+	    done
+	  fi
+
+	  # Do each command in the postinstall commands.
+	  lib="$destdir/$realname"
+	  cmds=$postinstall_cmds
+	  save_ifs="$IFS"; IFS='~'
+	  for cmd in $cmds; do
+	    IFS="$save_ifs"
+	    eval cmd=\"$cmd\"
+	    $show "$cmd"
+	    $run eval "$cmd" || {
+	      lt_exit=$?
+
+	      # Restore the uninstalled library and exit
+	      if test "$mode" = relink; then
+		$run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)'
+	      fi
+
+	      exit $lt_exit
+	    }
+	  done
+	  IFS="$save_ifs"
+	fi
+
+	# Install the pseudo-library for information purposes.
+	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+	instname="$dir/$name"i
+	$show "$install_prog $instname $destdir/$name"
+	$run eval "$install_prog $instname $destdir/$name" || exit $?
+
+	# Maybe install the static library, too.
+	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
+	;;
+
+      *.lo)
+	# Install (i.e. copy) a libtool object.
+
+	# Figure out destination file name, if it wasn't already specified.
+	if test -n "$destname"; then
+	  destfile="$destdir/$destname"
+	else
+	  destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+	  destfile="$destdir/$destfile"
+	fi
+
+	# Deduce the name of the destination old-style object file.
+	case $destfile in
+	*.lo)
+	  staticdest=`$echo "X$destfile" | $Xsed -e "$lo2o"`
+	  ;;
+	*.$objext)
+	  staticdest="$destfile"
+	  destfile=
+	  ;;
+	*)
+	  $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2
+	  $echo "$help" 1>&2
+	  exit $EXIT_FAILURE
+	  ;;
+	esac
+
+	# Install the libtool object if requested.
+	if test -n "$destfile"; then
+	  $show "$install_prog $file $destfile"
+	  $run eval "$install_prog $file $destfile" || exit $?
+	fi
+
+	# Install the old object if enabled.
+	if test "$build_old_libs" = yes; then
+	  # Deduce the name of the old-style object file.
+	  staticobj=`$echo "X$file" | $Xsed -e "$lo2o"`
+
+	  $show "$install_prog $staticobj $staticdest"
+	  $run eval "$install_prog \$staticobj \$staticdest" || exit $?
+	fi
+	exit $EXIT_SUCCESS
+	;;
+
+      *)
+	# Figure out destination file name, if it wasn't already specified.
+	if test -n "$destname"; then
+	  destfile="$destdir/$destname"
+	else
+	  destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+	  destfile="$destdir/$destfile"
+	fi
+
+	# If the file is missing, and there is a .exe on the end, strip it
+	# because it is most likely a libtool script we actually want to
+	# install
+	stripped_ext=""
+	case $file in
+	  *.exe)
+	    if test ! -f "$file"; then
+	      file=`$echo $file|${SED} 's,.exe$,,'`
+	      stripped_ext=".exe"
+	    fi
+	    ;;
+	esac
+
+	# Do a test to see if this is really a libtool program.
+	case $host in
+	*cygwin*|*mingw*)
+	    wrapper=`$echo $file | ${SED} -e 's,.exe$,,'`
+	    ;;
+	*)
+	    wrapper=$file
+	    ;;
+	esac
+	if (${SED} -e '4q' $wrapper | grep "^# Generated by .*$PACKAGE")>/dev/null 2>&1; then
+	  notinst_deplibs=
+	  relink_command=
+
+	  # Note that it is not necessary on cygwin/mingw to append a dot to
+	  # foo even if both foo and FILE.exe exist: automatic-append-.exe
+	  # behavior happens only for exec(3), not for open(2)!  Also, sourcing
+	  # `FILE.' does not work on cygwin managed mounts.
+	  #
+	  # If there is no directory component, then add one.
+	  case $wrapper in
+	  */* | *\\*) . ${wrapper} ;;
+	  *) . ./${wrapper} ;;
+	  esac
+
+	  # Check the variables that should have been set.
+	  if test -z "$notinst_deplibs"; then
+	    $echo "$modename: invalid libtool wrapper script \`$wrapper'" 1>&2
+	    exit $EXIT_FAILURE
+	  fi
+
+	  finalize=yes
+	  for lib in $notinst_deplibs; do
+	    # Check to see that each library is installed.
+	    libdir=
+	    if test -f "$lib"; then
+	      # If there is no directory component, then add one.
+	      case $lib in
+	      */* | *\\*) . $lib ;;
+	      *) . ./$lib ;;
+	      esac
+	    fi
+	    libfile="$libdir/"`$echo "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test
+	    if test -n "$libdir" && test ! -f "$libfile"; then
+	      $echo "$modename: warning: \`$lib' has not been installed in \`$libdir'" 1>&2
+	      finalize=no
+	    fi
+	  done
+
+	  relink_command=
+	  # Note that it is not necessary on cygwin/mingw to append a dot to
+	  # foo even if both foo and FILE.exe exist: automatic-append-.exe
+	  # behavior happens only for exec(3), not for open(2)!  Also, sourcing
+	  # `FILE.' does not work on cygwin managed mounts.
+	  #
+	  # If there is no directory component, then add one.
+	  case $wrapper in
+	  */* | *\\*) . ${wrapper} ;;
+	  *) . ./${wrapper} ;;
+	  esac
+
+	  outputname=
+	  if test "$fast_install" = no && test -n "$relink_command"; then
+	    if test "$finalize" = yes && test -z "$run"; then
+	      tmpdir=`func_mktempdir`
+	      file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
+	      outputname="$tmpdir/$file"
+	      # Replace the output file specification.
+	      relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
+
+	      $show "$relink_command"
+	      if $run eval "$relink_command"; then :
+	      else
+		$echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
+		${rm}r "$tmpdir"
+		continue
+	      fi
+	      file="$outputname"
+	    else
+	      $echo "$modename: warning: cannot relink \`$file'" 1>&2
+	    fi
+	  else
+	    # Install the binary that we compiled earlier.
+	    file=`$echo "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"`
+	  fi
+	fi
+
+	# remove .exe since cygwin /usr/bin/install will append another
+	# one anyway 
+	case $install_prog,$host in
+	*/usr/bin/install*,*cygwin*)
+	  case $file:$destfile in
+	  *.exe:*.exe)
+	    # this is ok
+	    ;;
+	  *.exe:*)
+	    destfile=$destfile.exe
+	    ;;
+	  *:*.exe)
+	    destfile=`$echo $destfile | ${SED} -e 's,.exe$,,'`
+	    ;;
+	  esac
+	  ;;
+	esac
+	$show "$install_prog$stripme $file $destfile"
+	$run eval "$install_prog\$stripme \$file \$destfile" || exit $?
+	test -n "$outputname" && ${rm}r "$tmpdir"
+	;;
+      esac
+    done
+
+    for file in $staticlibs; do
+      name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+
+      # Set up the ranlib parameters.
+      oldlib="$destdir/$name"
+
+      $show "$install_prog $file $oldlib"
+      $run eval "$install_prog \$file \$oldlib" || exit $?
+
+      if test -n "$stripme" && test -n "$old_striplib"; then
+	$show "$old_striplib $oldlib"
+	$run eval "$old_striplib $oldlib" || exit $?
+      fi
+
+      # Do each command in the postinstall commands.
+      cmds=$old_postinstall_cmds
+      save_ifs="$IFS"; IFS='~'
+      for cmd in $cmds; do
+	IFS="$save_ifs"
+	eval cmd=\"$cmd\"
+	$show "$cmd"
+	$run eval "$cmd" || exit $?
+      done
+      IFS="$save_ifs"
+    done
+
+    if test -n "$future_libdirs"; then
+      $echo "$modename: warning: remember to run \`$progname --finish$future_libdirs'" 1>&2
+    fi
+
+    if test -n "$current_libdirs"; then
+      # Maybe just do a dry run.
+      test -n "$run" && current_libdirs=" -n$current_libdirs"
+      exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
+    else
+      exit $EXIT_SUCCESS
+    fi
+    ;;
+
+  # libtool finish mode
+  finish)
+    modename="$modename: finish"
+    libdirs="$nonopt"
+    admincmds=
+
+    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
+      for dir
+      do
+	libdirs="$libdirs $dir"
+      done
+
+      for libdir in $libdirs; do
+	if test -n "$finish_cmds"; then
+	  # Do each command in the finish commands.
+	  cmds=$finish_cmds
+	  save_ifs="$IFS"; IFS='~'
+	  for cmd in $cmds; do
+	    IFS="$save_ifs"
+	    eval cmd=\"$cmd\"
+	    $show "$cmd"
+	    $run eval "$cmd" || admincmds="$admincmds
+       $cmd"
+	  done
+	  IFS="$save_ifs"
+	fi
+	if test -n "$finish_eval"; then
+	  # Do the single finish_eval.
+	  eval cmds=\"$finish_eval\"
+	  $run eval "$cmds" || admincmds="$admincmds
+       $cmds"
+	fi
+      done
+    fi
+
+    # Exit here if they wanted silent mode.
+    test "$show" = : && exit $EXIT_SUCCESS
+
+    $echo "X----------------------------------------------------------------------" | $Xsed
+    $echo "Libraries have been installed in:"
+    for libdir in $libdirs; do
+      $echo "   $libdir"
+    done
+    $echo
+    $echo "If you ever happen to want to link against installed libraries"
+    $echo "in a given directory, LIBDIR, you must either use libtool, and"
+    $echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
+    $echo "flag during linking and do at least one of the following:"
+    if test -n "$shlibpath_var"; then
+      $echo "   - add LIBDIR to the \`$shlibpath_var' environment variable"
+      $echo "     during execution"
+    fi
+    if test -n "$runpath_var"; then
+      $echo "   - add LIBDIR to the \`$runpath_var' environment variable"
+      $echo "     during linking"
+    fi
+    if test -n "$hardcode_libdir_flag_spec"; then
+      libdir=LIBDIR
+      eval flag=\"$hardcode_libdir_flag_spec\"
+
+      $echo "   - use the \`$flag' linker flag"
+    fi
+    if test -n "$admincmds"; then
+      $echo "   - have your system administrator run these commands:$admincmds"
+    fi
+    if test -f /etc/ld.so.conf; then
+      $echo "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
+    fi
+    $echo
+    $echo "See any operating system documentation about shared libraries for"
+    $echo "more information, such as the ld(1) and ld.so(8) manual pages."
+    $echo "X----------------------------------------------------------------------" | $Xsed
+    exit $EXIT_SUCCESS
+    ;;
+
+  # libtool execute mode
+  execute)
+    modename="$modename: execute"
+
+    # The first argument is the command name.
+    cmd="$nonopt"
+    if test -z "$cmd"; then
+      $echo "$modename: you must specify a COMMAND" 1>&2
+      $echo "$help"
+      exit $EXIT_FAILURE
+    fi
+
+    # Handle -dlopen flags immediately.
+    for file in $execute_dlfiles; do
+      if test ! -f "$file"; then
+	$echo "$modename: \`$file' is not a file" 1>&2
+	$echo "$help" 1>&2
+	exit $EXIT_FAILURE
+      fi
+
+      dir=
+      case $file in
+      *.la)
+	# Check to see that this really is a libtool archive.
+	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
+	else
+	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
+	  $echo "$help" 1>&2
+	  exit $EXIT_FAILURE
+	fi
+
+	# Read the libtool library.
+	dlname=
+	library_names=
+
+	# If there is no directory component, then add one.
+	case $file in
+	*/* | *\\*) . $file ;;
+	*) . ./$file ;;
+	esac
+
+	# Skip this library if it cannot be dlopened.
+	if test -z "$dlname"; then
+	  # Warn if it was a shared library.
+	  test -n "$library_names" && $echo "$modename: warning: \`$file' was not linked with \`-export-dynamic'"
+	  continue
+	fi
+
+	dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
+	test "X$dir" = "X$file" && dir=.
+
+	if test -f "$dir/$objdir/$dlname"; then
+	  dir="$dir/$objdir"
+	else
+	  $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
+	  exit $EXIT_FAILURE
+	fi
+	;;
+
+      *.lo)
+	# Just add the directory containing the .lo file.
+	dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
+	test "X$dir" = "X$file" && dir=.
+	;;
+
+      *)
+	$echo "$modename: warning \`-dlopen' is ignored for non-libtool libraries and objects" 1>&2
+	continue
+	;;
+      esac
+
+      # Get the absolute pathname.
+      absdir=`cd "$dir" && pwd`
+      test -n "$absdir" && dir="$absdir"
+
+      # Now add the directory to shlibpath_var.
+      if eval "test -z \"\$$shlibpath_var\""; then
+	eval "$shlibpath_var=\"\$dir\""
+      else
+	eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\""
+      fi
+    done
+
+    # This variable tells wrapper scripts just to set shlibpath_var
+    # rather than running their programs.
+    libtool_execute_magic="$magic"
+
+    # Check if any of the arguments is a wrapper script.
+    args=
+    for file
+    do
+      case $file in
+      -*) ;;
+      *)
+	# Do a test to see if this is really a libtool program.
+	if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+	  # If there is no directory component, then add one.
+	  case $file in
+	  */* | *\\*) . $file ;;
+	  *) . ./$file ;;
+	  esac
+
+	  # Transform arg to wrapped name.
+	  file="$progdir/$program"
+	fi
+	;;
+      esac
+      # Quote arguments (to preserve shell metacharacters).
+      file=`$echo "X$file" | $Xsed -e "$sed_quote_subst"`
+      args="$args \"$file\""
+    done
+
+    if test -z "$run"; then
+      if test -n "$shlibpath_var"; then
+	# Export the shlibpath_var.
+	eval "export $shlibpath_var"
+      fi
+
+      # Restore saved environment variables
+      if test "${save_LC_ALL+set}" = set; then
+	LC_ALL="$save_LC_ALL"; export LC_ALL
+      fi
+      if test "${save_LANG+set}" = set; then
+	LANG="$save_LANG"; export LANG
+      fi
+
+      # Now prepare to actually exec the command.
+      exec_cmd="\$cmd$args"
+    else
+      # Display what would be done.
+      if test -n "$shlibpath_var"; then
+	eval "\$echo \"\$shlibpath_var=\$$shlibpath_var\""
+	$echo "export $shlibpath_var"
+      fi
+      $echo "$cmd$args"
+      exit $EXIT_SUCCESS
+    fi
+    ;;
+
+  # libtool clean and uninstall mode
+  clean | uninstall)
+    modename="$modename: $mode"
+    rm="$nonopt"
+    files=
+    rmforce=
+    exit_status=0
+
+    # This variable tells wrapper scripts just to set variables rather
+    # than running their programs.
+    libtool_install_magic="$magic"
+
+    for arg
+    do
+      case $arg in
+      -f) rm="$rm $arg"; rmforce=yes ;;
+      -*) rm="$rm $arg" ;;
+      *) files="$files $arg" ;;
+      esac
+    done
+
+    if test -z "$rm"; then
+      $echo "$modename: you must specify an RM program" 1>&2
+      $echo "$help" 1>&2
+      exit $EXIT_FAILURE
+    fi
+
+    rmdirs=
+
+    origobjdir="$objdir"
+    for file in $files; do
+      dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
+      if test "X$dir" = "X$file"; then
+	dir=.
+	objdir="$origobjdir"
+      else
+	objdir="$dir/$origobjdir"
+      fi
+      name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+      test "$mode" = uninstall && objdir="$dir"
+
+      # Remember objdir for removal later, being careful to avoid duplicates
+      if test "$mode" = clean; then
+	case " $rmdirs " in
+	  *" $objdir "*) ;;
+	  *) rmdirs="$rmdirs $objdir" ;;
+	esac
+      fi
+
+      # Don't error if the file doesn't exist and rm -f was used.
+      if (test -L "$file") >/dev/null 2>&1 \
+	|| (test -h "$file") >/dev/null 2>&1 \
+	|| test -f "$file"; then
+	:
+      elif test -d "$file"; then
+	exit_status=1
+	continue
+      elif test "$rmforce" = yes; then
+	continue
+      fi
+
+      rmfiles="$file"
+
+      case $name in
+      *.la)
+	# Possibly a libtool archive, so verify it.
+	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+	  . $dir/$name
+
+	  # Delete the libtool libraries and symlinks.
+	  for n in $library_names; do
+	    rmfiles="$rmfiles $objdir/$n"
+	  done
+	  test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
+
+	  case "$mode" in
+	  clean)
+	    case "  $library_names " in
+	    # "  " in the beginning catches empty $dlname
+	    *" $dlname "*) ;;
+	    *) rmfiles="$rmfiles $objdir/$dlname" ;;
+	    esac
+	     test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
+	    ;;
+	  uninstall)
+	    if test -n "$library_names"; then
+	      # Do each command in the postuninstall commands.
+	      cmds=$postuninstall_cmds
+	      save_ifs="$IFS"; IFS='~'
+	      for cmd in $cmds; do
+		IFS="$save_ifs"
+		eval cmd=\"$cmd\"
+		$show "$cmd"
+		$run eval "$cmd"
+		if test "$?" -ne 0 && test "$rmforce" != yes; then
+		  exit_status=1
+		fi
+	      done
+	      IFS="$save_ifs"
+	    fi
+
+	    if test -n "$old_library"; then
+	      # Do each command in the old_postuninstall commands.
+	      cmds=$old_postuninstall_cmds
+	      save_ifs="$IFS"; IFS='~'
+	      for cmd in $cmds; do
+		IFS="$save_ifs"
+		eval cmd=\"$cmd\"
+		$show "$cmd"
+		$run eval "$cmd"
+		if test "$?" -ne 0 && test "$rmforce" != yes; then
+		  exit_status=1
+		fi
+	      done
+	      IFS="$save_ifs"
+	    fi
+	    # FIXME: should reinstall the best remaining shared library.
+	    ;;
+	  esac
+	fi
+	;;
+
+      *.lo)
+	# Possibly a libtool object, so verify it.
+	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+
+	  # Read the .lo file
+	  . $dir/$name
+
+	  # Add PIC object to the list of files to remove.
+	  if test -n "$pic_object" \
+	     && test "$pic_object" != none; then
+	    rmfiles="$rmfiles $dir/$pic_object"
+	  fi
+
+	  # Add non-PIC object to the list of files to remove.
+	  if test -n "$non_pic_object" \
+	     && test "$non_pic_object" != none; then
+	    rmfiles="$rmfiles $dir/$non_pic_object"
+	  fi
+	fi
+	;;
+
+      *)
+	if test "$mode" = clean ; then
+	  noexename=$name
+	  case $file in
+	  *.exe)
+	    file=`$echo $file|${SED} 's,.exe$,,'`
+	    noexename=`$echo $name|${SED} 's,.exe$,,'`
+	    # $file with .exe has already been added to rmfiles,
+	    # add $file without .exe
+	    rmfiles="$rmfiles $file"
+	    ;;
+	  esac
+	  # Do a test to see if this is a libtool program.
+	  if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+	    relink_command=
+	    . $dir/$noexename
+
+	    # note $name still contains .exe if it was in $file originally
+	    # as does the version of $file that was added into $rmfiles
+	    rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}"
+	    if test "$fast_install" = yes && test -n "$relink_command"; then
+	      rmfiles="$rmfiles $objdir/lt-$name"
+	    fi
+	    if test "X$noexename" != "X$name" ; then
+	      rmfiles="$rmfiles $objdir/lt-${noexename}.c"
+	    fi
+	  fi
+	fi
+	;;
+      esac
+      $show "$rm $rmfiles"
+      $run $rm $rmfiles || exit_status=1
+    done
+    objdir="$origobjdir"
+
+    # Try to remove the ${objdir}s in the directories where we deleted files
+    for dir in $rmdirs; do
+      if test -d "$dir"; then
+	$show "rmdir $dir"
+	$run rmdir $dir >/dev/null 2>&1
+      fi
+    done
+
+    exit $exit_status
+    ;;
+
+  "")
+    $echo "$modename: you must specify a MODE" 1>&2
+    $echo "$generic_help" 1>&2
+    exit $EXIT_FAILURE
+    ;;
+  esac
+
+  if test -z "$exec_cmd"; then
+    $echo "$modename: invalid operation mode \`$mode'" 1>&2
+    $echo "$generic_help" 1>&2
+    exit $EXIT_FAILURE
+  fi
+fi # test -z "$show_help"
+
+if test -n "$exec_cmd"; then
+  eval exec $exec_cmd
+  exit $EXIT_FAILURE
+fi
+
+# We need to display help for each of the modes.
+case $mode in
+"") $echo \
+"Usage: $modename [OPTION]... [MODE-ARG]...
+
+Provide generalized library-building support services.
+
+    --config          show all configuration variables
+    --debug           enable verbose shell tracing
+-n, --dry-run         display commands without modifying any files
+    --features        display basic configuration information and exit
+    --finish          same as \`--mode=finish'
+    --help            display this help message and exit
+    --mode=MODE       use operation mode MODE [default=inferred from MODE-ARGS]
+    --quiet           same as \`--silent'
+    --silent          don't print informational messages
+    --tag=TAG         use configuration variables from tag TAG
+    --version         print version information
+
+MODE must be one of the following:
+
+      clean           remove files from the build directory
+      compile         compile a source file into a libtool object
+      execute         automatically set library path, then run a program
+      finish          complete the installation of libtool libraries
+      install         install libraries or executables
+      link            create a library or an executable
+      uninstall       remove libraries from an installed directory
+
+MODE-ARGS vary depending on the MODE.  Try \`$modename --help --mode=MODE' for
+a more detailed description of MODE.
+
+Report bugs to <bug-libtool@gnu.org>."
+  exit $EXIT_SUCCESS
+  ;;
+
+clean)
+  $echo \
+"Usage: $modename [OPTION]... --mode=clean RM [RM-OPTION]... FILE...
+
+Remove files from the build directory.
+
+RM is the name of the program to use to delete files associated with each FILE
+(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
+to RM.
+
+If FILE is a libtool library, object or program, all the files associated
+with it are deleted. Otherwise, only FILE itself is deleted using RM."
+  ;;
+
+compile)
+  $echo \
+"Usage: $modename [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE
+
+Compile a source file into a libtool library object.
+
+This mode accepts the following additional options:
+
+  -o OUTPUT-FILE    set the output file name to OUTPUT-FILE
+  -prefer-pic       try to building PIC objects only
+  -prefer-non-pic   try to building non-PIC objects only
+  -static           always build a \`.o' file suitable for static linking
+
+COMPILE-COMMAND is a command to be used in creating a \`standard' object file
+from the given SOURCEFILE.
+
+The output file name is determined by removing the directory component from
+SOURCEFILE, then substituting the C source code suffix \`.c' with the
+library object suffix, \`.lo'."
+  ;;
+
+execute)
+  $echo \
+"Usage: $modename [OPTION]... --mode=execute COMMAND [ARGS]...
+
+Automatically set library path, then run a program.
+
+This mode accepts the following additional options:
+
+  -dlopen FILE      add the directory containing FILE to the library path
+
+This mode sets the library path environment variable according to \`-dlopen'
+flags.
+
+If any of the ARGS are libtool executable wrappers, then they are translated
+into their corresponding uninstalled binary, and any of their required library
+directories are added to the library path.
+
+Then, COMMAND is executed, with ARGS as arguments."
+  ;;
+
+finish)
+  $echo \
+"Usage: $modename [OPTION]... --mode=finish [LIBDIR]...
+
+Complete the installation of libtool libraries.
+
+Each LIBDIR is a directory that contains libtool libraries.
+
+The commands that this mode executes may require superuser privileges.  Use
+the \`--dry-run' option if you just want to see what would be executed."
+  ;;
+
+install)
+  $echo \
+"Usage: $modename [OPTION]... --mode=install INSTALL-COMMAND...
+
+Install executables or libraries.
+
+INSTALL-COMMAND is the installation command.  The first component should be
+either the \`install' or \`cp' program.
+
+The rest of the components are interpreted as arguments to that command (only
+BSD-compatible install options are recognized)."
+  ;;
+
+link)
+  $echo \
+"Usage: $modename [OPTION]... --mode=link LINK-COMMAND...
+
+Link object files or libraries together to form another library, or to
+create an executable program.
+
+LINK-COMMAND is a command using the C compiler that you would use to create
+a program from several object files.
+
+The following components of LINK-COMMAND are treated specially:
+
+  -all-static       do not do any dynamic linking at all
+  -avoid-version    do not add a version suffix if possible
+  -dlopen FILE      \`-dlpreopen' FILE if it cannot be dlopened at runtime
+  -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
+  -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
+  -export-symbols SYMFILE
+		    try to export only the symbols listed in SYMFILE
+  -export-symbols-regex REGEX
+		    try to export only the symbols matching REGEX
+  -LLIBDIR          search LIBDIR for required installed libraries
+  -lNAME            OUTPUT-FILE requires the installed library libNAME
+  -module           build a library that can dlopened
+  -no-fast-install  disable the fast-install mode
+  -no-install       link a not-installable executable
+  -no-undefined     declare that a library does not refer to external symbols
+  -o OUTPUT-FILE    create OUTPUT-FILE from the specified objects
+  -objectlist FILE  Use a list of object files found in FILE to specify objects
+  -precious-files-regex REGEX
+                    don't remove output files matching REGEX
+  -release RELEASE  specify package release information
+  -rpath LIBDIR     the created library will eventually be installed in LIBDIR
+  -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
+  -static           do not do any dynamic linking of libtool libraries
+  -version-info CURRENT[:REVISION[:AGE]]
+		    specify library version info [each variable defaults to 0]
+
+All other options (arguments beginning with \`-') are ignored.
+
+Every other argument is treated as a filename.  Files ending in \`.la' are
+treated as uninstalled libtool libraries, other files are standard or library
+object files.
+
+If the OUTPUT-FILE ends in \`.la', then a libtool library is created,
+only library objects (\`.lo' files) may be specified, and \`-rpath' is
+required, except when creating a convenience library.
+
+If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created
+using \`ar' and \`ranlib', or on Windows using \`lib'.
+
+If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file
+is created, otherwise an executable program is created."
+  ;;
+
+uninstall)
+  $echo \
+"Usage: $modename [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE...
+
+Remove libraries from an installation directory.
+
+RM is the name of the program to use to delete files associated with each FILE
+(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
+to RM.
+
+If FILE is a libtool library, all the files associated with it are deleted.
+Otherwise, only FILE itself is deleted using RM."
+  ;;
+
+*)
+  $echo "$modename: invalid operation mode \`$mode'" 1>&2
+  $echo "$help" 1>&2
+  exit $EXIT_FAILURE
+  ;;
+esac
+
+$echo
+$echo "Try \`$modename --help' for more information about other modes."
+
+exit $?
+
+# The TAGs below are defined such that we never get into a situation
+# in which we disable both kinds of libraries.  Given conflicting
+# choices, we go for a static library, that is the most portable,
+# since we can't tell whether shared libraries were disabled because
+# the user asked for that or because the platform doesn't support
+# them.  This is particularly important on AIX, because we don't
+# support having both static and shared libraries enabled at the same
+# time on that platform, so we default to a shared-only configuration.
+# If a disable-shared tag is given, we'll fallback to a static-only
+# configuration.  But we'll never go from static-only to shared-only.
+
+# ### BEGIN LIBTOOL TAG CONFIG: disable-shared
+disable_libs=shared
+# ### END LIBTOOL TAG CONFIG: disable-shared
+
+# ### BEGIN LIBTOOL TAG CONFIG: disable-static
+disable_libs=static
+# ### END LIBTOOL TAG CONFIG: disable-static
+
+# Local Variables:
+# mode:shell-script
+# sh-indentation:2
+# End:
diff --git a/cpp/build-aux/mdate-sh b/cpp/build-aux/mdate-sh
new file mode 100755
index 0000000000..cd916c0a34
--- /dev/null
+++ b/cpp/build-aux/mdate-sh
@@ -0,0 +1,201 @@
+#!/bin/sh
+# Get modification time of a file or directory and pretty-print it.
+
+scriptversion=2005-06-29.22
+
+# Copyright (C) 1995, 1996, 1997, 2003, 2004, 2005 Free Software
+# Foundation, Inc.
+# written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, June 1995
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# This file is maintained in Automake, please report
+# bugs to <bug-automake@gnu.org> or send patches to
+# <automake-patches@gnu.org>.
+
+case $1 in
+  '')
+     echo "$0: No file.  Try \`$0 --help' for more information." 1>&2
+     exit 1;
+     ;;
+  -h | --h*)
+    cat <<\EOF
+Usage: mdate-sh [--help] [--version] FILE
+
+Pretty-print the modification time of FILE.
+
+Report bugs to <bug-automake@gnu.org>.
+EOF
+    exit $?
+    ;;
+  -v | --v*)
+    echo "mdate-sh $scriptversion"
+    exit $?
+    ;;
+esac
+
+# Prevent date giving response in another language.
+LANG=C
+export LANG
+LC_ALL=C
+export LC_ALL
+LC_TIME=C
+export LC_TIME
+
+# GNU ls changes its time format in response to the TIME_STYLE
+# variable.  Since we cannot assume `unset' works, revert this
+# variable to its documented default.
+if test "${TIME_STYLE+set}" = set; then
+  TIME_STYLE=posix-long-iso
+  export TIME_STYLE
+fi
+
+save_arg1=$1
+
+# Find out how to get the extended ls output of a file or directory.
+if ls -L /dev/null 1>/dev/null 2>&1; then
+  ls_command='ls -L -l -d'
+else
+  ls_command='ls -l -d'
+fi
+
+# A `ls -l' line looks as follows on OS/2.
+#  drwxrwx---        0 Aug 11  2001 foo
+# This differs from Unix, which adds ownership information.
+#  drwxrwx---   2 root  root      4096 Aug 11  2001 foo
+#
+# To find the date, we split the line on spaces and iterate on words
+# until we find a month.  This cannot work with files whose owner is a
+# user named `Jan', or `Feb', etc.  However, it's unlikely that `/'
+# will be owned by a user whose name is a month.  So we first look at
+# the extended ls output of the root directory to decide how many
+# words should be skipped to get the date.
+
+# On HPUX /bin/sh, "set" interprets "-rw-r--r--" as options, so the "x" below.
+set x`ls -l -d /`
+
+# Find which argument is the month.
+month=
+command=
+until test $month
+do
+  shift
+  # Add another shift to the command.
+  command="$command shift;"
+  case $1 in
+    Jan) month=January; nummonth=1;;
+    Feb) month=February; nummonth=2;;
+    Mar) month=March; nummonth=3;;
+    Apr) month=April; nummonth=4;;
+    May) month=May; nummonth=5;;
+    Jun) month=June; nummonth=6;;
+    Jul) month=July; nummonth=7;;
+    Aug) month=August; nummonth=8;;
+    Sep) month=September; nummonth=9;;
+    Oct) month=October; nummonth=10;;
+    Nov) month=November; nummonth=11;;
+    Dec) month=December; nummonth=12;;
+  esac
+done
+
+# Get the extended ls output of the file or directory.
+set dummy x`eval "$ls_command \"\$save_arg1\""`
+
+# Remove all preceding arguments
+eval $command
+
+# Because of the dummy argument above, month is in $2.
+#
+# On a POSIX system, we should have
+#
+# $# = 5
+# $1 = file size
+# $2 = month
+# $3 = day
+# $4 = year or time
+# $5 = filename
+#
+# On Darwin 7.7.0 and 7.6.0, we have
+#
+# $# = 4
+# $1 = day
+# $2 = month
+# $3 = year or time
+# $4 = filename
+
+# Get the month.
+case $2 in
+  Jan) month=January; nummonth=1;;
+  Feb) month=February; nummonth=2;;
+  Mar) month=March; nummonth=3;;
+  Apr) month=April; nummonth=4;;
+  May) month=May; nummonth=5;;
+  Jun) month=June; nummonth=6;;
+  Jul) month=July; nummonth=7;;
+  Aug) month=August; nummonth=8;;
+  Sep) month=September; nummonth=9;;
+  Oct) month=October; nummonth=10;;
+  Nov) month=November; nummonth=11;;
+  Dec) month=December; nummonth=12;;
+esac
+
+case $3 in
+  ???*) day=$1;;
+  *) day=$3; shift;;
+esac
+
+# Here we have to deal with the problem that the ls output gives either
+# the time of day or the year.
+case $3 in
+  *:*) set `date`; eval year=\$$#
+       case $2 in
+	 Jan) nummonthtod=1;;
+	 Feb) nummonthtod=2;;
+	 Mar) nummonthtod=3;;
+	 Apr) nummonthtod=4;;
+	 May) nummonthtod=5;;
+	 Jun) nummonthtod=6;;
+	 Jul) nummonthtod=7;;
+	 Aug) nummonthtod=8;;
+	 Sep) nummonthtod=9;;
+	 Oct) nummonthtod=10;;
+	 Nov) nummonthtod=11;;
+	 Dec) nummonthtod=12;;
+       esac
+       # For the first six month of the year the time notation can also
+       # be used for files modified in the last year.
+       if (expr $nummonth \> $nummonthtod) > /dev/null;
+       then
+	 year=`expr $year - 1`
+       fi;;
+  *) year=$3;;
+esac
+
+# The result.
+echo $day $month $year
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
diff --git a/cpp/build-aux/missing b/cpp/build-aux/missing
new file mode 100755
index 0000000000..1c8ff7049d
--- /dev/null
+++ b/cpp/build-aux/missing
@@ -0,0 +1,367 @@
+#! /bin/sh
+# Common stub for a few missing GNU programs while installing.
+
+scriptversion=2006-05-10.23
+
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
+#   Free Software Foundation, Inc.
+# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+if test $# -eq 0; then
+  echo 1>&2 "Try \`$0 --help' for more information"
+  exit 1
+fi
+
+run=:
+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
+
+# In the cases where this matters, `missing' is being run in the
+# srcdir already.
+if test -f configure.ac; then
+  configure_ac=configure.ac
+else
+  configure_ac=configure.in
+fi
+
+msg="missing on your system"
+
+case $1 in
+--run)
+  # Try to run requested program, and just exit if it succeeds.
+  run=
+  shift
+  "$@" && exit 0
+  # Exit code 63 means version mismatch.  This often happens
+  # when the user try to use an ancient version of a tool on
+  # a file that requires a minimum version.  In this case we
+  # we should proceed has if the program had been absent, or
+  # if --run hadn't been passed.
+  if test $? = 63; then
+    run=:
+    msg="probably too old"
+  fi
+  ;;
+
+  -h|--h|--he|--hel|--help)
+    echo "\
+$0 [OPTION]... PROGRAM [ARGUMENT]...
+
+Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
+error status if there is no known handling for PROGRAM.
+
+Options:
+  -h, --help      display this help and exit
+  -v, --version   output version information and exit
+  --run           try to run the given command, and emulate it if it fails
+
+Supported PROGRAM values:
+  aclocal      touch file \`aclocal.m4'
+  autoconf     touch file \`configure'
+  autoheader   touch file \`config.h.in'
+  autom4te     touch the output file, or create a stub one
+  automake     touch all \`Makefile.in' files
+  bison        create \`y.tab.[ch]', if possible, from existing .[ch]
+  flex         create \`lex.yy.c', if possible, from existing .c
+  help2man     touch the output file
+  lex          create \`lex.yy.c', if possible, from existing .c
+  makeinfo     touch the output file
+  tar          try tar, gnutar, gtar, then tar without non-portable flags
+  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
+
+Send bug reports to <bug-automake@gnu.org>."
+    exit $?
+    ;;
+
+  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
+    echo "missing $scriptversion (GNU Automake)"
+    exit $?
+    ;;
+
+  -*)
+    echo 1>&2 "$0: Unknown \`$1' option"
+    echo 1>&2 "Try \`$0 --help' for more information"
+    exit 1
+    ;;
+
+esac
+
+# Now exit if we have it, but it failed.  Also exit now if we
+# don't have it and --version was passed (most likely to detect
+# the program).
+case $1 in
+  lex|yacc)
+    # Not GNU programs, they don't have --version.
+    ;;
+
+  tar)
+    if test -n "$run"; then
+       echo 1>&2 "ERROR: \`tar' requires --run"
+       exit 1
+    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
+       exit 1
+    fi
+    ;;
+
+  *)
+    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+       # We have it, but it failed.
+       exit 1
+    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
+       # Could not run --version or --help.  This is probably someone
+       # running `$TOOL --version' or `$TOOL --help' to check whether
+       # $TOOL exists and not knowing $TOOL uses missing.
+       exit 1
+    fi
+    ;;
+esac
+
+# If it does not exist, or fails to run (possibly an outdated version),
+# try to emulate it.
+case $1 in
+  aclocal*)
+    echo 1>&2 "\
+WARNING: \`$1' is $msg.  You should only need it if
+         you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
+         to install the \`Automake' and \`Perl' packages.  Grab them from
+         any GNU archive site."
+    touch aclocal.m4
+    ;;
+
+  autoconf)
+    echo 1>&2 "\
+WARNING: \`$1' is $msg.  You should only need it if
+         you modified \`${configure_ac}'.  You might want to install the
+         \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
+         archive site."
+    touch configure
+    ;;
+
+  autoheader)
+    echo 1>&2 "\
+WARNING: \`$1' is $msg.  You should only need it if
+         you modified \`acconfig.h' or \`${configure_ac}'.  You might want
+         to install the \`Autoconf' and \`GNU m4' packages.  Grab them
+         from any GNU archive site."
+    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
+    test -z "$files" && files="config.h"
+    touch_files=
+    for f in $files; do
+      case $f in
+      *:*) touch_files="$touch_files "`echo "$f" |
+				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
+      *) touch_files="$touch_files $f.in";;
+      esac
+    done
+    touch $touch_files
+    ;;
+
+  automake*)
+    echo 1>&2 "\
+WARNING: \`$1' is $msg.  You should only need it if
+         you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
+         You might want to install the \`Automake' and \`Perl' packages.
+         Grab them from any GNU archive site."
+    find . -type f -name Makefile.am -print |
+	   sed 's/\.am$/.in/' |
+	   while read f; do touch "$f"; done
+    ;;
+
+  autom4te)
+    echo 1>&2 "\
+WARNING: \`$1' is needed, but is $msg.
+         You might have modified some files without having the
+         proper tools for further handling them.
+         You can get \`$1' as part of \`Autoconf' from any GNU
+         archive site."
+
+    file=`echo "$*" | sed -n "$sed_output"`
+    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+    if test -f "$file"; then
+	touch $file
+    else
+	test -z "$file" || exec >$file
+	echo "#! /bin/sh"
+	echo "# Created by GNU Automake missing as a replacement of"
+	echo "#  $ $@"
+	echo "exit 0"
+	chmod +x $file
+	exit 1
+    fi
+    ;;
+
+  bison|yacc)
+    echo 1>&2 "\
+WARNING: \`$1' $msg.  You should only need it if
+         you modified a \`.y' file.  You may need the \`Bison' package
+         in order for those modifications to take effect.  You can get
+         \`Bison' from any GNU archive site."
+    rm -f y.tab.c y.tab.h
+    if test $# -ne 1; then
+        eval LASTARG="\${$#}"
+	case $LASTARG in
+	*.y)
+	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
+	    if test -f "$SRCFILE"; then
+	         cp "$SRCFILE" y.tab.c
+	    fi
+	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
+	    if test -f "$SRCFILE"; then
+	         cp "$SRCFILE" y.tab.h
+	    fi
+	  ;;
+	esac
+    fi
+    if test ! -f y.tab.h; then
+	echo >y.tab.h
+    fi
+    if test ! -f y.tab.c; then
+	echo 'main() { return 0; }' >y.tab.c
+    fi
+    ;;
+
+  lex|flex)
+    echo 1>&2 "\
+WARNING: \`$1' is $msg.  You should only need it if
+         you modified a \`.l' file.  You may need the \`Flex' package
+         in order for those modifications to take effect.  You can get
+         \`Flex' from any GNU archive site."
+    rm -f lex.yy.c
+    if test $# -ne 1; then
+        eval LASTARG="\${$#}"
+	case $LASTARG in
+	*.l)
+	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
+	    if test -f "$SRCFILE"; then
+	         cp "$SRCFILE" lex.yy.c
+	    fi
+	  ;;
+	esac
+    fi
+    if test ! -f lex.yy.c; then
+	echo 'main() { return 0; }' >lex.yy.c
+    fi
+    ;;
+
+  help2man)
+    echo 1>&2 "\
+WARNING: \`$1' is $msg.  You should only need it if
+	 you modified a dependency of a manual page.  You may need the
+	 \`Help2man' package in order for those modifications to take
+	 effect.  You can get \`Help2man' from any GNU archive site."
+
+    file=`echo "$*" | sed -n "$sed_output"`
+    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+    if test -f "$file"; then
+	touch $file
+    else
+	test -z "$file" || exec >$file
+	echo ".ab help2man is required to generate this page"
+	exit 1
+    fi
+    ;;
+
+  makeinfo)
+    echo 1>&2 "\
+WARNING: \`$1' is $msg.  You should only need it if
+         you modified a \`.texi' or \`.texinfo' file, or any other file
+         indirectly affecting the aspect of the manual.  The spurious
+         call might also be the consequence of using a buggy \`make' (AIX,
+         DU, IRIX).  You might want to install the \`Texinfo' package or
+         the \`GNU make' package.  Grab either from any GNU archive site."
+    # The file to touch is that specified with -o ...
+    file=`echo "$*" | sed -n "$sed_output"`
+    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+    if test -z "$file"; then
+      # ... or it is the one specified with @setfilename ...
+      infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
+      file=`sed -n '
+	/^@setfilename/{
+	  s/.* \([^ ]*\) *$/\1/
+	  p
+	  q
+	}' $infile`
+      # ... or it is derived from the source name (dir/f.texi becomes f.info)
+      test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
+    fi
+    # If the file does not exist, the user really needs makeinfo;
+    # let's fail without touching anything.
+    test -f $file || exit 1
+    touch $file
+    ;;
+
+  tar)
+    shift
+
+    # We have already tried tar in the generic part.
+    # Look for gnutar/gtar before invocation to avoid ugly error
+    # messages.
+    if (gnutar --version > /dev/null 2>&1); then
+       gnutar "$@" && exit 0
+    fi
+    if (gtar --version > /dev/null 2>&1); then
+       gtar "$@" && exit 0
+    fi
+    firstarg="$1"
+    if shift; then
+	case $firstarg in
+	*o*)
+	    firstarg=`echo "$firstarg" | sed s/o//`
+	    tar "$firstarg" "$@" && exit 0
+	    ;;
+	esac
+	case $firstarg in
+	*h*)
+	    firstarg=`echo "$firstarg" | sed s/h//`
+	    tar "$firstarg" "$@" && exit 0
+	    ;;
+	esac
+    fi
+
+    echo 1>&2 "\
+WARNING: I can't seem to be able to run \`tar' with the given arguments.
+         You may want to install GNU tar or Free paxutils, or check the
+         command line arguments."
+    exit 1
+    ;;
+
+  *)
+    echo 1>&2 "\
+WARNING: \`$1' is needed, and is $msg.
+         You might have modified some files without having the
+         proper tools for further handling them.  Check the \`README' file,
+         it often tells you about the needed prerequisites for installing
+         this package.  You may also peek at any GNU archive site, in case
+         some other package would contain this missing \`$1' program."
+    exit 1
+    ;;
+esac
+
+exit 0
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
diff --git a/cpp/build.rhel3 b/cpp/build.rhel3
index 84ce7500a1..bc35b7cfa2 100755
--- a/cpp/build.rhel3
+++ b/cpp/build.rhel3
@@ -5,7 +5,14 @@ ln -fs options-rhel3.mk options-local.mk
 PATH=~/local/make-3.80/bin:$PATH
 PATH=~/local/apr-1.2.7/bin:$PATH
 PATH=~/local/cppunit-1.11.4/bin:$PATH
+PATH=~/local/jdk-1.5/bin:$PATH
 
 LD_LIBRARY_PATH=~/local/apr-1.2.7/lib:$LD_LIBRARY_PATH
 
+export GENTOOLS_DIR=../gentools
+
+echo Building release build
+RELEASE=1 make "$@"
+
+echo Building debug build
 make "$@"
diff --git a/cpp/configure.ac b/cpp/configure.ac
new file mode 100644
index 0000000000..1f841a0a5b
--- /dev/null
+++ b/cpp/configure.ac
@@ -0,0 +1,118 @@
+dnl Process this file with autoconf to produce a configure script.
+dnl
+dnl This file is free software; as a special exception the author gives
+dnl unlimited permission to copy and/or distribute it, with or without
+dnl modifications, as long as this notice is preserved.
+dnl
+dnl This program is distributed in the hope that it will be useful, but
+dnl WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+dnl implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+AC_INIT([qpid], [0.1], [qpid-dev@incubator.apache.org])
+AC_CONFIG_AUX_DIR([build-aux])
+AM_INIT_AUTOMAKE([dist-bzip2])
+
+# Minimum Autoconf version required.
+AC_PREREQ(2.59)
+
+# Where to generate output; srcdir location.
+# FIXME: if no one includes config.h, don't do this
+AC_CONFIG_HEADERS([config.h:config.in])
+AC_CONFIG_SRCDIR([lib/broker/ExchangeBinding.cpp])
+
+AC_PROG_CC_STDC
+AM_PROG_CC_C_O
+AC_PROG_CXX
+AC_USE_SYSTEM_EXTENSIONS
+
+AC_ARG_ENABLE(warnings,
+[  --enable-warnings   turn on lots of compiler warnings (recommended)],
+[case "${enableval}" in
+   yes|no) ;;
+   *)      AC_MSG_ERROR([bad value ${enableval} for warnings option]) ;;
+ esac],
+ [enableval=yes])
+
+# Turn on this automake conditional if we are in a qpid
+# hierarchy (i.e. with gentools/ and specs/ sibling directories),
+# and if we have working java + javac.
+build=yes
+AC_CHECK_PROGS([JAVA],  [java],  [no])
+AC_CHECK_PROGS([JAVAC], [javac], [no])
+build=yes
+test x$JAVA  = xno && build=no
+test x$JAVAC = xno && build=no
+test -d $srcdir/../gentools || build=no
+test -d $srcdir/../specs    || build=no
+AM_CONDITIONAL([BUILD_IN_MESSAGE_TREE], [test x$build = xyes])
+
+# Warnings: Enable as many as possible, keep the code clean. Please
+# do not disable warnings or remove -Werror without discussing on
+# qpid-dev list.
+#
+# The following warnings are deliberately omitted, they warn on valid code.
+# -Wunreachable-code -Wpadded -Winline
+# -Wshadow - warns about boost headers.
+
+if test "${enableval}" = yes; then
+  gl_COMPILER_FLAGS(-Werror)
+  gl_COMPILER_FLAGS(-pedantic)
+  gl_COMPILER_FLAGS(-Wall)
+  gl_COMPILER_FLAGS(-Wextra)
+  gl_COMPILER_FLAGS(-Wno-shadow)
+  gl_COMPILER_FLAGS(-Wpointer-arith)
+  gl_COMPILER_FLAGS(-Wcast-qual)
+  gl_COMPILER_FLAGS(-Wcast-align)
+  gl_COMPILER_FLAGS(-Wno-long-long)
+  gl_COMPILER_FLAGS(-Wvolatile-register-var)
+  gl_COMPILER_FLAGS(-Winvalid-pch)
+  gl_COMPILER_FLAGS(-Wno-system-headers)
+  AC_SUBST([WARNING_CFLAGS], [$COMPILER_FLAGS])
+  AC_DEFINE([lint], 1, [Define to 1 if the compiler is checking for lint.])
+  COMPILER_FLAGS=
+fi
+
+AC_PROG_LIBTOOL
+AC_SUBST([LIBTOOL_DEPS])
+
+# For libraries (libcommon) that use dlopen, dlerror, etc.,
+# test whether we need to link with -ldl.
+gl_saved_libs=$LIBS
+  AC_SEARCH_LIBS(dlopen, [dl],
+		 [test "$ac_cv_search_dlopen" = "none required" ||
+		  LIB_DLOPEN=$ac_cv_search_dlopen])
+  AC_SUBST([LIB_DLOPEN])
+LIBS=$gl_saved_libs
+
+# Set the argument to be used in "libtool -version-info ARG".
+QPID_CURRENT=1
+QPID_REVISION=0
+QPID_AGE=1
+LIBTOOL_VERSION_INFO_ARG=$QPID_CURRENT:$QPID_REVISION:$QPID_AGE
+AC_SUBST(LIBTOOL_VERSION_INFO_ARG)
+
+gl_CLOCK_TIME
+
+APR_MINIMUM_VERSION=1.2.2
+PKG_CHECK_MODULES([APR], [apr-1 >= $APR_MINIMUM_VERSION])
+
+APR_CXXFLAGS="$APR_CFLAGS -DUSE_APR=1"
+AC_SUBST(APR_CXXFLAGS)
+
+CPPUNIT_MINIMUM_VERSION=1.10.2
+PKG_CHECK_MODULES([CPPUNIT], [cppunit >= $CPPUNIT_MINIMUM_VERSION])
+CPPUNIT_CXXFLAGS=$CPPUNIT_CFLAGS
+AC_SUBST(CPPUNIT_CXXFLAGS)
+
+AC_CONFIG_FILES([
+  Makefile
+  gen/Makefile
+  lib/Makefile
+  lib/common/Makefile
+  lib/client/Makefile
+  lib/broker/Makefile
+  src/Makefile
+  tests/Makefile
+  ])
+
+AC_OUTPUT
diff --git a/cpp/etc/stylesheets/amqp_client.xsl b/cpp/etc/stylesheets/amqp_client.xsl
deleted file mode 100644
index 7a669da19a..0000000000
--- a/cpp/etc/stylesheets/amqp_client.xsl
+++ /dev/null
@@ -1,175 +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.
- -
- -->
-<xsl:stylesheet version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:amqp="http://amqp.org"> 
-
-  <xsl:import href="code_utils.xsl"/>
-
-  <!--
-  ==================
-  Template: client_h
-  ==================
-  Client header file.
-  -->
-  <xsl:template match="amqp" mode="client_h">
-    <xsl:param name="domain-cpp-table"/>
-    <xsl:result-document href="AMQP_ServerProxy.h" format="textFormat">
-      <xsl:value-of select="amqp:copyright()"/>
-      <xsl:text>
-#ifndef _AMQP_ServerProxy_
-#define _AMQP_ServerProxy_
-
-#include "AMQP_ServerOperations.h"
-#include "qpid/framing/FieldTable.h"
-#include "qpid/framing/OutputHandler.h"
-
-namespace qpid {
-namespace framing {
-
-class AMQP_ServerProxy : virtual public AMQP_ServerOperations
-{
-        OutputHandler* out;
-
-    public:
-        AMQP_ServerProxy(OutputHandler* _out);
-        virtual ~AMQP_ServerProxy() {}&#xA;&#xA;</xsl:text>
-      <xsl:for-each select="class">
-        <xsl:variable name="class" select="amqp:cpp-class-name(@name)"/>
-        <xsl:if test="doc">
-          <xsl:text>&#xA;/**&#xA;===== Class: </xsl:text><xsl:value-of select="$class"/><xsl:text> =====&#xA;</xsl:text>
-          <xsl:value-of select="amqp:process-docs(doc)"/>
-          <xsl:text>&#xA;*/&#xA;</xsl:text>
-        </xsl:if>
-        <xsl:text>        class </xsl:text><xsl:value-of select="$class"/><xsl:text> :  virtual public AMQP_ServerOperations::</xsl:text><xsl:value-of select="$class"/><xsl:text>Handler
-        {
-                OutputHandler* out;
-
-            public:
-                /* Constructors and destructors */
-                </xsl:text><xsl:value-of select="$class"/><xsl:text>(OutputHandler* _out);
-                virtual ~</xsl:text><xsl:value-of select="$class"/><xsl:text>();
-                
-                /* Protocol methods */&#xA;</xsl:text>
-        <xsl:for-each select="method">
-          <xsl:if test="chassis[@name='server']">
-            <xsl:variable name="method" select="amqp:cpp-name(@name)"/>
-            <xsl:if test="doc">
-              <xsl:text>&#xA;/**&#xA;----- Method: </xsl:text><xsl:value-of select="$class"/><xsl:text>.</xsl:text><xsl:value-of select="$method"/><xsl:text> -----&#xA;</xsl:text>
-              <xsl:value-of select="amqp:process-docs(doc)"/>
-              <xsl:text>&#xA;*/&#xA;</xsl:text>
-            </xsl:if>
-            <xsl:for-each select="rule">
-              <xsl:text>&#xA;/**&#xA;</xsl:text>
-              <xsl:text>Rule "</xsl:text><xsl:value-of select="@name"/><xsl:text>":&#xA;</xsl:text><xsl:value-of select="amqp:process-docs(doc)"/>
-              <xsl:text>&#xA;*/&#xA;</xsl:text>
-            </xsl:for-each>
-            <xsl:text>                virtual void </xsl:text><xsl:value-of select="$method"/>
-            <xsl:text>( u_int16_t channel</xsl:text><xsl:if test="field"><xsl:text>,&#xA;                        </xsl:text>
-            <xsl:for-each select="field">
-              <xsl:variable name="domain-cpp-type" select="amqp:cpp-lookup(@domain, $domain-cpp-table)"/>
-              <xsl:value-of select="concat($domain-cpp-type, amqp:cpp-arg-ref($domain-cpp-type), ' ', amqp:cpp-name(@name))"/>
-              <xsl:if test="position()!=last()">
-                <xsl:text>,&#xA;                        </xsl:text>
-              </xsl:if>
-            </xsl:for-each>
-          </xsl:if>
-            <xsl:text> );&#xA;</xsl:text>
-          </xsl:if>
-        </xsl:for-each>
-        <xsl:text>        }; /* class </xsl:text><xsl:value-of select="$class"/><xsl:text> */&#xA;</xsl:text>
-      </xsl:for-each>
-      <xsl:text>}; /* class AMQP_ServerProxy */
-
-} /* namespace framing */
-} /* namespace qpid */
-
-#endif&#xA;</xsl:text>
-    </xsl:result-document>
-  </xsl:template>
-
-
-  <!--
-  ====================
-  Template: client_cpp
-  ====================
-  Client body.
-  -->
-  <xsl:template match="amqp" mode="client_cpp">
-    <xsl:param name="domain-cpp-table"/>
-    <xsl:result-document href="AMQP_ServerProxy.cpp" format="textFormat">
-      <xsl:value-of select="amqp:copyright()"/>
-      <xsl:text>
-
-#include "AMQP_ServerProxy.h"
-
-namespace qpid {
-namespace framing {
-
-AMQP_ServerProxy::AMQP_ServerProxy(OutputHandler* _out) :
-    out(_out)
-{
-}&#xA;&#xA;</xsl:text>
-      <xsl:for-each select="class">
-        <xsl:variable name="class" select="amqp:cpp-class-name(@name)"/>
-        <xsl:text>&#xA;/* ++++++++++ Class: </xsl:text><xsl:value-of select="$class"/><xsl:text> ++++++++++ */
-
-AMQP_ServerProxy::</xsl:text><xsl:value-of select="$class"/><xsl:text>::</xsl:text><xsl:value-of select="$class"/><xsl:text>(OutputHandler* _out) :
-    out(_out)
-{
-}
-
-AMQP_ServerProxy::</xsl:text><xsl:value-of select="$class"/><xsl:text>::~</xsl:text><xsl:value-of select="$class"/><xsl:text>() {}&#xA;&#xA;</xsl:text>
-        <xsl:for-each select="method">
-          <xsl:if test="chassis[@name='server']">
-            <xsl:text>void AMQP_ServerProxy::</xsl:text><xsl:value-of select="$class"/><xsl:text>::</xsl:text>
-            <xsl:value-of select="amqp:cpp-name(@name)"/><xsl:text>( u_int16_t channel</xsl:text><xsl:if test="field">
-            <xsl:text>,&#xA;                        </xsl:text>
-            <xsl:for-each select="field">
-              <xsl:variable name="domain-cpp-type" select="amqp:cpp-lookup(@domain, $domain-cpp-table)"/>
-              <xsl:value-of select="concat($domain-cpp-type, amqp:cpp-arg-ref($domain-cpp-type), ' ', amqp:cpp-name(@name))"/>
-              <xsl:if test="position()!=last()">
-                <xsl:text>,&#xA;                        </xsl:text>
-              </xsl:if>
-            </xsl:for-each>
-          </xsl:if>
-          <xsl:text> )
-{
-    out->send( new AMQFrame( channel,
-        new </xsl:text><xsl:value-of select="concat($class, amqp:field-name(@name), 'Body')"/><xsl:text>( </xsl:text>
-          <xsl:for-each select="field">
-            <xsl:value-of select="amqp:cpp-name(@name)"/>
-            <xsl:if test="position()!=last()">
-              <xsl:text>,&#xA;            </xsl:text>
-            </xsl:if>
-            </xsl:for-each>
-            <xsl:text> ) ) );
-}&#xA;&#xA;</xsl:text>
-          </xsl:if>
-        </xsl:for-each>
-      </xsl:for-each>
-      <xsl:text>
-
-} /* namespace framing */
-} /* namespace qpid */&#xA;</xsl:text>
-    </xsl:result-document>
-  </xsl:template>
-  
-</xsl:stylesheet> 
diff --git a/cpp/etc/stylesheets/amqp_client_handler_impl.xsl b/cpp/etc/stylesheets/amqp_client_handler_impl.xsl
deleted file mode 100644
index 0472f5d8f8..0000000000
--- a/cpp/etc/stylesheets/amqp_client_handler_impl.xsl
+++ /dev/null
@@ -1,207 +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.
- -
- -->
-<xsl:stylesheet version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:amqp="http://amqp.org"> 
-
-  <xsl:import href="code_utils.xsl"/>
-
-  <!--
-  ===============================
-  Template: client_handler_impl_h
-  ===============================
-  Template to generate the AMQP_ClientHandlerImpl class header file.
-  -->
-  <xsl:template match="amqp" mode="client_handler_impl_h">
-    <xsl:param name="domain-cpp-table"/>
-    <xsl:result-document href="AMQP_ClientHandlerImpl.h" format="textFormat">
-      <xsl:value-of select="amqp:copyright()"/>
-      <xsl:text>
-#ifndef _AMQP_ClientHandlerImpl_
-#define _AMQP_ClientHandlerImpl_
-
-#include "AMQP_ClientOperations.h"
-#include "qpid/framing/FieldTable.h"
-
-namespace qpid {
-namespace framing {
-
-class AMQP_ClientHandlerImpl : virtual public AMQP_ClientOperations
-{&#xA;</xsl:text>
-
-      <!-- List of pointers to each inner class instance -->
-      <xsl:for-each select="class">
-        <xsl:variable name="class" select="concat(amqp:cpp-class-name(@name), 'Handler')"/>
-        <xsl:text>        AMQP_ClientOperations::</xsl:text><xsl:value-of select="$class"/><xsl:text>* </xsl:text>
-        <xsl:value-of select="$class"/><xsl:text>Ptr;&#xA;</xsl:text>
-      </xsl:for-each>
-      <xsl:text>
-    public:
-        AMQP_ClientHandlerImpl();
-        virtual ~AMQP_ClientHandlerImpl();&#xA;&#xA;</xsl:text>        
-
-      <!-- List of functions to return pointer to each inner class instance -->
-      <xsl:for-each select="class">
-        <xsl:variable name="class" select="concat(amqp:cpp-class-name(@name), 'Handler')"/>
-        <xsl:text>        inline AMQP_ClientOperations::</xsl:text>
-        <xsl:value-of select="$class"/><xsl:text>* get</xsl:text><xsl:value-of select="$class"/>
-        <xsl:text>() { return </xsl:text><xsl:value-of select="$class"/><xsl:text>Ptr; }&#xA;</xsl:text>
-      </xsl:for-each>
-      <xsl:text>&#xA;</xsl:text>
-
-      <!-- Inner classes -->
-      <xsl:for-each select="class">
-        <xsl:variable name="class" select="concat(amqp:cpp-class-name(@name), 'Handler')"/>
-
-        <!-- Inner class documentation & rules -->
-        <xsl:if test="doc">
-          <xsl:text>&#xA;/**&#xA;</xsl:text>
-          <xsl:text>===== Class: </xsl:text><xsl:value-of select="$class"/><xsl:text>Impl =====&#xA;</xsl:text>
-          <xsl:value-of select="amqp:process-docs(doc)"/>
-          <xsl:text>*/&#xA;</xsl:text>
-        </xsl:if>
-
-        <!-- Inner class definition -->
-        <xsl:text>        class </xsl:text><xsl:value-of select="$class"/>
-        <xsl:text>Impl : virtual public AMQP_ClientOperations::</xsl:text><xsl:value-of select="$class"/>
-        <xsl:text>&#xA;        {
-            public:
-                /* Constructors and destructors */
-                </xsl:text><xsl:value-of select="$class"/><xsl:text>Impl();
-                virtual ~</xsl:text><xsl:value-of select="$class"/><xsl:text>Impl();
-                
-                /* Protocol methods */&#xA;</xsl:text>
-
-        <!-- Inner class methods (only if the chassis is set to "client") -->
-        <xsl:for-each select="method">
-          <xsl:if test="chassis[@name='client']">
-            <xsl:variable name="method" select="amqp:cpp-name(@name)"/>
-
-            <!-- Inner class method documentation & rules -->
-            <xsl:if test="doc">
-              <xsl:text>&#xA;/**&#xA;</xsl:text>
-              <xsl:text>----- Method: </xsl:text><xsl:value-of select="$class"/>
-              <xsl:text>Impl.</xsl:text><xsl:value-of select="@name"/><xsl:text> -----&#xA;</xsl:text>
-              <xsl:value-of select="amqp:process-docs(doc)"/>
-              <xsl:text>*/&#xA;</xsl:text>
-            </xsl:if>
-            <xsl:for-each select="rule">
-              <xsl:text>&#xA;/**&#xA;</xsl:text>
-              <xsl:text>Rule "</xsl:text><xsl:value-of select="@name"/><xsl:text>":&#xA;</xsl:text>
-              <xsl:value-of select="amqp:process-docs(doc)"/>
-              <xsl:text>*/&#xA;</xsl:text>
-            </xsl:for-each>
-
-            <!-- Inner class method definition -->
-            <xsl:text>&#xA;                virtual void </xsl:text><xsl:value-of select="$method"/>
-            <xsl:text>( u_int16_t channel</xsl:text>
-
-            <!-- Inner class method parameter definition -->
-            <xsl:if test="field">
-              <xsl:text>,&#xA;                        </xsl:text>
-              <xsl:for-each select="field">
-                <xsl:variable name="domain-cpp-type" select="amqp:cpp-lookup(@domain, $domain-cpp-table)"/>
-                <xsl:value-of select="concat($domain-cpp-type, amqp:cpp-arg-ref($domain-cpp-type), ' ', amqp:cpp-name(@name))"/>
-                <xsl:if test="position()!=last()">
-                  <xsl:text>,&#xA;                        </xsl:text>
-                </xsl:if>
-              </xsl:for-each>
-            </xsl:if>
-            <xsl:text> );&#xA;</xsl:text>
-          </xsl:if>
-        </xsl:for-each>
-        <xsl:text>&#xA;        }; /* class </xsl:text><xsl:value-of select="$class"/><xsl:text>Impl */&#xA;</xsl:text>
-      </xsl:for-each>
-      <xsl:text>&#xA;}; /* AMQP_ClientHandlerImpl */
-
-} /* namespace framing */
-} /* namespace qpid */
-
-#endif&#xA;</xsl:text>
-    </xsl:result-document>
-  </xsl:template>
-
-  <!--
-  =================================
-  Template: client_handler_impl_cpp
-  =================================
-  Template to generate the AMQP_ClientHandlerImpl class stubs.
-  -->
-  <xsl:template match="amqp" mode="client_handler_impl_cpp">
-    <xsl:param name="domain-cpp-table"/>
-    <xsl:result-document href="AMQP_ClientHandlerImpl.cpp" format="textFormat">
-      <xsl:value-of select="amqp:copyright()"/>
-      <xsl:text>
-#include "AMQP_ClientHandlerImpl.h"
-
-namespace qpid {
-namespace framing {
-
-AMQP_ClientHandlerImpl::AMQP_ClientHandlerImpl() :&#xA;        </xsl:text>
-      <xsl:for-each select="class">
-        <xsl:variable name="class" select="amqp:cpp-class-name(@name)"/>
-        <xsl:value-of select="$class"/>
-        <xsl:text>HandlerPtr( new </xsl:text><xsl:value-of select="$class"/><xsl:text>HandlerImpl() )</xsl:text>
-        <xsl:if test="position()!=last()">
-          <xsl:text>,&#xA;        </xsl:text>
-        </xsl:if>
-      </xsl:for-each>
-      <xsl:text>
-{
-}
-
-AMQP_ClientHandlerImpl::~AMQP_ClientHandlerImpl()
-{&#xA;</xsl:text>
-      <xsl:for-each select="class">
-        <xsl:text>        delete </xsl:text><xsl:value-of select="amqp:cpp-class-name(@name)"/><xsl:text>HandlerPtr;&#xA;</xsl:text>
-      </xsl:for-each>}
-
-      <xsl:for-each select="class">
-        <xsl:variable name="class" select="amqp:cpp-class-name(@name)"/>
-        <xsl:text>&#xA;/* ===== Class: </xsl:text><xsl:value-of select="$class"/><xsl:text>HandlerImpl ===== */&#xA;&#xA;</xsl:text>
-        <xsl:text>AMQP_ClientHandlerImpl::</xsl:text><xsl:value-of select="$class"/><xsl:text>HandlerImpl::</xsl:text>
-        <xsl:value-of select="$class"/><xsl:text>HandlerImpl()&#xA;{&#xA;}&#xA;&#xA;</xsl:text>
-        <xsl:text>AMQP_ClientHandlerImpl::</xsl:text><xsl:value-of select="$class"/><xsl:text>HandlerImpl::~</xsl:text>
-        <xsl:value-of select="$class"/><xsl:text>HandlerImpl()&#xA;{&#xA;}&#xA;&#xA;</xsl:text>
-        <xsl:for-each select="method">
-          <xsl:if test="chassis[@name='client']">
-            <xsl:text>void AMQP_ClientHandlerImpl::</xsl:text><xsl:value-of select="$class"/><xsl:text>HandlerImpl::</xsl:text>
-            <xsl:value-of select="amqp:cpp-name(@name)"/><xsl:text>( u_int16_t /*channel*/</xsl:text>
-            <xsl:if test="field">
-              <xsl:text>,&#xA;                        </xsl:text>
-              <xsl:for-each select="field">
-                <xsl:variable name="domain-cpp-type" select="amqp:cpp-lookup(@domain, $domain-cpp-table)"/>
-                <xsl:value-of select="concat($domain-cpp-type, amqp:cpp-arg-ref($domain-cpp-type), ' /*', amqp:cpp-name(@name), '*/')"/>
-                <xsl:if test="position()!=last()">
-                  <xsl:text>,&#xA;                        </xsl:text>
-                </xsl:if>
-              </xsl:for-each>
-            </xsl:if><xsl:text> )&#xA;{&#xA;}&#xA;&#xA;</xsl:text>
-          </xsl:if>
-        </xsl:for-each>
-      </xsl:for-each>
-      <xsl:text>
-
-} /* namespace framing */
-} /* namespace qpid */&#xA;&#xA;</xsl:text>
-    </xsl:result-document>
-  </xsl:template>
-
-</xsl:stylesheet> 
diff --git a/cpp/etc/stylesheets/amqp_client_operations.xsl b/cpp/etc/stylesheets/amqp_client_operations.xsl
deleted file mode 100644
index 8eb62c4244..0000000000
--- a/cpp/etc/stylesheets/amqp_client_operations.xsl
+++ /dev/null
@@ -1,125 +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.
- -
- -->
-<xsl:stylesheet version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:amqp="http://amqp.org"> 
-
-  <xsl:import href="code_utils.xsl"/>
-
-  <!--
-  =============================
-  Template: client-operations-h
-  =============================
-  Template to generate the AMQP_ClientHandler virtual class. This is the pure
-  virtual class from which the AMQP_Server and AMQP_ClientHandlerImpl classes
-  are derived.
-  -->
-  <xsl:template match="amqp" mode="client-operations-h">
-    <xsl:param name="domain-cpp-table"/>
-    <xsl:result-document href="AMQP_ClientOperations.h" format="textFormat">
-      <xsl:value-of select="amqp:copyright()"/>
-      <xsl:text>
-#ifndef _AMQP_ClientOperations_
-#define _AMQP_ClientOperations_
-
-#include "AMQP_Constants.h"
-#include "qpid/framing/FieldTable.h"
-
-namespace qpid {
-namespace framing {
-
-class AMQP_ClientOperations
-{
-    public:
-        AMQP_ClientOperations() {}
-        virtual ~AMQP_ClientOperations() {}
-        inline u_int16_t getAmqpMajor() { return (u_int16_t)</xsl:text><xsl:value-of select="@major"/><xsl:text>; }
-        inline u_int16_t getAmqpMinor() { return (u_int16_t)</xsl:text><xsl:value-of select="@minor"/><xsl:text>; }&#xA;&#xA;</xsl:text>
-
-      <!-- Inner classes -->
-      <xsl:for-each select="class">
-        <xsl:variable name="class" select="concat(amqp:cpp-class-name(@name), 'Handler')"/>
-
-        <!-- Inner class documentation & rules -->
-        <xsl:if test="doc">
-          <xsl:text>&#xA;/**&#xA;===== Class: </xsl:text><xsl:value-of select="$class"/><xsl:text> =====&#xA;</xsl:text>
-          <xsl:value-of select="amqp:process-docs(doc)"/>
-          <xsl:text>*/&#xA;</xsl:text>
-        </xsl:if>
-
-        <!-- Inner class definition -->
-        <xsl:text>        class </xsl:text><xsl:value-of select="$class"/><xsl:text>
-        {
-            public:
-                /* Constructors and destructors */
-                </xsl:text><xsl:value-of select="$class"/><xsl:text>() {}
-                virtual ~</xsl:text><xsl:value-of select="$class"/><xsl:text>() {}
-                
-                /* Protocol methods */&#xA;</xsl:text>
-
-        <!-- Inner class methods (only if the chassis is set to "client") -->
-        <xsl:for-each select="method">
-          <xsl:if test="chassis[@name='client']">
-            <xsl:variable name="method" select="amqp:cpp-name(@name)"/>
-
-            <!-- Inner class method documentation & rules -->
-            <xsl:if test="doc">
-              <xsl:text>&#xA;/**&#xA;----- Method: </xsl:text><xsl:value-of select="$class"/><xsl:text>.</xsl:text>
-              <xsl:value-of select="@name"/><xsl:text> -----&#xA;</xsl:text>
-              <xsl:value-of select="amqp:process-docs(doc)"/>
-              <xsl:text>*/&#xA;</xsl:text>
-            </xsl:if>
-            <xsl:for-each select="rule">
-              <xsl:text>&#xA;/**&#xA;</xsl:text>
-              <xsl:text>Rule "</xsl:text><xsl:value-of select="@name"/><xsl:text>":&#xA;</xsl:text>
-              <xsl:value-of select="amqp:process-docs(doc)"/>
-              <xsl:text>*/&#xA;</xsl:text>
-            </xsl:for-each>
-
-            <!-- Inner class method definition -->
-            <xsl:text>                virtual void </xsl:text><xsl:value-of select="$method"/>
-            <xsl:text>( u_int16_t channel</xsl:text>
-
-            <!-- Inner class method parameter definition -->
-            <xsl:if test="field">
-              <xsl:text>,&#xA;                        </xsl:text>
-              <xsl:for-each select="field">
-                <xsl:variable name="domain-cpp-type" select="amqp:cpp-lookup(@domain, $domain-cpp-table)"/>
-                <xsl:value-of select="concat($domain-cpp-type, amqp:cpp-arg-ref($domain-cpp-type), ' ', amqp:cpp-name(@name))"/>
-                <xsl:if test="position()!=last()">
-                  <xsl:text>,&#xA;                        </xsl:text>
-                </xsl:if>
-              </xsl:for-each>
-            </xsl:if>
-            <xsl:text> ) = 0;&#xA;</xsl:text>
-          </xsl:if>
-        </xsl:for-each>
-        <xsl:text>&#xA;        }; /* class </xsl:text><xsl:value-of select="$class"/><xsl:text> */&#xA;</xsl:text>
-      </xsl:for-each>
-      <xsl:text>&#xA;}; /* class AMQP_ClientOperations */
-
-} /* namespace framing */
-} /* namespace qpid */
-
-#endif&#xA;</xsl:text>
-    </xsl:result-document>
-  </xsl:template>
-
-</xsl:stylesheet> 
diff --git a/cpp/etc/stylesheets/amqp_consts.xsl b/cpp/etc/stylesheets/amqp_consts.xsl
deleted file mode 100644
index 6d16f5703a..0000000000
--- a/cpp/etc/stylesheets/amqp_consts.xsl
+++ /dev/null
@@ -1,97 +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.
- -
- -->
-<xsl:stylesheet version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:amqp="http://amqp.org"> 
-
-  <xsl:import href="code_utils.xsl"/>
-  <xsl:output method="text" indent="yes" name="textFormat"/> 
-
-  <xsl:template match="/">
-    <xsl:apply-templates select="amqp" mode="domain-table"/> 
-    <xsl:apply-templates select="amqp" mode="domain-consts"/> 
-  </xsl:template> 
-
-  <!--
-  ======================
-  Template: domain-table
-  ======================
-  Generates the domain name to C++ type lookup table
-  which is required for later generation.
-  Format:
-  <domains>
-    <domain doamin-name="dname1" cpp-type="type1"/>
-    <domain doamin-name="dname2" cpp-type="type2"/>
-    ...
-  </domains>
-  -->
-  <xsl:template match="amqp" mode="domain-table">
-    <domains><xsl:text>&#xA;</xsl:text>
-      <xsl:for-each select="domain">
-        <xsl:text>  </xsl:text><domain>
-          <xsl:attribute name="domain-name">
-            <xsl:value-of select="@name"/>
-          </xsl:attribute>
-          <xsl:attribute name="cpp-type">
-            <xsl:value-of select="amqp:cpp-type(@type)"/>
-          </xsl:attribute>
-        </domain><xsl:text>&#xA;</xsl:text>
-      </xsl:for-each>
-    </domains>
-  </xsl:template>
-
-  <!--
-  =======================
-  Template: domain-consts
-  =======================
-  Generates a header file (AMQP_Constants.h) containing definitions of
-  all the <constant> declarations in the AMQP XML specification.
-  -->
-  <xsl:template match="amqp" mode="domain-consts">
-    <xsl:result-document href="AMQP_Constants.h" format="textFormat">
-      <xsl:value-of select="amqp:copyright()"/>
-      <xsl:text>
-#ifndef _AMQP_Constants_
-#define _AMQP_Constants_
-
-#include "qpid/framing/amqp_types.h"
-
-namespace qpid {
-namespace framing {
-
-/**** Constants ****/&#xA;&#xA;</xsl:text>
-      <xsl:for-each select="constant">
-        <xsl:if test="doc">
-          <xsl:text>&#xA;/*&#xA;</xsl:text>
-          <xsl:value-of select="normalize-space(doc)"/>
-          <xsl:text>&#xA;*/&#xA;</xsl:text>
-        </xsl:if>
-        <xsl:text>const u_int16_t </xsl:text><xsl:value-of select="concat('AMQP_', upper-case(amqp:cpp-name(@name)), ' = ', @value)"/><xsl:text>;&#xA;</xsl:text>
-      </xsl:for-each>
-      <xsl:text>
-
-} /* namespace framing */
-} /* namespace qpid */
-
-#endif&#xA;</xsl:text>
-    </xsl:result-document>
-  </xsl:template>
-
-</xsl:stylesheet> 
diff --git a/cpp/etc/stylesheets/amqp_server.xsl b/cpp/etc/stylesheets/amqp_server.xsl
deleted file mode 100644
index ffadb01210..0000000000
--- a/cpp/etc/stylesheets/amqp_server.xsl
+++ /dev/null
@@ -1,207 +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.
- -
- -->
-<xsl:stylesheet version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:amqp="http://amqp.org"> 
-
-  <xsl:import href="code_utils.xsl"/>
-
-  <!--
-  ==================
-  Template: server_h
-  ==================
-  Server header file.
-  -->
-  <xsl:template match="amqp" mode="server_h">
-    <xsl:param name="domain-cpp-table"/>
-    <xsl:result-document href="AMQP_ClientProxy.h" format="textFormat">
-      <xsl:value-of select="amqp:copyright()"/>
-#ifndef _AMQP_ClientProxy_
-#define _AMQP_ClientProxy_
-
-#include "AMQP_ClientOperations.h"
-#include "qpid/framing/FieldTable.h"
-#include "qpid/framing/OutputHandler.h"
-
-namespace qpid {
-namespace framing {
-
-class AMQP_ClientProxy : virtual public AMQP_ClientOperations
-{
-    public:
-
-        AMQP_ClientProxy(OutputHandler* _out);
-        virtual ~AMQP_ClientProxy() {};
-
-    <!-- inner classes -->
-    <xsl:for-each select="class">
-        <xsl:variable name="class" select="amqp:cpp-class-name(@name)"/>
-        <xsl:if test="doc">
-          <xsl:text>&#xA;/**&#xA;===== Class: </xsl:text><xsl:value-of select="$class"/><xsl:text> =====&#xA;</xsl:text>
-          <xsl:value-of select="amqp:process-docs(doc)"/>
-          <xsl:text>&#xA;*/&#xA;</xsl:text>
-        </xsl:if>
-        <xsl:text>        class </xsl:text><xsl:value-of select="$class"/><xsl:text> :  virtual public AMQP_ClientOperations::</xsl:text><xsl:value-of select="$class"/><xsl:text>Handler
-        {
-                OutputHandler* out;
-
-            public:
-                /* Constructors and destructors */
-                </xsl:text><xsl:value-of select="$class"/><xsl:text>(OutputHandler* _out);
-                virtual ~</xsl:text><xsl:value-of select="$class"/><xsl:text>();
-                
-                /* Protocol methods */&#xA;</xsl:text>
-        <xsl:for-each select="method">
-          <xsl:if test="chassis[@name='client']">
-            <xsl:variable name="method" select="amqp:cpp-name(@name)"/>
-            <xsl:if test="doc">
-              <xsl:text>&#xA;/**&#xA;----- Method: </xsl:text><xsl:value-of select="$class"/><xsl:text>.</xsl:text><xsl:value-of select="$method"/><xsl:text> -----&#xA;</xsl:text>
-              <xsl:value-of select="amqp:process-docs(doc)"/>
-              <xsl:text>&#xA;*/&#xA;</xsl:text>
-            </xsl:if>
-            <xsl:for-each select="rule">
-              <xsl:text>&#xA;/**&#xA;</xsl:text>
-              <xsl:text>Rule "</xsl:text><xsl:value-of select="@name"/><xsl:text>":&#xA;</xsl:text><xsl:value-of select="amqp:process-docs(doc)"/>
-              <xsl:text>&#xA;*/&#xA;</xsl:text>
-            </xsl:for-each>
-            <xsl:text>                virtual void </xsl:text><xsl:value-of select="$method"/>
-            <xsl:text>( u_int16_t channel</xsl:text><xsl:if test="field"><xsl:text>,&#xA;                        </xsl:text>
-            <xsl:for-each select="field">
-              <xsl:variable name="domain-cpp-type" select="amqp:cpp-lookup(@domain, $domain-cpp-table)"/>
-              <xsl:value-of select="concat($domain-cpp-type, amqp:cpp-arg-ref($domain-cpp-type), ' ', amqp:cpp-name(@name))"/>
-              <xsl:if test="position()!=last()">
-                <xsl:text>,&#xA;                        </xsl:text>
-              </xsl:if>
-            </xsl:for-each>
-          </xsl:if>
-            <xsl:text> );&#xA;</xsl:text>
-          </xsl:if>
-        </xsl:for-each>
-        <xsl:text>        }; /* class </xsl:text><xsl:value-of select="$class"/> */
-      </xsl:for-each>
-
-    <!-- Accessors for each nested class instance -->
-    <xsl:for-each select="class">
-        <xsl:value-of select="concat(amqp:cpp-class-name(@name), '&amp; get', amqp:cpp-class-name(@name), '()')"/>;
-    </xsl:for-each>
-
-    private:
-
-    OutputHandler* out;
-
-    <!-- An instance of each nested class -->
-    <xsl:for-each select="class">
-        <xsl:value-of select="concat(amqp:cpp-class-name(@name), ' ', amqp:cpp-name(@name))"/>;
-    </xsl:for-each>
-
-
-
-      }; /* class AMQP_ClientProxy */
-
-} /* namespace framing */
-} /* namespace qpid */
-
-#endif
-</xsl:result-document>
-  </xsl:template>
-
-
-  <!--
-  ====================
-  Template: server_cpp
-  ====================
-  Server body.
-  -->
-  <xsl:template match="amqp" mode="server_cpp">
-    <xsl:param name="domain-cpp-table"/>
-    <xsl:result-document href="AMQP_ClientProxy.cpp" format="textFormat">
-      <xsl:value-of select="amqp:copyright()"/>
-
-#include "AMQP_ClientProxy.h"
-
-namespace qpid {
-namespace framing {
-
-AMQP_ClientProxy::AMQP_ClientProxy(OutputHandler* _out) :
-    out(_out),
-    <!-- Initialisation of each nested class instance -->
-    <xsl:for-each select="class">
-        <xsl:value-of select="concat(amqp:cpp-name(@name), '(_out)')"/>
-        <xsl:if test="position()!=last()">,
-        </xsl:if>
-    </xsl:for-each>
-
-{
-}
-
-      <xsl:for-each select="class">
-        <xsl:variable name="class" select="amqp:cpp-class-name(@name)"/>
-        <xsl:text>&#xA;/* ++++++++++ Class: </xsl:text><xsl:value-of select="$class"/><xsl:text> ++++++++++ */
-
-AMQP_ClientProxy::</xsl:text><xsl:value-of select="$class"/><xsl:text>::</xsl:text><xsl:value-of select="$class"/><xsl:text>(OutputHandler* _out) :
-    out(_out)
-{
-}
-
-AMQP_ClientProxy::</xsl:text><xsl:value-of select="$class"/><xsl:text>::~</xsl:text><xsl:value-of select="$class"/><xsl:text>() {}&#xA;&#xA;</xsl:text>
-        <xsl:for-each select="method">
-          <xsl:if test="chassis[@name='client']">
-            <xsl:text>void AMQP_ClientProxy::</xsl:text><xsl:value-of select="$class"/><xsl:text>::</xsl:text>
-            <xsl:value-of select="amqp:cpp-name(@name)"/><xsl:text>( u_int16_t channel</xsl:text><xsl:if test="field">
-            <xsl:text>,&#xA;                        </xsl:text>
-            <xsl:for-each select="field">
-              <xsl:variable name="domain-cpp-type" select="amqp:cpp-lookup(@domain, $domain-cpp-table)"/>
-              <xsl:value-of select="concat($domain-cpp-type, amqp:cpp-arg-ref($domain-cpp-type), ' ', amqp:cpp-name(@name))"/>
-              <xsl:if test="position()!=last()">
-                <xsl:text>,&#xA;                        </xsl:text>
-              </xsl:if>
-            </xsl:for-each>
-          </xsl:if>
-          <xsl:text> )
-{
-    out->send( new AMQFrame( channel,
-        new </xsl:text><xsl:value-of select="concat($class, amqp:field-name(@name), 'Body')"/><xsl:text>( </xsl:text>
-          <xsl:for-each select="field">
-            <xsl:value-of select="amqp:cpp-name(@name)"/>
-            <xsl:if test="position()!=last()">
-              <xsl:text>,&#xA;            </xsl:text>
-            </xsl:if>
-            </xsl:for-each>
-            <xsl:text> ) ) );
-}&#xA;&#xA;</xsl:text>
-          </xsl:if>
-        </xsl:for-each>
-      </xsl:for-each>
-
-    <!-- Accessors for each nested class instance -->
-    <xsl:for-each select="class">
-        <xsl:value-of select="concat('AMQP_ClientProxy::', amqp:cpp-class-name(@name), '&amp; AMQP_ClientProxy::get', amqp:cpp-class-name(@name), '()')"/>{
-        <xsl:value-of select="concat('    return ', amqp:cpp-name(@name))"/>;
-        }
-
-    </xsl:for-each>
-
-      <xsl:text>
-} /* namespace framing */
-} /* namespace qpid */&#xA;</xsl:text>
-    </xsl:result-document>
-  </xsl:template>
-
-</xsl:stylesheet> 
diff --git a/cpp/etc/stylesheets/amqp_server_handler_impl.xsl b/cpp/etc/stylesheets/amqp_server_handler_impl.xsl
deleted file mode 100644
index 2351f634d7..0000000000
--- a/cpp/etc/stylesheets/amqp_server_handler_impl.xsl
+++ /dev/null
@@ -1,207 +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.
- -
- -->
-<xsl:stylesheet version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:amqp="http://amqp.org"> 
-
-  <xsl:import href="code_utils.xsl"/>
-
-  <!--
-  ===============================
-  Template: server_handler_impl_h
-  ===============================
-  Template to generate the AMQP_ServerHandlerImpl class header file.
-  -->
-  <xsl:template match="amqp" mode="server_handler_impl_h">
-    <xsl:param name="domain-cpp-table"/>
-    <xsl:result-document href="AMQP_ServerHandlerImpl.h" format="textFormat">
-      <xsl:value-of select="amqp:copyright()"/>
-      <xsl:text>
-#ifndef _AMQP_ServerHandlerImpl_
-#define _AMQP_ServerHandlerImpl_
-
-#include "AMQP_ServerOperations.h"
-#include "qpid/framing/FieldTable.h"
-
-namespace qpid {
-namespace framing {
-
-class AMQP_ServerHandlerImpl : virtual public AMQP_ServerOperations
-{&#xA;</xsl:text>
-
-      <!-- List of pointers to each inner class instance -->
-      <xsl:for-each select="class">
-        <xsl:variable name="class" select="concat(amqp:cpp-class-name(@name), 'Handler')"/>
-        <xsl:text>        AMQP_ServerOperations::</xsl:text><xsl:value-of select="$class"/><xsl:text>* </xsl:text>
-        <xsl:value-of select="$class"/><xsl:text>Ptr;&#xA;</xsl:text>
-      </xsl:for-each>
-      <xsl:text>
-    public:
-        AMQP_ServerHandlerImpl();
-        virtual ~AMQP_ServerHandlerImpl();&#xA;&#xA;</xsl:text>
-
-      <!-- List of functions to return pointer to each inner class instance -->
-      <xsl:for-each select="class">
-        <xsl:variable name="class" select="concat(amqp:cpp-class-name(@name), 'Handler')"/>
-        <xsl:text>        virtual inline AMQP_ServerOperations::</xsl:text>
-        <xsl:value-of select="$class"/><xsl:text>* get</xsl:text><xsl:value-of select="$class"/>
-        <xsl:text>() { return </xsl:text><xsl:value-of select="$class"/><xsl:text>Ptr; }&#xA;</xsl:text>
-      </xsl:for-each>
-      <xsl:text>&#xA;</xsl:text>
-
-      <!-- Inner classes -->
-      <xsl:for-each select="class">
-        <xsl:variable name="class" select="concat(amqp:cpp-class-name(@name), 'Handler')"/>
-
-        <!-- Inner class documentation & rules -->
-        <xsl:if test="doc">
-          <xsl:text>&#xA;/**&#xA;</xsl:text>
-          <xsl:text>===== Class: </xsl:text><xsl:value-of select="$class"/><xsl:text>Impl =====&#xA;</xsl:text>
-          <xsl:value-of select="amqp:process-docs(doc)"/>
-          <xsl:text>*/&#xA;</xsl:text>
-        </xsl:if>
-
-        <!-- Inner class definition -->
-        <xsl:text>        class </xsl:text><xsl:value-of select="$class"/>
-        <xsl:text>Impl : virtual public AMQP_ServerOperations::</xsl:text><xsl:value-of select="$class"/>
-        <xsl:text>&#xA;        {
-            public:
-                /* Constructors and destructors */
-                </xsl:text><xsl:value-of select="$class"/><xsl:text>Impl();
-                virtual ~</xsl:text><xsl:value-of select="$class"/><xsl:text>Impl();
-                
-                /* Protocol methods */&#xA;</xsl:text>
-
-        <!-- Inner class methods (only if the chassis is set to "server") -->
-        <xsl:for-each select="method">
-          <xsl:if test="chassis[@name='server']">
-            <xsl:variable name="method" select="amqp:cpp-name(@name)"/>
-
-            <!-- Inner class method documentation & rules -->
-            <xsl:if test="doc">
-              <xsl:text>&#xA;/**&#xA;</xsl:text>
-              <xsl:text>----- Method: </xsl:text><xsl:value-of select="$class"/>
-              <xsl:text>Impl.</xsl:text><xsl:value-of select="@name"/><xsl:text> -----&#xA;</xsl:text>
-              <xsl:value-of select="amqp:process-docs(doc)"/>
-              <xsl:text>*/&#xA;</xsl:text>
-            </xsl:if>
-            <xsl:for-each select="rule">
-              <xsl:text>&#xA;/**&#xA;</xsl:text>
-              <xsl:text>Rule "</xsl:text><xsl:value-of select="@name"/><xsl:text>":&#xA;</xsl:text>
-              <xsl:value-of select="amqp:process-docs(doc)"/>
-              <xsl:text>*/&#xA;</xsl:text>
-            </xsl:for-each>
-
-            <!-- Inner class method definition -->
-            <xsl:text>&#xA;                virtual void </xsl:text><xsl:value-of select="$method"/>
-            <xsl:text>( u_int16_t channel</xsl:text>
-
-            <!-- Inner class method parameter definition -->
-            <xsl:if test="field">
-              <xsl:text>,&#xA;                        </xsl:text>
-              <xsl:for-each select="field">
-                <xsl:variable name="domain-cpp-type" select="amqp:cpp-lookup(@domain, $domain-cpp-table)"/>
-                <xsl:value-of select="concat($domain-cpp-type, amqp:cpp-arg-ref($domain-cpp-type), ' ', amqp:cpp-name(@name))"/>
-                <xsl:if test="position()!=last()">
-                  <xsl:text>,&#xA;                        </xsl:text>
-                </xsl:if>
-              </xsl:for-each>
-            </xsl:if>
-            <xsl:text> );&#xA;</xsl:text>
-          </xsl:if>
-        </xsl:for-each>
-        <xsl:text>&#xA;        }; /* class </xsl:text><xsl:value-of select="$class"/><xsl:text>Impl */&#xA;</xsl:text>
-      </xsl:for-each>
-      <xsl:text>&#xA;}; /* AMQP_ServerHandlerImpl */
-
-} /* namespace framing */
-} /* namespace qpid */
-
-#endif&#xA;</xsl:text>
-    </xsl:result-document>
-  </xsl:template>
-
-  <!--
-  =================================
-  Template: server_handler_impl_cpp
-  =================================
-  Template to generate the AMQP_ServerHandlerImpl class stubs.
-  -->
-  <xsl:template match="amqp" mode="server_handler_impl_cpp">
-    <xsl:param name="domain-cpp-table"/>
-    <xsl:result-document href="AMQP_ServerHandlerImpl.cpp" format="textFormat">
-      <xsl:value-of select="amqp:copyright()"/>
-      <xsl:text>
-#include "AMQP_ServerHandlerImpl.h"
-
-namespace qpid {
-namespace framing {
-
-AMQP_ServerHandlerImpl::AMQP_ServerHandlerImpl() :&#xA;        </xsl:text>
-      <xsl:for-each select="class">
-        <xsl:variable name="class" select="amqp:cpp-class-name(@name)"/>
-        <xsl:value-of select="$class"/>
-        <xsl:text>HandlerPtr( new </xsl:text><xsl:value-of select="$class"/><xsl:text>HandlerImpl() )</xsl:text>
-        <xsl:if test="position()!=last()">
-          <xsl:text>,&#xA;        </xsl:text>
-        </xsl:if>
-      </xsl:for-each>
-      <xsl:text>
-{
-}
-
-AMQP_ServerHandlerImpl::~AMQP_ServerHandlerImpl()
-{&#xA;</xsl:text>
-      <xsl:for-each select="class">
-        <xsl:text>        delete </xsl:text><xsl:value-of select="amqp:cpp-class-name(@name)"/><xsl:text>HandlerPtr;&#xA;</xsl:text>
-      </xsl:for-each>}
-
-      <xsl:for-each select="class">
-        <xsl:variable name="class" select="amqp:cpp-class-name(@name)"/>
-        <xsl:text>&#xA;/* ===== Class: </xsl:text><xsl:value-of select="$class"/><xsl:text>HandlerImpl ===== */&#xA;&#xA;</xsl:text>
-        <xsl:text>AMQP_ServerHandlerImpl::</xsl:text><xsl:value-of select="$class"/><xsl:text>HandlerImpl::</xsl:text>
-        <xsl:value-of select="$class"/><xsl:text>HandlerImpl()&#xA;{&#xA;}&#xA;&#xA;</xsl:text>
-        <xsl:text>AMQP_ServerHandlerImpl::</xsl:text><xsl:value-of select="$class"/><xsl:text>HandlerImpl::~</xsl:text>
-        <xsl:value-of select="$class"/><xsl:text>HandlerImpl()&#xA;{&#xA;}&#xA;&#xA;</xsl:text>
-        <xsl:for-each select="method">
-          <xsl:if test="chassis[@name='server']">
-            <xsl:text>void AMQP_ServerHandlerImpl::</xsl:text><xsl:value-of select="$class"/><xsl:text>HandlerImpl::</xsl:text>
-            <xsl:value-of select="amqp:cpp-name(@name)"/><xsl:text>( u_int16_t /*channel*/</xsl:text>
-            <xsl:if test="field">
-              <xsl:text>,&#xA;                        </xsl:text>
-              <xsl:for-each select="field">
-                <xsl:variable name="domain-cpp-type" select="amqp:cpp-lookup(@domain, $domain-cpp-table)"/>
-                <xsl:value-of select="concat($domain-cpp-type, amqp:cpp-arg-ref($domain-cpp-type), ' /*', amqp:cpp-name(@name), '*/')"/>
-                <xsl:if test="position()!=last()">
-                  <xsl:text>,&#xA;                        </xsl:text>
-                </xsl:if>
-              </xsl:for-each>
-            </xsl:if><xsl:text> )&#xA;{&#xA;}&#xA;&#xA;</xsl:text>
-          </xsl:if>
-        </xsl:for-each>
-      </xsl:for-each>
-      <xsl:text>
-
-} /* namespace framing */
-} /* namespace qpid */&#xA;&#xA;</xsl:text>
-    </xsl:result-document>
-  </xsl:template>
-
-</xsl:stylesheet> 
diff --git a/cpp/etc/stylesheets/amqp_server_operations.xsl b/cpp/etc/stylesheets/amqp_server_operations.xsl
deleted file mode 100644
index 884036a2ea..0000000000
--- a/cpp/etc/stylesheets/amqp_server_operations.xsl
+++ /dev/null
@@ -1,134 +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.
- -
- -->
-<xsl:stylesheet version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:amqp="http://amqp.org"> 
-
-  <xsl:import href="code_utils.xsl"/>
-
-  <!--
-  =============================
-  Template: server-operations-h
-  =============================
-  Template to generate the AMQP_ServerHandler virtual class. This is the pure
-  virtual class from which the AMQP_Client and AMQP_ServerHandlerImpl classes
-  are derived.
-  -->
-  <xsl:template match="amqp" mode="server-operations-h">
-    <xsl:param name="domain-cpp-table"/>
-    <xsl:result-document href="AMQP_ServerOperations.h" format="textFormat">
-      <xsl:value-of select="amqp:copyright()"/>
-      <xsl:text>
-#ifndef _AMQP_ServerOperations_
-#define _AMQP_ServerOperations_
-
-#include "AMQP_Constants.h"
-#include "qpid/framing/FieldTable.h"
-
-namespace qpid {
-namespace framing {
-
-class AMQP_ServerOperations
-{
-    public:
-        AMQP_ServerOperations() {}
-        virtual ~AMQP_ServerOperations() {}
-        inline u_int16_t getAmqpMajor() { return (u_int16_t)</xsl:text><xsl:value-of select="@major"/><xsl:text>; }
-        inline u_int16_t getAmqpMinor() { return (u_int16_t)</xsl:text><xsl:value-of select="@minor"/><xsl:text>; }&#xA;&#xA;</xsl:text>
-
-      <!-- Inner classes -->
-      <xsl:for-each select="class">
-        <xsl:variable name="class" select="concat(amqp:cpp-class-name(@name), 'Handler')"/>
-
-        <!-- Inner class documentation & rules -->
-        <xsl:if test="doc">
-          <xsl:text>&#xA;/**&#xA;===== Class: </xsl:text><xsl:value-of select="$class"/><xsl:text> =====&#xA;</xsl:text>
-          <xsl:value-of select="amqp:process-docs(doc)"/>
-          <xsl:text>*/&#xA;</xsl:text>
-        </xsl:if>
-
-        <!-- Inner class definition -->
-        <xsl:text>        class </xsl:text><xsl:value-of select="$class"/><xsl:text>
-        {
-            public:
-                /* Constructors and destructors */
-                </xsl:text><xsl:value-of select="$class"/><xsl:text>() {}
-                virtual ~</xsl:text><xsl:value-of select="$class"/><xsl:text>() {}
-                
-                /* Protocol methods */&#xA;</xsl:text>
-
-        <!-- Inner class methods (only if the chassis is set to "server") -->
-        <xsl:for-each select="method">
-          <xsl:if test="chassis[@name='server']">
-            <xsl:variable name="method" select="amqp:cpp-name(@name)"/>
-
-            <!-- Inner class method documentation & rules -->
-            <xsl:if test="doc">
-              <xsl:text>&#xA;/**&#xA;----- Method: </xsl:text><xsl:value-of select="$class"/><xsl:text>.</xsl:text>
-              <xsl:value-of select="@name"/><xsl:text> -----&#xA;</xsl:text>
-              <xsl:value-of select="amqp:process-docs(doc)"/>
-              <xsl:text>*/&#xA;</xsl:text>
-            </xsl:if>
-            <xsl:for-each select="rule">
-              <xsl:text>&#xA;/**&#xA;</xsl:text>
-              <xsl:text>Rule "</xsl:text><xsl:value-of select="@name"/><xsl:text>":&#xA;</xsl:text>
-              <xsl:value-of select="amqp:process-docs(doc)"/>
-              <xsl:text>*/&#xA;</xsl:text>
-            </xsl:for-each>
-
-            <!-- Inner class method definition -->
-            <xsl:text>                virtual void </xsl:text><xsl:value-of select="$method"/>
-            <xsl:text>( u_int16_t channel</xsl:text>
-
-            <!-- Inner class method parameter definition -->
-            <xsl:if test="field">
-              <xsl:text>,&#xA;                        </xsl:text>
-              <xsl:for-each select="field">
-                <xsl:variable name="domain-cpp-type" select="amqp:cpp-lookup(@domain, $domain-cpp-table)"/>
-                <xsl:value-of select="concat($domain-cpp-type, amqp:cpp-arg-ref($domain-cpp-type), ' ', amqp:cpp-name(@name))"/>
-                <xsl:if test="position()!=last()">
-                  <xsl:text>,&#xA;                        </xsl:text>
-                </xsl:if>
-              </xsl:for-each>
-            </xsl:if>
-            <xsl:text> ) = 0;&#xA;</xsl:text>
-          </xsl:if>
-        </xsl:for-each>
-        <xsl:text>        }; /* class </xsl:text><xsl:value-of select="$class"/><xsl:text> */&#xA;</xsl:text>
-      </xsl:for-each>
-
-      <xsl:text>&#xA;</xsl:text>
-      <xsl:for-each select="class">
-        <xsl:variable name="class" select="concat(amqp:cpp-class-name(@name), 'Handler')"/>
-        <xsl:text>        virtual AMQP_ServerOperations::</xsl:text>
-        <xsl:value-of select="$class"/><xsl:text>* get</xsl:text><xsl:value-of select="$class"/>
-        <xsl:text>() = 0;&#xA;</xsl:text>
-      </xsl:for-each>
-
-      <xsl:text>}; /* class AMQP_ServerOperations */
-
-} /* namespace framing */
-} /* namespace qpid */
-
-#endif&#xA;</xsl:text>
-    </xsl:result-document>
-  </xsl:template>
-
-</xsl:stylesheet> 
diff --git a/cpp/etc/stylesheets/code_gen.xsl b/cpp/etc/stylesheets/code_gen.xsl
deleted file mode 100644
index 055c40e9ea..0000000000
--- a/cpp/etc/stylesheets/code_gen.xsl
+++ /dev/null
@@ -1,111 +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.
- -
- -->
-<xsl:stylesheet version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:amqp="http://amqp.org"> 
-
-  <xsl:import href="convert_0.81.xsl"/>
-  <xsl:import href="amqp_consts.xsl"/>
-  <xsl:import href="amqp_server_operations.xsl"/>
-  <xsl:import href="amqp_client_operations.xsl"/>
-  <xsl:import href="amqp_server.xsl"/>
-  <xsl:import href="amqp_client.xsl"/>
-  <xsl:import href="amqp_server_handler_impl.xsl"/>
-  <xsl:import href="amqp_client_handler_impl.xsl"/>
-
-  <xsl:output method="text" indent="yes" name="textFormat"/> 
-  <xsl:key name="domain-lookup" match="domains/domain" use="@domain-name"/>
-
-  <xsl:template match="/">
-
-    <!-- 0. Convert to 0.81 format -->
-    <!--
-    NOTE: The XML specification change from 0.8 to 0.81 is primarily a change to
-    the XML itself, not the protocol it represents. However, at the time of this
-    commit, the 0.81 specification has not been approved by the AMQP working group,
-    so this converter from the 0.8 format to the 0.81 format has been included as
-    a temporary measure. When the 0.81 format becomes official, then this conversion
-    should be removed, and all of the templates below will revert to select=".".
-
-    TODO: Remove this conversion when the new 0.81 spec is checked in.
-    -->
-    <xsl:variable name="format-v081">
-      <xsl:apply-templates mode="do-amqp" select="amqp"/>
-    </xsl:variable>
-    <!-- == Uncomment this to view output for debugging ==
-    <xsl:result-document href="convert_081.out">
-        <xsl:copy-of select="$format-v081"/> 
-    </xsl:result-document>
-    -->
-
-    <!-- 1. Domain to C++ type lookup table -->
-    <xsl:variable name="domain-cpp-table">
-      <xsl:apply-templates mode="domain-table" select="$format-v081"/>
-    </xsl:variable>
-    <!-- == Uncomment this to view output for debugging ==
-    <xsl:result-document href="domain_cpp_table.out">
-        <xsl:copy-of select="$domain-cpp-table"/> 
-    </xsl:result-document>
-    -->
-
-    <!-- 2. Constant declarations (AMQP_Constants.h) -->
-    <xsl:apply-templates mode="domain-consts" select="$format-v081"/>
-
-    <!-- 3. Client and server handler pure virtual classes -->
-    <xsl:apply-templates mode="server-operations-h" select="$format-v081">
-      <xsl:with-param name="domain-cpp-table" select="$domain-cpp-table"/>
-    </xsl:apply-templates>
-    <xsl:apply-templates mode="client-operations-h" select="$format-v081">
-      <xsl:with-param name="domain-cpp-table" select="$domain-cpp-table"/>
-    </xsl:apply-templates>
-
-    <!-- 4. Client and server output classes -->
-    <xsl:apply-templates mode="server_h" select="$format-v081">
-      <xsl:with-param name="domain-cpp-table" select="$domain-cpp-table"/>
-    </xsl:apply-templates>
-    <xsl:apply-templates mode="client_h" select="$format-v081">
-      <xsl:with-param name="domain-cpp-table" select="$domain-cpp-table"/>
-    </xsl:apply-templates>
-    <xsl:apply-templates mode="server_cpp" select="$format-v081">
-      <xsl:with-param name="domain-cpp-table" select="$domain-cpp-table"/>
-    </xsl:apply-templates>
-    <xsl:apply-templates mode="client_cpp" select="$format-v081">
-      <xsl:with-param name="domain-cpp-table" select="$domain-cpp-table"/>
-    </xsl:apply-templates>
-
-    <!-- 5. Client and server handler stub classes -->
-    <xsl:apply-templates mode="server_handler_impl_h" select="$format-v081">
-      <xsl:with-param name="domain-cpp-table" select="$domain-cpp-table"/>
-    </xsl:apply-templates>
-    <xsl:apply-templates mode="client_handler_impl_h" select="$format-v081">
-      <xsl:with-param name="domain-cpp-table" select="$domain-cpp-table"/>
-    </xsl:apply-templates>
-    <!-- TODO: Find a way to only run the .cpp stub generator when required, as
-    running this will overwrite any stub code in existance! -->
-    <xsl:apply-templates mode="server_handler_impl_cpp" select="$format-v081">
-      <xsl:with-param name="domain-cpp-table" select="$domain-cpp-table"/>
-    </xsl:apply-templates>
-    <xsl:apply-templates mode="client_handler_impl_cpp" select="$format-v081">
-      <xsl:with-param name="domain-cpp-table" select="$domain-cpp-table"/>
-    </xsl:apply-templates>
-
- </xsl:template>
-
-</xsl:stylesheet> 
diff --git a/cpp/etc/stylesheets/code_utils.xsl b/cpp/etc/stylesheets/code_utils.xsl
deleted file mode 100644
index d2bbea2cdc..0000000000
--- a/cpp/etc/stylesheets/code_utils.xsl
+++ /dev/null
@@ -1,213 +0,0 @@
-<?xml version='1.0'?>
-<xsl:stylesheet version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:amqp="http://amqp.org">
-
-  <!--
-  ========================
-  Function: amqp:copyright
-  ========================
-  Print out a standard Apache copyright notice and generated code warning.
-  -->
-  <xsl:function name="amqp:copyright">//
-//
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-// 
-//   http://www.apache.org/licenses/LICENSE-2.0
-// 
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-//
-
- 
-//
-//
-// NOTE: This file is generated directly from the AMQP XML specification.
-// === DO NOT EDIT ===
-//
-//&#xA;</xsl:function>
-
-  <!--
-  ==========================
-  Function: amqp:upper-first
-  ==========================
-  Convert the first character of the parameter to upper-case
-  -->
-  <xsl:function name="amqp:upper-first">
-    <xsl:param name="in"/>
-    <xsl:value-of select="concat(upper-case(substring($in, 1, 1)), substring($in, 2))"/>
-  </xsl:function>
-
-  <!--
-  ========================
-  Function: amqp:cpp-name-1
-  ========================
-  Convert parameter "name" to a valid C++ identifier, finding spaces and '-'s
-  in the parameter name and replacing them with '_' chars. Also check for C++
-  reserved words and prefix them with '_'. No capitalization is performed.
-  -->
-  <xsl:function name="amqp:cpp-name-1">
-    <xsl:param name="name"/>
-    <xsl:choose>
-      <!-- C++ reserved words. -->
-      <xsl:when test="$name='delete'">delete_</xsl:when>
-      <xsl:when test="$name='return'">return_</xsl:when>
-      <!-- Change unsuitable C++ identifier characters. -->
-      <xsl:otherwise><xsl:value-of select="translate($name, ' -', '__')"/></xsl:otherwise>
-    </xsl:choose>
-  </xsl:function>
-
-  <!--
-  =======================
-  Function: amqp:cpp-name
-  =======================
-  Convert parameter "name" to a valid, camel cased C++ name. 
-  -->
-  <xsl:function name="amqp:cpp-name">
-    <xsl:param name="name"/>
-    <xsl:value-of select="amqp:cpp-name-1(amqp:camel-case($name))"/>
-  </xsl:function>
-
-  <!--
-  =============================
-  Function: amqp:cpp-class-name
-  =============================
-  Convert parameter "name" to a valid C++ identifier, finding spaces and '-'s
-  in the parameter name and replacing them with '_' chars. Also check for C++
-  reserved words and prefix them with '_'. First letter only is capitalized.
-  -->
-  <xsl:function name="amqp:cpp-class-name">
-    <xsl:param name="name"/>
-    <xsl:value-of select="amqp:upper-first(amqp:cpp-name($name))"/>
-  </xsl:function>
-
-  <!--
-  =========================
-  Function: amqp:camel-case
-  =========================
-  *** NOTE: Only works with *one* of either '-' or ' '. If a name contains 2 or
-  *** more of these characters, then this will break.
-  Convert parameter "name" to camel case, where words are separated by ' ' or '-'
-  -->
-  <xsl:function name="amqp:camel-case">
-    <xsl:param name="name"/>
-    <xsl:choose>
-        <xsl:when test="contains($name, ' ')">
-            <xsl:value-of select="concat(substring-before($name, ' '), amqp:upper-first(substring-after($name, ' ')))"/>
-        </xsl:when>
-        <xsl:when test="contains($name, '-')">
-            <xsl:value-of select="concat(substring-before($name, '-'), amqp:upper-first(substring-after($name, '-')))"/>
-        </xsl:when>
-        <xsl:otherwise>
-            <xsl:value-of select="$name"/>
-        </xsl:otherwise>
-    </xsl:choose>
-  </xsl:function>
-
-  <!--
-  =========================
-  Function: amqp:field-name
-  =========================
-  Get a valid field name, processing spaces and '-'s where appropriate
-  -->
-  <xsl:function name="amqp:field-name">
-    <xsl:param name="name"/>
-    <xsl:value-of select="amqp:upper-first(amqp:camel-case($name))"/>
-  </xsl:function>
-
-  <!--
-  =======================
-  Function: amqp:cpp-type
-  =======================
-  Map the set of simple AMQP types to C++ types. Also map the AMQP table
-  domain to appropriate C++ class.
-  -->
-  <xsl:function name="amqp:cpp-type">
-    <xsl:param name="type"/>
-    <xsl:choose>
-      <!-- Simple AMQP domain types -->
-      <xsl:when test="$type='octet'">u_int8_t</xsl:when>
-      <xsl:when test="$type='short'">u_int16_t</xsl:when>
-      <xsl:when test="$type='shortstr'">string</xsl:when>
-      <xsl:when test="$type='longstr'">string</xsl:when>
-      <xsl:when test="$type='bit'">bool</xsl:when>
-      <xsl:when test="$type='long'">u_int32_t</xsl:when>
-      <xsl:when test="$type='longlong'">u_int64_t</xsl:when>
-      <xsl:when test="$type='timestamp'">u_int64_t</xsl:when>
-      <!-- AMQP structures -->
-      <xsl:when test="$type='table'">FieldTable</xsl:when>
-      <!-- Fallback: unknown type -->
-      <xsl:otherwise>unknown_type /* WARNING: undefined type */</xsl:otherwise>
-    </xsl:choose>
-  </xsl:function>
-
-  <!--
-  ==========================
-  Function: amqp:cpp-arg-ref
-  ==========================
-  Determines whether a C++ reference is required for an argument.
-  -->
-  <xsl:function name="amqp:cpp-arg-ref">
-    <xsl:param name="type"/>
-    <xsl:choose>
-      <xsl:when test="$type='string'">&amp;</xsl:when>
-      <xsl:when test="$type='FieldTable'">&amp;</xsl:when>
-    </xsl:choose>
-  </xsl:function>
-
-  <!--
-  =========================
-  Function: amqp:cpp-lookup
-  =========================
-  Template and function for looking up the cpp type from the domain name.
-  The template runs on a lookup table XML generated by the "domain_table"
-  template in amqp_domaintypes.xsl.
-  -->
-  <xsl:template match="/" mode="cpp-lookup">
-    <xsl:param name="domain-name"/>
-    <xsl:for-each select="key('domain-lookup', $domain-name)">
-      <xsl:value-of select="@cpp-type"/>
-    </xsl:for-each>
-  </xsl:template>
-
-  <xsl:function name="amqp:cpp-lookup">
-    <xsl:param name="domain-name"/>
-    <xsl:param name="domain-cpp-table"/>
-    <xsl:apply-templates mode="cpp-lookup" select="$domain-cpp-table">
-      <xsl:with-param name="domain-name" select="$domain-name"/>
-    </xsl:apply-templates>
-  </xsl:function>
-
-  <!--
-  =========================
-  Function: amqp:cpp-lookup
-  =========================
-  Template and function for processing the possibly multiple <doc> elements
-  within a node.
-  -->
-  <xsl:template match="doc" mode="process-doc-elts">
-    <xsl:for-each select=".">
-      <xsl:choose>
-        <xsl:when test=".[@type='grammar']"><xsl:value-of select="."/></xsl:when>
-        <xsl:when test=".[@type='scenario']"><xsl:value-of select="concat('&#xA;Test Scenario: ', normalize-space(.))"/></xsl:when>
-        <xsl:otherwise><xsl:value-of select="normalize-space(.)"/></xsl:otherwise>
-      </xsl:choose>
-    </xsl:for-each>
-  </xsl:template>
-
-  <xsl:function name="amqp:process-docs">
-    <xsl:param name="doc-elts"/>
-    <xsl:apply-templates mode="process-doc-elts" select="$doc-elts"/>
-  </xsl:function>
-
-
-</xsl:stylesheet>
-
diff --git a/cpp/etc/stylesheets/convert_0.81.xsl b/cpp/etc/stylesheets/convert_0.81.xsl
deleted file mode 100644
index c9e969661e..0000000000
--- a/cpp/etc/stylesheets/convert_0.81.xsl
+++ /dev/null
@@ -1,427 +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.
- -
- -->
-<xsl:stylesheet version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:amqp="http://amqp.org"> 
-
-<xsl:template match="/">
-    <xsl:apply-templates select="/" mode="do-amqp"/> 
-</xsl:template> 
-
-<!-- ======
-     <amqp>
-     ====== -->
-<xsl:template match="amqp" mode="do-amqp">
-
-<!-- <xsl:text>&#xA;</xsl:text> -->
-<xsl:element name= "amqp">
-<xsl:attribute name="major"><xsl:value-of select="@major"/></xsl:attribute>
-<xsl:attribute name="minor"><xsl:value-of select="@minor"/></xsl:attribute>
-<xsl:attribute name="port"><xsl:value-of select="@port"/></xsl:attribute>
-<xsl:attribute name="comment"><xsl:value-of select="@comment"/></xsl:attribute>
-<xsl:text>&#xA;</xsl:text>
-
-<!-- constant elements -->
-<xsl:text>&#xA;</xsl:text>
-<xsl:text>  </xsl:text><xsl:comment>
-  ====================
-  Constants
-  ====================
-  </xsl:comment><xsl:text>&#xA;</xsl:text>
-<xsl:text>&#xA;</xsl:text>
-<xsl:apply-templates select="constant" mode="do-constant">
-<xsl:with-param name="indent" select="'  '"/>
-</xsl:apply-templates>
-
-<!-- domain elements -->
-<xsl:text>&#xA;</xsl:text>
-<xsl:text>  </xsl:text><xsl:comment>
-  ====================
-  Domains
-  ====================
-  </xsl:comment><xsl:text>&#xA;</xsl:text>
-<xsl:text>&#xA;</xsl:text>
-<xsl:apply-templates select="domain" mode="do-domain">
-<xsl:with-param name="indent" select="'  '"/>
-</xsl:apply-templates>
-
-<!-- required elementary domain definition elements added into v0.81 -->
-<xsl:text>&#xA;</xsl:text>
-<xsl:text>  </xsl:text><xsl:comment> Elementary domains </xsl:comment><xsl:text>&#xA;</xsl:text>
-<xsl:text>  </xsl:text><xsl:element name="domain">
-  <xsl:attribute name="name">bit</xsl:attribute>
-  <xsl:attribute name="type">bit</xsl:attribute>
-  <xsl:attribute name="label">single bit</xsl:attribute>
-</xsl:element><xsl:text>&#xA;</xsl:text>
-<xsl:text>  </xsl:text><xsl:element name="domain">
-  <xsl:attribute name="name">octet</xsl:attribute>
-  <xsl:attribute name="type">octet</xsl:attribute>
-  <xsl:attribute name="label">single octet</xsl:attribute>
-</xsl:element><xsl:text>&#xA;</xsl:text>
-<xsl:text>  </xsl:text><xsl:element name="domain">
-  <xsl:attribute name="name">short</xsl:attribute>
-  <xsl:attribute name="type">short</xsl:attribute>
-  <xsl:attribute name="label">16-bit integer</xsl:attribute>
-</xsl:element><xsl:text>&#xA;</xsl:text>
-<xsl:text>  </xsl:text><xsl:element name="domain">
-  <xsl:attribute name="name">long</xsl:attribute>
-  <xsl:attribute name="type">long</xsl:attribute>
-  <xsl:attribute name="label">32-bit integer</xsl:attribute>
-</xsl:element><xsl:text>&#xA;</xsl:text>
-<xsl:text>  </xsl:text><xsl:element name="domain">
-  <xsl:attribute name="name">longlong</xsl:attribute>
-  <xsl:attribute name="type">longlong</xsl:attribute>
-  <xsl:attribute name="label">64-bit integer</xsl:attribute>
-</xsl:element><xsl:text>&#xA;</xsl:text>
-<xsl:text>  </xsl:text><xsl:element name="domain">
-  <xsl:attribute name="name">shortstr</xsl:attribute>
-  <xsl:attribute name="type">shortstr</xsl:attribute>
-  <xsl:attribute name="label">short string</xsl:attribute>
-</xsl:element><xsl:text>&#xA;</xsl:text>
-<xsl:text>  </xsl:text><xsl:element name="domain">
-  <xsl:attribute name="name">longstr</xsl:attribute>
-  <xsl:attribute name="type">longstr</xsl:attribute>
-  <xsl:attribute name="label">long string</xsl:attribute>
-</xsl:element><xsl:text>&#xA;</xsl:text>
-<xsl:text>  </xsl:text><xsl:element name="domain">
-  <xsl:attribute name="name">timestamp</xsl:attribute>
-  <xsl:attribute name="type">timestamp</xsl:attribute>
-  <xsl:attribute name="label">64-bit timestamp</xsl:attribute>
-</xsl:element><xsl:text>&#xA;</xsl:text>
-<xsl:text>  </xsl:text><xsl:element name="domain">
-  <xsl:attribute name="name">table</xsl:attribute>
-  <xsl:attribute name="type">table</xsl:attribute>
-  <xsl:attribute name="label">field table</xsl:attribute>
-</xsl:element><xsl:text>&#xA;</xsl:text>
-
-<!-- class elements -->
-<xsl:text>&#xA;</xsl:text>
-<xsl:text>  </xsl:text><xsl:comment>
-  ====================
-  Classes
-  ====================
-  </xsl:comment><xsl:text>&#xA;</xsl:text>
-<xsl:apply-templates select="class" mode="do-class">
-<xsl:with-param name="indent" select="'  '"/>
-</xsl:apply-templates>
-
-</xsl:element><!-- amqp -->
-<!-- <xsl:text>&#xA;</xsl:text> -->
-</xsl:template>
-
-<!-- ==========
-     <constant>
-     ========== -->
-<xsl:template match="constant" mode="do-constant">
-<xsl:param name="indent"/>
-<xsl:variable name="constant" select="translate(@name, ' ', '-')"/>
-
-<xsl:value-of select="$indent"/><xsl:element name="constant">
-<xsl:attribute name="name"><xsl:value-of select="$constant"/></xsl:attribute>
-<xsl:attribute name="value"><xsl:value-of select="@value"/></xsl:attribute>
-<xsl:if test="@class">
-<xsl:attribute name="class"><xsl:value-of select="translate(@class, ' ', '-')"/></xsl:attribute>
-</xsl:if>
-
-<!-- If there is content, place in child <doc> element -->
-<xsl:if test="string-length(.) > 0">
-<xsl:text>&#xA;</xsl:text>
-<xsl:value-of select="$indent"/><xsl:text>  </xsl:text><xsl:element name="doc"><xsl:text>&#xA;</xsl:text>
-<xsl:value-of select="$indent"/><xsl:text>    </xsl:text><xsl:value-of select="normalize-space(.)"/><xsl:text>&#xA;</xsl:text>
-<xsl:value-of select="$indent"/><xsl:text>  </xsl:text></xsl:element><xsl:text>&#xA;</xsl:text>
-<xsl:value-of select="$indent"/>
-</xsl:if>
-
-</xsl:element><xsl:text>&#xA;</xsl:text>
-
-</xsl:template> 
-
-<!-- ========
-     <domain>
-     ======== -->
-<xsl:template match="domain" mode="do-domain">
-<xsl:param name="indent"/>
-<xsl:variable name="domain" select="translate(@name, ' ', '-')"/>
-
-<xsl:value-of select="$indent"/><xsl:element name="domain">
-<xsl:attribute name="name"><xsl:value-of select="$domain"/></xsl:attribute>
-<xsl:attribute name="type"><xsl:value-of select="@type"/></xsl:attribute>
-<xsl:if test="doc|assert|rule"><xsl:text>&#xA;</xsl:text></xsl:if>
-
-<!-- doc elements -->
-<xsl:apply-templates select="doc" mode="do-doc">
-<xsl:with-param name="indent" select="concat($indent, '  ')"/>
-</xsl:apply-templates>
-
-<!-- assert elements -->
-<xsl:apply-templates select="assert" mode="do-assert">
-<xsl:with-param name="indent" select="concat($indent, '  ')"/>
-</xsl:apply-templates>
-
-<!-- rule elements -->
-<xsl:apply-templates select="rule" mode="do-rule">
-<xsl:with-param name="indent" select="concat($indent, '  ')"/>
-<xsl:with-param name="label" select="$domain"/>
-</xsl:apply-templates>
-
-<xsl:if test="doc|assert|rule"><xsl:value-of select="$indent"/></xsl:if></xsl:element><xsl:text>&#xA;</xsl:text>
-
-</xsl:template> 
-
-<!-- ========
-     <class>
-     ======== -->
-
-<xsl:template match="class" mode="do-class">
-<xsl:param name="indent"/>
-<xsl:variable name="class" select="translate(@name, ' ', '-')"/>
-
-<!-- Ignore class test - removed from 0.81 -->
-<xsl:if test="not($class = 'test')">
-<xsl:text>&#xA;</xsl:text><xsl:value-of select="$indent"/><xsl:comment><xsl:value-of select="concat(' == Class: ', $class, ' == ')"/></xsl:comment><xsl:text>&#xA;</xsl:text>
-<xsl:value-of select="$indent"/><xsl:element name="class">
-<xsl:attribute name="name"><xsl:value-of select="$class"/></xsl:attribute>
-<xsl:attribute name="handler"><xsl:value-of select="@handler"/></xsl:attribute>
-<xsl:attribute name="index"><xsl:value-of select="@index"/></xsl:attribute>
-<xsl:if test="doc|chassis|rule|field|method"><xsl:text>&#xA;</xsl:text></xsl:if>
-
-<!-- doc elements -->
-<xsl:apply-templates select="doc" mode="do-doc">
-<xsl:with-param name="indent" select="concat($indent, '  ')"/>
-<xsl:with-param name="label" select="$class"/>
-</xsl:apply-templates>
-
-<!-- chassis elements -->
-<xsl:apply-templates select="chassis" mode="do-chassis">
-<xsl:with-param name="indent" select="concat($indent, '  ')"/>
-</xsl:apply-templates>
-
-<!-- rule elements -->
-<xsl:apply-templates select="rule" mode="do-rule">
-<xsl:with-param name="indent" select="concat($indent, '  ')"/>
-<xsl:with-param name="label" select="$class"/>
-</xsl:apply-templates>
-
-<!-- field elements -->
-<xsl:apply-templates select="field" mode="do-field">
-<xsl:with-param name="indent" select="concat($indent, '  ')"/>
-<xsl:with-param name="label" select="$class"/>
-</xsl:apply-templates>
-
-<!-- method elements -->
-<xsl:apply-templates select="method" mode="do-method">
-<xsl:with-param name="indent" select="concat($indent, '  ')"/>
-<xsl:with-param name="label" select="$class"/>
-</xsl:apply-templates>
-
-<xsl:if test="doc|chassis|rule|field|method"><xsl:value-of select="$indent"/></xsl:if></xsl:element><xsl:text>&#xA;</xsl:text>
-</xsl:if>
-</xsl:template> 
-
-<!-- ========
-     <method>
-     ======== -->
-
-<xsl:template match="method" mode="do-method">
-<xsl:param name="indent"/>
-<xsl:param name="label"/>
-<xsl:variable name="method" select="translate(@name, ' ', '-')"/>
-
-<xsl:text>&#xA;</xsl:text><xsl:value-of select="$indent"/><xsl:comment><xsl:value-of select="concat(' == Method: ', $label, '.', $method, ' == ')"/></xsl:comment><xsl:text>&#xA;</xsl:text>
-<xsl:value-of select="$indent"/><xsl:element name="method">
-<xsl:attribute name="name"><xsl:value-of select="$method"/></xsl:attribute>
-<xsl:if test="@synchronous"><xsl:attribute name="synchronous"><xsl:value-of select="@synchronous"/></xsl:attribute></xsl:if>
-<xsl:attribute name="index"><xsl:value-of select="@index"/></xsl:attribute>
-<xsl:if test="doc|chassis|response|rule|field"><xsl:text>&#xA;</xsl:text></xsl:if>
-
-<!-- doc elements -->
-<xsl:apply-templates select="doc" mode="do-doc">
-<xsl:with-param name="indent" select="concat($indent, '  ')"/>
-<xsl:with-param name="label" select="concat($label, '.', $method)"/>
-</xsl:apply-templates>
-
-<!-- chassis and response elements -->
-<xsl:apply-templates select="chassis" mode="do-chassis">
-<xsl:with-param name="indent" select="concat($indent, '  ')"/>
-</xsl:apply-templates>
-<xsl:apply-templates select="response" mode="do-response">
-<xsl:with-param name="indent" select="concat($indent, '  ')"/>
-</xsl:apply-templates>
-
-<!-- rule elements -->
-<xsl:apply-templates select="rule" mode="do-rule">
-<xsl:with-param name="indent" select="concat($indent, '  ')"/>
-<xsl:with-param name="label" select="concat($label, '.', $method)"/>
-</xsl:apply-templates>
-
-<!-- field elements -->
-<xsl:apply-templates select="field" mode="do-field">
-<xsl:with-param name="indent" select="concat($indent, '  ')"/>
-<xsl:with-param name="label" select="concat($label, '.', $method)"/>
-</xsl:apply-templates>
-
-<xsl:if test="doc|chassis|response|rule|field"><xsl:value-of select="$indent"/></xsl:if></xsl:element><xsl:text>&#xA;</xsl:text>
-
-</xsl:template> 
-
-<!-- ========
-     <field>
-     ======== -->
-
-<xsl:template match="field" mode="do-field">
-<xsl:param name="indent"/>
-<xsl:param name="label"/>
-<xsl:variable name="field" select="translate(@name, ' ', '-')"/>
-
-<xsl:value-of select="$indent"/><xsl:element name="field">
-<xsl:attribute name="name"><xsl:value-of select="$field"/></xsl:attribute>
-<xsl:if test="@type">
-<xsl:attribute name="domain"><xsl:value-of select="translate(@type, ' ', '-')"/></xsl:attribute>
-</xsl:if>
-<xsl:if test="@domain">
-<xsl:attribute name="domain"><xsl:value-of select="translate(@domain, ' ', '-')"/></xsl:attribute>
-</xsl:if>
-<xsl:if test="doc|rule|assert"><xsl:text>&#xA;</xsl:text></xsl:if>
-
-<!-- doc elements -->
-<xsl:apply-templates select="doc" mode="do-doc">
-<xsl:with-param name="indent" select="concat($indent, '  ')"/>
-<xsl:with-param name="label" select="concat($label, '.', $field)"/>
-</xsl:apply-templates>
-
-<!-- rule elements -->
-<xsl:apply-templates select="rule" mode="do-rule">
-<xsl:with-param name="indent" select="concat($indent, '  ')"/>
-<xsl:with-param name="label" select="concat($label, '.', $field)"/>
-</xsl:apply-templates>
-
-<!-- assert elements -->
-<xsl:apply-templates select="assert" mode="do-assert">
-<xsl:with-param name="indent" select="concat($indent, '  ')"/>
-</xsl:apply-templates>
-
-<xsl:if test="doc|rule|assert"><xsl:value-of select="$indent"/></xsl:if></xsl:element><xsl:text>&#xA;</xsl:text>
-
-</xsl:template> 
-
-<!-- ========
-     <assert>
-     ======== -->
-<xsl:template match="assert" mode="do-assert">
-<xsl:param name="indent"/>
-
-<xsl:value-of select="$indent"/><xsl:element name="assert">
-<xsl:attribute name="check"><xsl:value-of select="@check"/></xsl:attribute>
-<xsl:if test="@value"><xsl:attribute name="value"><xsl:value-of select="@value"/></xsl:attribute></xsl:if>
-<xsl:if test="@rule"><xsl:attribute name="rule"><xsl:value-of select="@rule"/></xsl:attribute></xsl:if>
-
-<xsl:apply-templates select="doc" mode="do-doc">
-<xsl:with-param name="indent" select="concat($indent, '  ')"/>
-</xsl:apply-templates>
-
-</xsl:element><xsl:text>&#xA;</xsl:text>
-
-</xsl:template> 
-
-<!-- ========
-     <rule>
-     ======== -->
-<xsl:template match="rule" mode="do-rule">
-<xsl:param name="indent"/>
-<xsl:param name="label"/>
-
-<xsl:value-of select="$indent"/><xsl:element name="rule">
-<xsl:attribute name="name">rule_<xsl:value-of select="$label"/>_<xsl:number format="01"/></xsl:attribute>
-
-<!-- If there is content, place in child <doc> element -->
-
-<xsl:if test="string-length(.) > 0">
-<xsl:text>&#xA;</xsl:text>
-<xsl:value-of select="$indent"/><xsl:text>  </xsl:text><xsl:element name="doc"><xsl:text>&#xA;</xsl:text>
-<xsl:value-of select="$indent"/><xsl:text>    </xsl:text><xsl:value-of select="normalize-space(.)"/><xsl:text>&#xA;</xsl:text>
-<xsl:value-of select="$indent"/><xsl:text>  </xsl:text></xsl:element><xsl:text>&#xA;</xsl:text>
-<xsl:value-of select="$indent"/>
-</xsl:if>
-
-</xsl:element><xsl:text>&#xA;</xsl:text>
-
-</xsl:template> 
-
-<!-- =========
-     <chassis>
-     ========= -->
-<xsl:template match="chassis" mode="do-chassis">
-<xsl:param name="indent"/>
-
-<xsl:value-of select="$indent"/><xsl:element name="chassis">
-<xsl:attribute name="name"><xsl:value-of select="@name"/></xsl:attribute>
-<xsl:attribute name="implement"><xsl:value-of select="@implement"/></xsl:attribute>
-</xsl:element><xsl:text>&#xA;</xsl:text>
-
-</xsl:template> 
-
-<!-- ==========
-     <response>
-     ========== -->
-<xsl:template match="response" mode="do-response">
-<xsl:param name="indent"/>
-
-<xsl:value-of select="$indent"/><xsl:element name="response">
-<xsl:attribute name="name"><xsl:value-of select="@name"/></xsl:attribute>
-</xsl:element><xsl:text>&#xA;</xsl:text>
-
-</xsl:template> 
-
-<!-- =====
-     <doc>
-     ===== -->
-<xsl:template match="doc" mode="do-doc">
-<xsl:param name="indent"/>
-<xsl:param name="label"/>
-
-<!-- Handle cases of <doc name="rule>...</doc>: turn them into <rule><doc>...</doc></rule> -->
-<xsl:if test="@name = 'rule'">
-<xsl:value-of select="$indent"/><xsl:element name="rule">
-<xsl:if test="@test"><xsl:attribute name="name"><xsl:value-of select="@test"/></xsl:attribute></xsl:if>
-<xsl:if test="not(@test)"><xsl:attribute name="name">doc_rule_<xsl:value-of select="$label"/>_<xsl:number format="01"/></xsl:attribute></xsl:if>
-<xsl:text>&#xA;</xsl:text>
-<xsl:value-of select="concat($indent, '  ')"/><xsl:element name="doc"><xsl:text>&#xA;</xsl:text>
-<xsl:value-of select="concat($indent, '  ')"/><xsl:text>  </xsl:text><xsl:value-of select="normalize-space(.)"/><xsl:text>&#xA;</xsl:text>
-<xsl:value-of select="concat($indent, '  ')"/></xsl:element><xsl:text>&#xA;</xsl:text>
-<xsl:value-of select="$indent"/></xsl:element><xsl:text>&#xA;</xsl:text>
-</xsl:if>
-
-<!-- Normal <doc>...</doc> elements -->
-<xsl:if test="not(@name = 'rule')">
-<xsl:value-of select="$indent"/><xsl:element name="doc">
-<xsl:if test="@name = 'grammar'">
-<xsl:attribute name="type">grammar</xsl:attribute>
-<xsl:value-of select="$indent"/><xsl:text>  </xsl:text><xsl:value-of select="."/>
-</xsl:if>
-<xsl:if test="not(@name = 'grammar')">
-<xsl:text>&#xA;</xsl:text>
-<xsl:value-of select="$indent"/><xsl:text>  </xsl:text><xsl:value-of select="normalize-space(.)"/><xsl:text>&#xA;</xsl:text>
-</xsl:if>
-<xsl:value-of select="$indent"/></xsl:element><xsl:text>&#xA;</xsl:text>
-</xsl:if>
-
-</xsl:template> 
-
-</xsl:stylesheet> 
diff --git a/cpp/etc/stylesheets/cpp.xsl b/cpp/etc/stylesheets/cpp.xsl
deleted file mode 100644
index a9ab30e078..0000000000
--- a/cpp/etc/stylesheets/cpp.xsl
+++ /dev/null
@@ -1,335 +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.
- -
- -->
-<xsl:stylesheet version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:amqp="http://amqp.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:template match="/"> 
-    <xsl:apply-templates mode="generate-multi" select="frames"/>
-    <xsl:apply-templates mode="method-list-header" select="frames"/>
-    <xsl:apply-templates mode="method-list-source" select="frames"/>
-    <xsl:apply-templates mode="method-interface" select="frames"/>
-</xsl:template>
-
-<!-- processes all frames outputting the classes in a single stream -->
-<xsl:template match="frames" mode="generate-single"> 
-    <xsl:result-document href="amqp_methods.h" format="textFormat">
-#include "qpid/framing/amqp_framing.h"
-        <xsl:for-each select="frame">      
-           <xsl:call-template name="generate-class">
-                <xsl:with-param name="f" select="."/>
-            </xsl:call-template>
-        </xsl:for-each>      
-    </xsl:result-document>
-</xsl:template>
-
-<!-- generates seperate file for each class/frame -->
-<xsl:template match="frame" mode="generate-multi"> 
-    <xsl:variable name="uri" select="concat(@name, '.h')"/> 
-    <xsl:result-document href="{$uri}" format="textFormat"> 
-#include "qpid/framing/amqp_types.h"
-#include "AMQP_ServerOperations.h"
-#include "qpid/framing/AMQMethodBody.h"
-#include "qpid/framing/Buffer.h"
-#include "qpid/framing/FieldTable.h"
-
-#ifndef _<xsl:value-of select="@name"/>_
-#define _<xsl:value-of select="@name"/>_
-
-namespace qpid {
-namespace framing {
-
-    <xsl:call-template name="generate-class">
-        <xsl:with-param name="f" select="."/>
-    </xsl:call-template>
-}
-}
-
-#endif
-
-</xsl:result-document> 
-</xsl:template> 
-
-
-<!-- main class generation template -->
-<xsl:template name="generate-class"> 
-    <xsl:param name="f"/>
-/**
- * This class is autogenerated, do not modify. [From <xsl:value-of select="$f/parent::frames/@protocol"/>]
- */
-class <xsl:value-of select="$f/@name"/> : virtual public AMQMethodBody
-{ 
-    <xsl:for-each select="$f/field"> 
-        <xsl:value-of select="@cpp-type"/>
-        <xsl:text> </xsl:text>
-        <xsl:value-of select="@name"/>;    
-    </xsl:for-each> 
-
-public:
-    typedef boost::shared_ptr&lt;<xsl:value-of select="$f/@name"/>&gt; shared_ptr;   
-
-    virtual ~<xsl:value-of select="$f/@name"/>() {}
-
-    <xsl:for-each select="$f/field"> 
-        inline <xsl:value-of select="concat(@cpp-arg-type, ' get', amqp:upper-first(@name), '() { return ', @name)"/>; }    
-    </xsl:for-each> 
- 
-
-    inline void print(std::ostream&amp; out) const{
-	out &lt;&lt; "<xsl:value-of select="$f/@declaration_name"/>"
-        <xsl:for-each select="$f/field"> 
-	    <xsl:text> &lt;&lt; ", </xsl:text>
-            <xsl:value-of select="@name"/>="&lt;&lt;
-            <xsl:value-of select="@name"/>    
-        </xsl:for-each> 
-        ;
-    }
-
-    inline u_int16_t amqpClassId() const {
-        return <xsl:value-of select="$f/@class-id"/>;
-    }
-   
-    inline u_int16_t amqpMethodId() const {
-        return <xsl:value-of select="$f/@method-id"/>;
-    }
-
-    inline u_int32_t bodySize() const {
-        <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="amqp:field-length(.)"/>
-        </xsl:for-each>		 
-        ;
-        </xsl:when>
-        <xsl:otherwise>return 0;</xsl:otherwise>
-        </xsl:choose> 
-    }
-
-    <xsl:if test="@server='true'">
-    inline void invoke(AMQP_ServerOperations&amp; target, u_int16_t channel) {
-	<xsl:if test="field">
-            <xsl:value-of select="concat('target.get', amqp:upper-first(parent::class/@name), 'Handler()->', @invocation_name, '(channel, ')"/>
-            <xsl:value-of select="$f/field/@name" separator=", "/>);
-	</xsl:if>
-	<xsl:if test="not(field)">
-            <xsl:value-of select="concat('target.get', amqp:upper-first(parent::class/@name), 'Handler()->', @invocation_name, '(channel)')"/>;
-	</xsl:if>
-    }
-    </xsl:if>
-
-    inline void encodeContent(Buffer&amp; <xsl:if test="$f/field">buffer</xsl:if>) const
-    {
-        <xsl:if test="$f/field[@type='bit']">        
-	    u_int8_t flags = 0;
-            <xsl:for-each select="$f/field[@type='bit']">
-                <xsl:value-of select="concat('flags |= ', @name,' &lt;&lt; (', @boolean-index, ' - 1)')"/>; 
-            </xsl:for-each>
-        </xsl:if>
-        <xsl:for-each select="$f/field">
-            <xsl:if test="@type != 'bit'">
-                <xsl:value-of select="amqp:encoder(.)"/>;
-            </xsl:if>
-            <xsl:if test="@type = 'bit' and @boolean-index = 1">
-                <xsl:text>buffer.putOctet(flags)</xsl:text>;
-            </xsl:if>
-        </xsl:for-each>		 
-    }
-
-    inline void decodeContent(Buffer&amp; <xsl:if test="$f/field">buffer</xsl:if>)
-    {
-        <xsl:for-each select="$f/field">
-            <xsl:choose>
-		<xsl:when test="@type = 'bit' and @boolean-index = 1">
-		    <xsl:text>u_int8_t flags = buffer.getOctet()</xsl:text>;
-		    <xsl:value-of select="amqp:decoder(.)"/>;
-		</xsl:when>
-		<xsl:otherwise>
-		    <xsl:value-of select="amqp:decoder(.)"/>;
-		</xsl:otherwise>
-            </xsl:choose>
-        </xsl:for-each>		 
-    }
-
-    <xsl:if test="$f/field">        
-    <!-- only generate overloaded constructor if there are fields in this method -->
-    inline <xsl:value-of select="$f/@name"/>(<xsl:value-of select="$f/field/concat(@cpp-arg-type, ' _', @name)" separator=", "/>) : <xsl:value-of select="$f/field/concat(@name, '(_', @name, ')')" separator=", "/>
-    {
-    }
-    </xsl:if>
-
-    inline <xsl:value-of select="$f/@name"/>()
-    {
-    }
-};
-
-</xsl:template> 
-
-<xsl:template match="frames" mode="method-list-header">	
-<xsl:result-document href="amqp_methods.h" format="textFormat">
-/**
- * This file is autogenerated, do not modify.
- */
-
-#ifndef AMQ_METHODS_H
-#define AMQ_METHODS_H
-
-        <xsl:for-each select="class/frame">
-#include "<xsl:value-of select="@name"/>.h"
-        </xsl:for-each>
-
-namespace qpid {
-namespace framing {
-
-        <xsl:for-each select="class/frame">
-const <xsl:value-of select="concat(@name, ' ', @declaration_name)"/>;
-        </xsl:for-each>
-
-AMQMethodBody* createAMQMethodBody(u_int16_t classId, u_int16_t methodId);
-
-}
-}
-
-#endif
-</xsl:result-document>
-</xsl:template> 
-
-<xsl:template match="frames" mode="method-list-source">	
-    <xsl:result-document href="amqp_methods.cpp" format="textFormat">
-#include "amqp_methods.h"
-#include "qpid/QpidError.h"
-
-namespace qpid {
-namespace framing {
-/**
- * This method is autogenerated, do not modify.
- */
-AMQMethodBody* createAMQMethodBody(u_int16_t classId, u_int16_t methodId){
-    switch(classId * 1000 + methodId)
-    {
-        <xsl:for-each select="class/frame">
-            <xsl:text>case </xsl:text>
-            <xsl:value-of select="@class-id"/>         
-	    <xsl:text> * 1000 + </xsl:text> 
-            <xsl:value-of select="@method-id"/>         
-	    <xsl:text>: return new </xsl:text> 
-            <xsl:value-of select="@name"/>();         
-        </xsl:for-each>
-    }
-    THROW_QPID_ERROR(FRAMING_ERROR, "Unknown method");	
-}
-
-}
-}
-</xsl:result-document>
-</xsl:template> 
-
-<xsl:template match="frames" mode="generate-interface">	
-    <xsl:result-document href="AMQPServer.h" format="textFormat">
-#include "qpid/framing/amqp_types.h"
-#include "qpid/framing/FieldTable.h"
-
-#ifndef _AMQPServer_
-#define _AMQPServer_
-
-namespace qpid {
-namespace framing {
-
-class AMQPServer
-{
-    public:
-
-    <xsl:for-each select="class">
-    class <xsl:value-of select="concat(amqp:upper-first(@name), 'Handler')"/>{
-        public:
-        <xsl:for-each select="frame[@server='true']">      
-        <xsl:if test="field">
-            virtual void <xsl:value-of select="@invocation_name"/>(u_int16_t channel, <xsl:value-of select="field/concat(@cpp-arg-type, ' ', @name)" separator=", "/>) = 0; 
-        </xsl:if>
-        <xsl:if test="not(field)">
-            virtual void <xsl:value-of select="@invocation_name"/>(u_int16_t channel) = 0; 
-        </xsl:if>
-        </xsl:for-each>      
-            virtual ~<xsl:value-of select="concat(amqp:upper-first(@name), 'Handler')"/>(){}
-    };
-
-    virtual <xsl:value-of select="concat(amqp:upper-first(@name), 'Handler* get', amqp:upper-first(@name), 'Handler')"/>() = 0;       
- 
-    </xsl:for-each>      
-    virtual ~AMQPServer(){}
-};
-
-}
-}
-
-#endif
-</xsl:result-document>
-
-    <xsl:result-document href="AMQPClient.h" format="textFormat">
-#include "qpid/framing/amqp_types.h"
-#include "qpid/framing/FieldTable.h"
-
-#ifndef _AMQPClient_
-#define _AMQPClient_
-
-namespace qpid {
-namespace framing {
-
-class AMQPClient
-{
-    public:
-
-    <xsl:for-each select="class">
-    class <xsl:value-of select="concat(amqp:upper-first(@name), 'Handler')"/>{
-        public:
-        <xsl:for-each select="frame[@client='true']">      
-        <xsl:if test="field">
-            virtual void <xsl:value-of select="@invocation_name"/>(u_int16_t channel, <xsl:value-of select="field/concat(@cpp-arg-type, ' ', @name)" separator=", "/>) = 0; 
-        </xsl:if>
-        <xsl:if test="not(field)">
-            virtual void <xsl:value-of select="@invocation_name"/>(u_int16_t channel) = 0; 
-        </xsl:if>
-        </xsl:for-each>      
-            virtual ~<xsl:value-of select="concat(amqp:upper-first(@name), 'Handler')"/>(){}
-    };
-
-    virtual <xsl:value-of select="concat(amqp:upper-first(@name), 'Handler* get', amqp:upper-first(@name), 'Handler')"/>() = 0;       
- 
-    </xsl:for-each>      
-
-    virtual ~AMQPClient(){}
-};
-
-}
-}
-
-#endif
-</xsl:result-document>
-
-</xsl:template> 
-
-</xsl:stylesheet>
diff --git a/cpp/etc/stylesheets/framing.xsl b/cpp/etc/stylesheets/framing.xsl
deleted file mode 100644
index baf643d682..0000000000
--- a/cpp/etc/stylesheets/framing.xsl
+++ /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.
- -
- -->
-<xsl:stylesheet version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:amqp="http://amqp.org"> 
-
-<xsl:import href="prepare1.xsl"/>
-<xsl:import href="prepare2.xsl"/>
-<xsl:import href="prepare3.xsl"/>
-<xsl:import href="cpp.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="method-list-header" select="$model"/>
-    <xsl:apply-templates mode="method-list-source" select="$model"/>
-
-    <!-- these interfaces are now generated by the new scripts from kim -->
-    <!-- e.g. those of the form amqp-server/client-*.xsl                -->    
-    <!-- xsl:apply-templates mode="generate-interface" 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/cpp/etc/stylesheets/prepare1.xsl b/cpp/etc/stylesheets/prepare1.xsl
deleted file mode 100644
index e59a4f5267..0000000000
--- a/cpp/etc/stylesheets/prepare1.xsl
+++ /dev/null
@@ -1,124 +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.
- -
- -->
-<xsl:stylesheet version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:amqp="http://amqp.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="@major"/>
-                <xsl:text>, minor=</xsl:text><xsl:value-of select="@minor"/> 
-            <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:if test="not(@name = 'test')">
-    <class>    
-        <xsl:attribute name="name"><xsl:value-of select="@name"/></xsl:attribute>
-        <xsl:apply-templates select="method" mode="prepare1"/> 
-    </class>
-</xsl:if>
-</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="amqp: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:attribute name="invocation_name">
-             <xsl:value-of select="amqp:keyword-check(amqp:field-name(@name))"/>
-        </xsl:attribute>
-        <xsl:attribute name="declaration_name">
-             <xsl:value-of select="amqp:method-name(parent::class/@name, @name)"/>
-        </xsl:attribute>
-        <xsl:if test="chassis[@name='client']">
-            <xsl:attribute name="client">true</xsl:attribute>
-        </xsl:if>
-        <xsl:if test="chassis[@name='server']">
-            <xsl:attribute name="server">true</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/cpp/etc/stylesheets/prepare2.xsl b/cpp/etc/stylesheets/prepare2.xsl
deleted file mode 100644
index 1425c71195..0000000000
--- a/cpp/etc/stylesheets/prepare2.xsl
+++ /dev/null
@@ -1,74 +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.
- -
- -->
-<xsl:stylesheet version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:amqp="http://amqp.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="amqp: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="amqp: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="class" mode="prepare2">
-    <class>
-        <xsl:copy-of select="@*"/>
-        <xsl:apply-templates mode="prepare2"/>
-    </class>
-</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/cpp/etc/stylesheets/prepare3.xsl b/cpp/etc/stylesheets/prepare3.xsl
deleted file mode 100644
index e04632ae84..0000000000
--- a/cpp/etc/stylesheets/prepare3.xsl
+++ /dev/null
@@ -1,74 +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.
- -
- -->
-<xsl:stylesheet version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:amqp="http://amqp.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="class" mode="prepare3">
-    <class>
-        <xsl:copy-of select="@*"/>
-        <xsl:apply-templates mode="prepare3"/>
-    </class>
-</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:attribute name="bit-field-count"><xsl:value-of select="count(field[@type='bit'])"/></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="amqp:field-name(@name)"/></xsl:attribute>
-         <!-- add some attributes to make code generation easier -->
-         <xsl:attribute name="cpp-type"><xsl:value-of select="amqp:cpp-type(@type)"/></xsl:attribute>
-         <xsl:attribute name="cpp-arg-type"><xsl:value-of select="amqp:cpp-arg-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/cpp/etc/stylesheets/registry.xsl b/cpp/etc/stylesheets/registry.xsl
deleted file mode 100644
index 350f1ea1d6..0000000000
--- a/cpp/etc/stylesheets/registry.xsl
+++ /dev/null
@@ -1,32 +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.
- -
- -->
-<xsl:stylesheet version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:amqp="http://amqp.org"> 
-
-<xsl:import href="java.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/cpp/etc/stylesheets/utils.xsl b/cpp/etc/stylesheets/utils.xsl
deleted file mode 100644
index cbf0562686..0000000000
--- a/cpp/etc/stylesheets/utils.xsl
+++ /dev/null
@@ -1,214 +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.
- -
- -->
-<xsl:stylesheet version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:amqp="http://amqp.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="amqp:cpp-type">
-    <xsl:param name="t"/>
-    <xsl:choose>
-	 <xsl:when test="$t='octet'">u_int8_t</xsl:when> 		 		 
-	 <xsl:when test="$t='short'">u_int16_t</xsl:when> 		 		 
-	 <xsl:when test="$t='shortstr'">string</xsl:when> 		 		 
-	 <xsl:when test="$t='longstr'">string</xsl:when> 		 		 
-	 <xsl:when test="$t='bit'">bool</xsl:when> 		 		 
-	 <xsl:when test="$t='long'">u_int32_t</xsl:when> 		 		 
-	 <xsl:when test="$t='longlong'">u_int64_t</xsl:when> 		 		 
-	 <xsl:when test="$t='table'">FieldTable</xsl:when> 		 		 
-         <xsl:otherwise>Object /*WARNING: undefined type*/</xsl:otherwise>
-    </xsl:choose>
-</xsl:function>
-<xsl:function name="amqp:cpp-arg-type">
-    <xsl:param name="t"/>
-    <xsl:choose>
-	 <xsl:when test="$t='octet'">u_int8_t</xsl:when> 		 		 
-	 <xsl:when test="$t='short'">u_int16_t</xsl:when> 		 		 
-	 <xsl:when test="$t='shortstr'">const string&amp;</xsl:when> 		 		 
-	 <xsl:when test="$t='longstr'">const string&amp;</xsl:when> 		 		 
-	 <xsl:when test="$t='bit'">bool</xsl:when> 		 		 
-	 <xsl:when test="$t='long'">u_int32_t</xsl:when> 		 		 
-	 <xsl:when test="$t='longlong'">u_int64_t</xsl:when> 		 		 
-	 <xsl:when test="$t='table'">const FieldTable&amp;</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="amqp: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('1 + ', $f/@name, '.length()')"/>
-        </xsl:when> 		 		 
-	<xsl:when test="$f/@type='longstr'">
-            <xsl:value-of select="concat('4 + ', $f/@name, '.length()')"/>
-        </xsl:when> 		 		 
-	<xsl:when test="$f/@type='table'">
-            <xsl:value-of select="concat($f/@name, '.size()')"/>
-        </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="amqp:encoder">
-    <xsl:param name="f"/>
-    <xsl:choose>
-        <xsl:when test="$f/@type='octet'">
-            <xsl:value-of select="concat('buffer.putOctet(', $f/@name, ')')"/>
-        </xsl:when>
-	<xsl:when test="$f/@type='short'">
-            <xsl:value-of select="concat('buffer.putShort(', $f/@name, ')')"/>
-        </xsl:when>
-        <xsl:when test="$f/@type='long'">
-            <xsl:value-of select="concat('buffer.putLong(', $f/@name, ')')"/>
-        </xsl:when>
-        <xsl:when test="$f/@type='longlong'">
-            <xsl:value-of select="concat('buffer.putLongLong(', $f/@name, ')')"/>
-        </xsl:when>
-	<xsl:when test="$f/@type='shortstr'">
-            <xsl:value-of select="concat('buffer.putShortString(', $f/@name, ')')"/>
-        </xsl:when> 		 		 
-	<xsl:when test="$f/@type='longstr'">
-            <xsl:value-of select="concat('buffer.putLongString(', $f/@name, ')')"/>
-        </xsl:when> 		 		 
-	<xsl:when test="$f/@type='table'">
-            <xsl:value-of select="concat('buffer.putFieldTable(', $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="amqp:decoder">
-    <xsl:param name="f"/>
-    <xsl:choose>
-        <xsl:when test="$f/@type='bit'">
-            <xsl:value-of select="concat($f/@name, ' = (1 &lt;&lt; (', $f/@boolean-index, ' - 1)) &amp; flags;')"/>
-        </xsl:when>
-        <xsl:when test="$f/@type='octet'">
-            <xsl:value-of select="concat($f/@name, ' = buffer.getOctet()')"/>
-        </xsl:when>
-        <xsl:when test="$f/@type='short'">
-            <xsl:value-of select="concat($f/@name, ' = buffer.getShort()')"/>
-        </xsl:when>
-        <xsl:when test="$f/@type='long'">
-            <xsl:value-of select="concat($f/@name, ' = buffer.getLong()')"/>
-        </xsl:when>
-        <xsl:when test="$f/@type='longlong'">
-            <xsl:value-of select="concat($f/@name, ' = buffer.getLongLong()')"/>
-        </xsl:when>
-        <xsl:when test="$f/@type='shortstr'">
-            <xsl:value-of select="concat('buffer.getShortString(', $f/@name), ')'"/>
-        </xsl:when>
-        <xsl:when test="$f/@type='longstr'">
-            <xsl:value-of select="concat('buffer.getLongString(', $f/@name), ')'"/>
-        </xsl:when>
-        <xsl:when test="$f/@type='table'">
-            <xsl:value-of select="concat('buffer.getFieldTable(', $f/@name, ')')"/>
-        </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="amqp:class-name">
-    <xsl:param name="class"/>
-    <xsl:param name="method"/>
-    <xsl:value-of select="concat(amqp:upper-first($class),amqp:upper-first(amqp:field-name($method)), 'Body')"/>
-</xsl:function>
-
-<!-- create the class name for a frame, based on class and method (passed in) -->
-<xsl:function name="amqp:method-name">
-    <xsl:param name="class"/>
-    <xsl:param name="method"/>
-    <xsl:value-of select="concat(translate($class, '- ', '__'), '_', translate($method, '- ', '__'))"/>
-</xsl:function>
-
-<!-- get a valid field name, processing spaces and '-'s where appropriate -->
-<xsl:function name="amqp:field-name">
-    <xsl:param name="name"/>
-    <xsl:choose>
-        <xsl:when test="contains($name, ' ')">
-            <xsl:value-of select="concat(substring-before($name, ' '), amqp:upper-first(substring-after($name, ' ')))"/>
-        </xsl:when>
-        <xsl:when test="contains($name, '-')">
-            <xsl:value-of select="concat(substring-before($name, '-'), amqp:upper-first(substring-after($name, '-')))"/>
-        </xsl:when>
-        <xsl:otherwise>
-            <xsl:value-of select="$name"/>
-        </xsl:otherwise>
-    </xsl:choose>
-</xsl:function>
-
-<!-- convert the first character of the input to upper-case -->
-<xsl:function name="amqp:upper-first">
-    <xsl:param name="in"/>
-    <xsl:value-of select="concat(upper-case(substring($in, 1, 1)), substring($in, 2))"/>
-</xsl:function>
-
-
-<xsl:function name="amqp:keyword-check">
-    <xsl:param name="in"/>
-    <xsl:choose>
-        <xsl:when test="contains($in, 'delete')">
-            <xsl:value-of select="concat($in, '_')"/>
-        </xsl:when>
-        <xsl:when test="contains($in, 'string')">
-            <xsl:value-of select="concat($in, '_')"/>
-        </xsl:when>
-        <xsl:when test="contains($in, 'return')">
-            <xsl:value-of select="concat($in, '_')"/>
-        </xsl:when>
-        <xsl:otherwise>
-            <xsl:value-of select="$in"/>
-        </xsl:otherwise>
-    </xsl:choose>
-</xsl:function>
-
-</xsl:stylesheet>
diff --git a/cpp/gen/Makefile.am b/cpp/gen/Makefile.am
new file mode 100644
index 0000000000..eea08c9570
--- /dev/null
+++ b/cpp/gen/Makefile.am
@@ -0,0 +1,45 @@
+include gen-src.mk
+
+BUILT_SOURCES = $(generated_sources)
+
+# Distribute the generated sources, at least for now, since
+# the generator code is in java.
+EXTRA_DIST = $(BUILT_SOURCES)
+MAINTAINERCLEANFILES = $(BUILT_SOURCES)
+
+gentools_dir = $(srcdir)/../../gentools
+spec_dir = $(srcdir)/../../specs
+spec = $(spec_dir)/amqp-8.0.xml
+gentools_srcdir = $(gentools_dir)/src/org/apache/qpid/gentools
+
+timestamp: $(spec) $(java_sources) $(cxx_templates)
+if BUILD_IN_MESSAGE_TREE
+	rm -f $(generated_sources)
+	cd $(gentools_srcdir) && rm -f *.class && $(JAVAC) *.java
+	$(JAVA) -cp $(gentools_dir)/src org.apache.qpid.gentools.Main \
+	        -c -o . -t $(gentools_dir)/templ.cpp $(spec)
+else
+	echo "warning: failed to regenerate gen/*.{cpp,h}" 1>&2
+endif
+	touch timestamp
+
+EXTRA_DIST += timestamp
+$(generated_sources): timestamp
+
+DISTCLEANFILES = gen-src.mk
+gen-src.mk: timestamp
+	( echo 'generated_sources = '\\					\
+	  && ls *.cpp *.h | sort -u | sed 's/.*/  & \\/;$$s/ \\//'	\
+	) > $@-t
+if BUILD_IN_MESSAGE_TREE
+	( echo if BUILD_IN_MESSAGE_TREE;				\
+	  echo 'java_sources = '\\					\
+	    && find $(gentools_srcdir) -name '*.java'			\
+		| sort -u | sed 's/.*/  & \\/;$$s/ \\//';		\
+	  echo 'cxx_templates = '\\					\
+	    && find $(gentools_dir)/templ.cpp -name '*.tmpl'		\
+		| sort -u | sed 's/.*/  & \\/;$$s/ \\//';		\
+	  echo endif							\
+	) >> $@-t
+endif
+	mv $@-t $@
diff --git a/cpp/lib/Makefile.am b/cpp/lib/Makefile.am
new file mode 100644
index 0000000000..377cd4ede4
--- /dev/null
+++ b/cpp/lib/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = client common broker
diff --git a/cpp/src/qpid/broker/AccumulatedAck.cpp b/cpp/lib/broker/AccumulatedAck.cpp
index a492e91f95..a9826ba5ea 100644
--- a/cpp/src/qpid/broker/AccumulatedAck.cpp
+++ b/cpp/lib/broker/AccumulatedAck.cpp
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-#include <qpid/broker/AccumulatedAck.h>
+#include <AccumulatedAck.h>
 
 using std::less_equal;
 using std::bind2nd;
diff --git a/cpp/src/qpid/broker/AccumulatedAck.h b/cpp/lib/broker/AccumulatedAck.h
index 055c8ea3e0..055c8ea3e0 100644
--- a/cpp/src/qpid/broker/AccumulatedAck.h
+++ b/cpp/lib/broker/AccumulatedAck.h
diff --git a/cpp/src/qpid/broker/AutoDelete.cpp b/cpp/lib/broker/AutoDelete.cpp
index 6c7ad432db..ae48d10505 100644
--- a/cpp/src/qpid/broker/AutoDelete.cpp
+++ b/cpp/lib/broker/AutoDelete.cpp
@@ -18,8 +18,8 @@
  * under the License.
  *
  */
-#include <qpid/broker/AutoDelete.h>
-#include <qpid/sys/Time.h>
+#include <AutoDelete.h>
+#include <sys/Time.h>
 
 using namespace qpid::broker;
 using namespace qpid::sys;
@@ -63,7 +63,7 @@ void AutoDelete::run(){
     Monitor::ScopedLock l(monitor);
     while(!stopped){
         process();
-        monitor.wait(period * Time::NSEC_PER_MSEC);
+        monitor.wait(period*TIME_MSEC);
     }
 }
 
diff --git a/cpp/src/qpid/broker/AutoDelete.h b/cpp/lib/broker/AutoDelete.h
index b706246900..19a5938df1 100644
--- a/cpp/src/qpid/broker/AutoDelete.h
+++ b/cpp/lib/broker/AutoDelete.h
@@ -1,3 +1,5 @@
+#ifndef _AutoDelete_
+#define _AutoDelete_
 /*
  *
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -18,15 +20,12 @@
  * under the License.
  *
  */
-#ifndef _AutoDelete_
-#define _AutoDelete_
-
 #include <iostream>
 #include <queue>
-#include <qpid/sys/Monitor.h>
-#include <qpid/broker/Queue.h>
-#include <qpid/broker/QueueRegistry.h>
-#include <qpid/sys/Thread.h>
+#include <sys/Monitor.h>
+#include <BrokerQueue.h>
+#include <QueueRegistry.h>
+#include <sys/Thread.h>
 
 namespace qpid {
     namespace broker{
diff --git a/cpp/src/qpid/broker/Binding.h b/cpp/lib/broker/Binding.h
index 99aa8ca8eb..16ca223208 100644
--- a/cpp/src/qpid/broker/Binding.h
+++ b/cpp/lib/broker/Binding.h
@@ -21,7 +21,7 @@
 #ifndef _Binding_
 #define _Binding_
 
-#include <qpid/framing/FieldTable.h>
+#include <FieldTable.h>
 
 namespace qpid {
     namespace broker {
diff --git a/cpp/src/qpid/broker/Broker.cpp b/cpp/lib/broker/Broker.cpp
index 4750dea591..6c0d7a3f3f 100644
--- a/cpp/src/qpid/broker/Broker.cpp
+++ b/cpp/lib/broker/Broker.cpp
@@ -20,7 +20,7 @@
  */
 #include <iostream>
 #include <memory>
-#include <qpid/broker/Broker.h>
+#include <Broker.h>
 
 
 using namespace qpid::broker;
diff --git a/cpp/src/qpid/broker/Broker.h b/cpp/lib/broker/Broker.h
index 2ce04afdd8..8ea1a57c27 100644
--- a/cpp/src/qpid/broker/Broker.h
+++ b/cpp/lib/broker/Broker.h
@@ -22,11 +22,11 @@
  *
  */
 
-#include <qpid/broker/Configuration.h>
-#include <qpid/broker/SessionHandlerFactoryImpl.h>
-#include <qpid/sys/Runnable.h>
-#include <qpid/sys/Acceptor.h>
-#include <qpid/SharedObject.h>
+#include <Configuration.h>
+#include <SessionHandlerFactoryImpl.h>
+#include <sys/Runnable.h>
+#include <sys/Acceptor.h>
+#include <SharedObject.h>
 
 namespace qpid {
 namespace broker {
diff --git a/cpp/src/qpid/broker/Channel.cpp b/cpp/lib/broker/BrokerChannel.cpp
index 8b26099f1f..42e45dd291 100644
--- a/cpp/src/qpid/broker/Channel.cpp
+++ b/cpp/lib/broker/BrokerChannel.cpp
@@ -18,8 +18,8 @@
  * under the License.
  *
  */
-#include <qpid/broker/Channel.h>
-#include <qpid/QpidError.h>
+#include <BrokerChannel.h>
+#include <QpidError.h>
 #include <iostream>
 #include <sstream>
 #include <assert.h>
diff --git a/cpp/src/qpid/broker/Channel.h b/cpp/lib/broker/BrokerChannel.h
index 42f65f2c7c..804d6866b1 100644
--- a/cpp/src/qpid/broker/Channel.h
+++ b/cpp/lib/broker/BrokerChannel.h
@@ -25,26 +25,26 @@
 #include <functional>
 #include <list>
 #include <map>
-#include <qpid/broker/AccumulatedAck.h>
-#include <qpid/broker/Binding.h>
-#include <qpid/broker/Consumer.h>
-#include <qpid/broker/DeletingTxOp.h>
-#include <qpid/broker/DeliverableMessage.h>
-#include <qpid/broker/DeliveryRecord.h>
-#include <qpid/broker/Message.h>
-#include <qpid/broker/MessageBuilder.h>
-#include <qpid/broker/NameGenerator.h>
-#include <qpid/broker/Prefetch.h>
-#include <qpid/broker/Queue.h>
-#include <qpid/broker/TransactionalStore.h>
-#include <qpid/broker/TxAck.h>
-#include <qpid/broker/TxBuffer.h>
-#include <qpid/broker/TxPublish.h>
-#include <qpid/sys/Monitor.h>
-#include <qpid/framing/OutputHandler.h>
-#include <qpid/framing/AMQContentBody.h>
-#include <qpid/framing/AMQHeaderBody.h>
-#include <qpid/framing/BasicPublishBody.h>
+#include <AccumulatedAck.h>
+#include <Binding.h>
+#include <Consumer.h>
+#include <DeletingTxOp.h>
+#include <DeliverableMessage.h>
+#include <DeliveryRecord.h>
+#include <BrokerMessage.h>
+#include <MessageBuilder.h>
+#include <NameGenerator.h>
+#include <Prefetch.h>
+#include <BrokerQueue.h>
+#include <TransactionalStore.h>
+#include <TxAck.h>
+#include <TxBuffer.h>
+#include <TxPublish.h>
+#include <sys/Monitor.h>
+#include <OutputHandler.h>
+#include <AMQContentBody.h>
+#include <AMQHeaderBody.h>
+#include <BasicPublishBody.h>
 
 namespace qpid {
     namespace broker {
diff --git a/cpp/src/qpid/broker/Exchange.h b/cpp/lib/broker/BrokerExchange.h
index d66c4a9e0d..f5e4d9cb28 100644
--- a/cpp/src/qpid/broker/Exchange.h
+++ b/cpp/lib/broker/BrokerExchange.h
@@ -22,9 +22,9 @@
 #define _Exchange_
 
 #include <boost/shared_ptr.hpp>
-#include <qpid/broker/Deliverable.h>
-#include <qpid/broker/Queue.h>
-#include <qpid/framing/FieldTable.h>
+#include <Deliverable.h>
+#include <BrokerQueue.h>
+#include <FieldTable.h>
 
 namespace qpid {
     namespace broker {
diff --git a/cpp/src/qpid/broker/Message.cpp b/cpp/lib/broker/BrokerMessage.cpp
index 64e66c4a30..d30cd12bc3 100644
--- a/cpp/src/qpid/broker/Message.cpp
+++ b/cpp/lib/broker/BrokerMessage.cpp
@@ -18,20 +18,21 @@
  * under the License.
  *
  */
-#include <qpid/broker/Message.h>
+#include <BrokerMessage.h>
 #include <iostream>
 
-#include <qpid/broker/InMemoryContent.h>
-#include <qpid/broker/LazyLoadedContent.h>
-#include <qpid/broker/MessageStore.h>
+#include <InMemoryContent.h>
+#include <LazyLoadedContent.h>
+#include <MessageStore.h>
 // AMQP version change - kpvdr 2006-11-17
-#include <qpid/framing/ProtocolVersion.h>
-#include <qpid/framing/BasicDeliverBody.h>
-#include <qpid/framing/BasicGetOkBody.h>
+#include <ProtocolVersion.h>
+#include <BasicDeliverBody.h>
+#include <BasicGetOkBody.h>
 
 using namespace boost;
 using namespace qpid::broker;
 using namespace qpid::framing;
+using namespace qpid::sys;
 
 Message::Message(const ConnectionToken* const _publisher, 
                  const string& _exchange, const string& _routingKey, 
@@ -100,6 +101,7 @@ void Message::sendContent(OutputHandler* out, int channel, u_int32_t framesize){
     AMQBody::shared_ptr headerBody = static_pointer_cast<AMQBody, AMQHeaderBody>(header);
     out->send(new AMQFrame(channel, headerBody));
 
+    Mutex::ScopedLock locker(contentLock);
     if (content.get()) content->send(out, channel, framesize);
 }
 
@@ -140,6 +142,7 @@ void Message::decodeContent(Buffer& buffer, u_int32_t chunkSize)
     u_int64_t expected = expectedContentSize();
     if (expected != buffer.available()) {
         std::cout << "WARN: Expected " << expectedContentSize() << " bytes, got " << buffer.available() << std::endl;
+        throw Exception("Cannot decode content, buffer not large enough.");
     }
 
     if (!chunkSize || chunkSize > expected) {
@@ -172,6 +175,7 @@ void Message::encodeHeader(Buffer& buffer)
 
 void Message::encodeContent(Buffer& buffer)
 {
+    Mutex::ScopedLock locker(contentLock);
     if (content.get()) content->encode(buffer);
 }
 
@@ -182,6 +186,7 @@ u_int32_t Message::encodedSize()
 
 u_int32_t Message::encodedContentSize()
 {
+    Mutex::ScopedLock locker(contentLock);
     return content.get() ? content->size() : 0;
 }
 
@@ -199,13 +204,19 @@ u_int64_t Message::expectedContentSize()
 
 void Message::releaseContent(MessageStore* store)
 {
+    Mutex::ScopedLock locker(contentLock);
     if (!content.get() || content->size() > 0) {
         //set content to lazy loading mode (but only if there is stored content):
-        content = std::auto_ptr<Content>(new LazyLoadedContent(store, getPersistenceId(), expectedContentSize()));
+
+        //Note: the LazyLoadedContent instance contains a raw pointer to the message, however it is
+        //      then set as a member of that message so its lifetime is guaranteed to be no longer than
+        //      that of the message itself
+        content = std::auto_ptr<Content>(new LazyLoadedContent(store, this, expectedContentSize()));
     }
 }
 
 void Message::setContent(std::auto_ptr<Content>& _content)
 {
+    Mutex::ScopedLock locker(contentLock);
     content = _content;
 }
diff --git a/cpp/src/qpid/broker/Message.h b/cpp/lib/broker/BrokerMessage.h
index eec929c742..3bf70551d3 100644
--- a/cpp/src/qpid/broker/Message.h
+++ b/cpp/lib/broker/BrokerMessage.h
@@ -23,13 +23,14 @@
 
 #include <memory>
 #include <boost/shared_ptr.hpp>
-#include <qpid/broker/ConnectionToken.h>
-#include <qpid/broker/Content.h>
-#include <qpid/broker/TxBuffer.h>
-#include <qpid/framing/AMQContentBody.h>
-#include <qpid/framing/AMQHeaderBody.h>
-#include <qpid/framing/BasicHeaderProperties.h>
-#include <qpid/framing/OutputHandler.h>
+#include <AMQContentBody.h>
+#include <AMQHeaderBody.h>
+#include <BasicHeaderProperties.h>
+#include <ConnectionToken.h>
+#include <Content.h>
+#include <OutputHandler.h>
+#include <Mutex.h>
+#include <TxBuffer.h>
 
 namespace qpid {
     namespace broker {
@@ -52,6 +53,7 @@ namespace qpid {
             std::auto_ptr<Content> content;
             u_int64_t size;
             u_int64_t persistenceId;
+            qpid::sys::Mutex contentLock;
 
             void sendContent(qpid::framing::OutputHandler* out, 
                              int channel, u_int32_t framesize);
diff --git a/cpp/src/qpid/broker/Queue.cpp b/cpp/lib/broker/BrokerQueue.cpp
index 1150d055cb..b0e1f20b01 100644
--- a/cpp/src/qpid/broker/Queue.cpp
+++ b/cpp/lib/broker/BrokerQueue.cpp
@@ -18,14 +18,15 @@
  * under the License.
  *
  */
-#include <qpid/broker/Queue.h>
-#include <qpid/broker/MessageStore.h>
-#include <qpid/sys/Monitor.h>
-#include <qpid/sys/Time.h>
+#include <BrokerQueue.h>
+#include <MessageStore.h>
+#include <sys/Monitor.h>
+#include <sys/Time.h>
 #include <iostream>
 
 using namespace qpid::broker;
 using namespace qpid::sys;
+using namespace qpid::framing;
 
 Queue::Queue(const string& _name, u_int32_t _autodelete, 
              MessageStore* const _store,
@@ -42,7 +43,7 @@ Queue::Queue(const string& _name, u_int32_t _autodelete,
     exclusive(0),
     persistenceId(0)
 {
-    if(autodelete) lastUsed = Time::now().msecs();
+    if(autodelete) lastUsed = now()/TIME_MSEC;
 }
 
 Queue::~Queue(){
@@ -62,15 +63,16 @@ void Queue::deliver(Message::shared_ptr& msg){
 }
 
 void Queue::recover(Message::shared_ptr& msg){
-    queueing = true;
-    messages.push(msg);
+    push(msg);
+    if (store && msg->expectedContentSize() != msg->encodedContentSize()) {
+        msg->releaseContent(store);
+    }
 }
 
 void Queue::process(Message::shared_ptr& msg){
     Mutex::ScopedLock locker(lock);
     if(queueing || !dispatch(msg)){
-        queueing = true;
-        messages.push(msg);
+        push(msg);
     }
 }
 
@@ -113,7 +115,7 @@ void Queue::dispatch(){
     while(proceed){
         Mutex::ScopedLock locker(lock);
         if(!messages.empty() && dispatch(messages.front())){
-            messages.pop();
+            pop();
         }else{
             dispatching = false;
             proceed = false;
@@ -137,7 +139,7 @@ void Queue::consume(Consumer* c, bool requestExclusive){
 void Queue::cancel(Consumer* c){
     Mutex::ScopedLock locker(lock);
     consumers.erase(find(consumers.begin(), consumers.end(), c));
-    if(autodelete && consumers.empty()) lastUsed = Time::now().msecs();
+    if(autodelete && consumers.empty()) lastUsed = now()*TIME_MSEC;
     if(exclusive == c) exclusive = 0;
 }
 
@@ -146,7 +148,7 @@ Message::shared_ptr Queue::dequeue(){
     Message::shared_ptr msg;
     if(!messages.empty()){
         msg = messages.front();
-        messages.pop();
+        pop();
     }
     return msg;
 }
@@ -154,10 +156,21 @@ Message::shared_ptr Queue::dequeue(){
 u_int32_t Queue::purge(){
     Mutex::ScopedLock locker(lock);
     int count = messages.size();
-    while(!messages.empty()) messages.pop();
+    while(!messages.empty()) pop();
     return count;
 }
 
+void Queue::pop(){
+    if (policy.get()) policy->dequeued(messages.front(), store);
+    messages.pop();    
+}
+
+void Queue::push(Message::shared_ptr& msg){
+    queueing = true;
+    messages.push(msg);
+    if (policy.get()) policy->enqueued(messages.front(), store);
+}
+
 u_int32_t Queue::getMessageCount() const{
     Mutex::ScopedLock locker(lock);
     return messages.size();
@@ -170,7 +183,7 @@ u_int32_t Queue::getConsumerCount() const{
 
 bool Queue::canAutoDelete() const{
     Mutex::ScopedLock locker(lock);
-    return lastUsed && (Time::now().msecs() - lastUsed > autodelete);
+    return lastUsed && (now()*TIME_MSEC - lastUsed > autodelete);
 }
 
 void Queue::enqueue(TransactionContext* ctxt, Message::shared_ptr& msg, const string * const xid)
@@ -187,10 +200,25 @@ void Queue::dequeue(TransactionContext* ctxt, Message::shared_ptr& msg, const st
     }
 }
 
-void Queue::create()
+namespace 
+{
+    const std::string qpidMaxSize("qpid.max_size");
+    const std::string qpidMaxCount("qpid.max_count");
+}
+
+void Queue::create(const FieldTable& settings)
 {
     if (store) {
-        store->create(*this);
+        store->create(*this, settings);
+    }
+    configure(settings);
+}
+
+void Queue::configure(const FieldTable& settings)
+{
+    QueuePolicy* _policy = new QueuePolicy(settings);
+    if (_policy->getMaxCount() || _policy->getMaxSize()) {
+        setPolicy(std::auto_ptr<QueuePolicy>(_policy));
     }
 }
 
@@ -200,3 +228,13 @@ void Queue::destroy()
         store->destroy(*this);
     }
 }
+
+void Queue::setPolicy(std::auto_ptr<QueuePolicy> _policy)
+{
+    policy = _policy;
+}
+
+const QueuePolicy* const Queue::getPolicy()
+{
+    return policy.get();
+}
diff --git a/cpp/src/qpid/broker/Queue.h b/cpp/lib/broker/BrokerQueue.h
index 0c67540dac..41611bebe9 100644
--- a/cpp/src/qpid/broker/Queue.h
+++ b/cpp/lib/broker/BrokerQueue.h
@@ -22,14 +22,17 @@
 #define _Queue_
 
 #include <vector>
+#include <memory>
 #include <queue>
 #include <boost/shared_ptr.hpp>
-#include <qpid/framing/amqp_types.h>
-#include <qpid/broker/Binding.h>
-#include <qpid/broker/ConnectionToken.h>
-#include <qpid/broker/Consumer.h>
-#include <qpid/broker/Message.h>
-#include <qpid/sys/Monitor.h>
+#include <amqp_types.h>
+#include <Binding.h>
+#include <ConnectionToken.h>
+#include <Consumer.h>
+#include <BrokerMessage.h>
+#include <FieldTable.h>
+#include <sys/Monitor.h>
+#include <QueuePolicy.h>
 
 namespace qpid {
     namespace broker {
@@ -41,6 +44,7 @@ namespace qpid {
         struct ExclusiveAccessException{};
 
         using std::string;
+
         /**
          * The brokers representation of an amqp queue. Messages are
          * delivered to a queue from where they can be dispatched to
@@ -62,9 +66,13 @@ namespace qpid {
             int64_t lastUsed;
             Consumer* exclusive;
             mutable u_int64_t persistenceId;
+            std::auto_ptr<QueuePolicy> policy;            
 
+            void pop();
+            void push(Message::shared_ptr& msg);
             bool startDispatching();
             bool dispatch(Message::shared_ptr& msg);
+            void setPolicy(std::auto_ptr<QueuePolicy> policy);
 
         public:
             
@@ -77,7 +85,8 @@ namespace qpid {
                   const ConnectionToken* const owner = 0);
             ~Queue();
 
-            void create();
+            void create(const qpid::framing::FieldTable& settings);
+            void configure(const qpid::framing::FieldTable& settings);
             void destroy();
             /**
              * Informs the queue of a binding that should be cancelled on
@@ -127,6 +136,8 @@ namespace qpid {
              * dequeues from memory only
              */
             Message::shared_ptr dequeue();
+
+            const QueuePolicy* const getPolicy();
         };
     }
 }
diff --git a/cpp/src/qpid/broker/Configuration.cpp b/cpp/lib/broker/Configuration.cpp
index 39f5c23ee6..ccc5de7fa9 100644
--- a/cpp/src/qpid/broker/Configuration.cpp
+++ b/cpp/lib/broker/Configuration.cpp
@@ -7,9 +7,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -18,20 +18,22 @@
  * under the License.
  *
  */
-#include <qpid/broker/Configuration.h>
+#include <Configuration.h>
 #include <string.h>
+#include <config.h>
 
 using namespace qpid::broker;
 using namespace std;
 
-Configuration::Configuration() : 
+Configuration::Configuration() :
     trace('t', "trace", "Print incoming & outgoing frames to the console (default=false)", false),
-    port('p', "port", "Sets the port to listen on (default=5672)", 5672),
-    workerThreads("worker-threads", "Sets the number of worker threads to use (default=5).", 5),
-    maxConnections("max-connections", "Sets the maximum number of connections the broker can accept (default=500).", 500),
-    connectionBacklog("connection-backlog", "Sets the connection backlog for the servers socket (default=10)", 10),
-    store('s', "store", "Sets the message store module to use (default='' which implies no store)", ""),
-    help("help", "Prints usage information", false)
+    port('p', "port", "Set the port to listen on (default=5672)", 5672),
+    workerThreads("worker-threads", "Set the number of worker threads to use (default=5).", 5),
+    maxConnections("max-connections", "Set the maximum number of connections the broker can accept (default=500).", 500),
+    connectionBacklog("connection-backlog", "Set the connection backlog for the servers socket (default=10)", 10),
+    store('s', "store", "Set the message store module to use (default='' which implies no store)", ""),
+    help("help", "Print usage information", false),
+    version("version", "Print version information", false)
 {
     options.push_back(&trace);
     options.push_back(&port);
@@ -40,11 +42,13 @@ Configuration::Configuration() :
     options.push_back(&connectionBacklog);
     options.push_back(&store);
     options.push_back(&help);
+    options.push_back(&version);
 }
 
 Configuration::~Configuration(){}
 
-void Configuration::parse(int argc, char** argv){
+void Configuration::parse(char const *progName, int argc, char** argv){
+    programName = progName;
     int position = 1;
     while(position < argc){
         bool matched(false);
@@ -52,22 +56,32 @@ void Configuration::parse(int argc, char** argv){
             matched = (*i)->parse(position, argv, argc);
         }
         if(!matched){
-            std::cout << "Warning: skipping unrecognised option " << argv[position] << std::endl;
+            std::cerr<< "Warning: skipping unrecognised option " << argv[position] << std::endl;
             position++;
         }
     }
 }
 
 void Configuration::usage(){
+    std::cout << "Usage: " << programName << " [OPTION]..." << std::endl
+	      << "Start the Qpid broker daemon." << std::endl << std::endl
+	      << "Options:" << std::endl;
     for(op_iterator i = options.begin(); i < options.end(); i++){
         (*i)->print(std::cout);
     }
+
+    std::cout << std::endl << "Report bugs to <" << PACKAGE_BUGREPORT << ">."
+	      << std::endl;
 }
 
 bool Configuration::isHelp() const {
     return help.getValue();
 }
 
+bool Configuration::isVersion() const {
+    return version.getValue();
+}
+
 bool Configuration::isTrace() const {
     return trace.getValue();
 }
@@ -92,10 +106,10 @@ const std::string& Configuration::getStore() const {
     return store.getValue();
 }
 
-Configuration::Option::Option(const char _flag, const string& _name, const string& _desc) : 
+Configuration::Option::Option(const char _flag, const string& _name, const string& _desc) :
     flag(string("-") + _flag), name("--" +_name), desc(_desc) {}
 
-Configuration::Option::Option(const string& _name, const string& _desc) : 
+Configuration::Option::Option(const string& _name, const string& _desc) :
     flag(""), name("--" + _name), desc(_desc) {}
 
 Configuration::Option::~Option(){}
@@ -121,12 +135,14 @@ bool Configuration::Option::parse(int& i, char** argv, int argc){
 }
 
 void Configuration::Option::print(ostream& out) const {
-    out << "    ";
+    out << "  ";
     if(flag.length() > 0){
-        out << flag << " or ";
+        out << flag << ", ";
+    } else {
+        out << "    ";
     }
     out << name;
-    if(needsValue()) out << "<value>";
+    if(needsValue()) out << " <value>";
     out << std::endl;
     out << "            " << desc << std::endl;
 }
@@ -134,10 +150,10 @@ void Configuration::Option::print(ostream& out) const {
 
 // String Option:
 
-Configuration::StringOption::StringOption(const char _flag, const string& _name, const string& _desc, const string _value) : 
+Configuration::StringOption::StringOption(const char _flag, const string& _name, const string& _desc, const string _value) :
     Option(_flag,_name,_desc), defaultValue(_value), value(_value) {}
 
-Configuration::StringOption::StringOption(const string& _name, const string& _desc, const string _value) : 
+Configuration::StringOption::StringOption(const string& _name, const string& _desc, const string _value) :
     Option(_name,_desc), defaultValue(_value), value(_value) {}
 
 Configuration::StringOption::~StringOption(){}
@@ -156,10 +172,10 @@ void Configuration::StringOption::setValue(const std::string& _value){
 
 // Int Option:
 
-Configuration::IntOption::IntOption(const char _flag, const string& _name, const string& _desc, const int _value) : 
+Configuration::IntOption::IntOption(const char _flag, const string& _name, const string& _desc, const int _value) :
     Option(_flag,_name,_desc), defaultValue(_value), value(_value) {}
 
-Configuration::IntOption::IntOption(const string& _name, const string& _desc, const int _value) : 
+Configuration::IntOption::IntOption(const string& _name, const string& _desc, const int _value) :
     Option(_name,_desc), defaultValue(_value), value(_value) {}
 
 Configuration::IntOption::~IntOption(){}
@@ -178,10 +194,10 @@ void Configuration::IntOption::setValue(const std::string& _value){
 
 // Bool Option:
 
-Configuration::BoolOption::BoolOption(const char _flag, const string& _name, const string& _desc, const bool _value) : 
+Configuration::BoolOption::BoolOption(const char _flag, const string& _name, const string& _desc, const bool _value) :
     Option(_flag,_name,_desc), defaultValue(_value), value(_value) {}
 
-Configuration::BoolOption::BoolOption(const string& _name, const string& _desc, const bool _value) : 
+Configuration::BoolOption::BoolOption(const string& _name, const string& _desc, const bool _value) :
     Option(_name,_desc), defaultValue(_value), value(_value) {}
 
 Configuration::BoolOption::~BoolOption(){}
diff --git a/cpp/src/qpid/broker/Configuration.h b/cpp/lib/broker/Configuration.h
index 1a081764bf..3f2ffd1662 100644
--- a/cpp/src/qpid/broker/Configuration.h
+++ b/cpp/lib/broker/Configuration.h
@@ -24,7 +24,7 @@
 #include <cstdlib>
 #include <iostream>
 #include <vector>
-#include <qpid/Exception.h>
+#include <Exception.h>
 
 namespace qpid {
     namespace broker {
@@ -97,6 +97,8 @@ namespace qpid {
             IntOption connectionBacklog;
             StringOption store;
             BoolOption help;
+            BoolOption version;
+            char const *programName;
 
             typedef std::vector<Option*>::iterator op_iterator;
             std::vector<Option*> options;
@@ -111,9 +113,10 @@ namespace qpid {
             Configuration();
             ~Configuration();
 
-            void parse(int argc, char** argv);
+            void parse(char const*, int argc, char** argv);
 
             bool isHelp() const;
+            bool isVersion() const;
             bool isTrace() const;
             int getPort() const;
             int getWorkerThreads() const;
@@ -122,6 +125,7 @@ namespace qpid {
             const std::string& getStore() const;
 
             void setHelp(bool b) { help.setValue(b); }
+            void setVersion(bool b) { version.setValue(b); }
             void setTrace(bool b) { trace.setValue(b); }
             void setPort(int i) { port.setValue(i); }
             void setWorkerThreads(int i) { workerThreads.setValue(i); }
diff --git a/cpp/src/qpid/broker/ConnectionToken.h b/cpp/lib/broker/ConnectionToken.h
index 7e7f813d0e..7e7f813d0e 100644
--- a/cpp/src/qpid/broker/ConnectionToken.h
+++ b/cpp/lib/broker/ConnectionToken.h
diff --git a/cpp/src/qpid/broker/Consumer.h b/cpp/lib/broker/Consumer.h
index c0717c7f82..26deef4a26 100644
--- a/cpp/src/qpid/broker/Consumer.h
+++ b/cpp/lib/broker/Consumer.h
@@ -21,7 +21,7 @@
 #ifndef _Consumer_
 #define _Consumer_
 
-#include <qpid/broker/Message.h>
+#include <BrokerMessage.h>
 
 namespace qpid {
     namespace broker {
diff --git a/cpp/src/qpid/broker/Content.h b/cpp/lib/broker/Content.h
index 917222fb5a..ed425c6735 100644
--- a/cpp/src/qpid/broker/Content.h
+++ b/cpp/lib/broker/Content.h
@@ -21,9 +21,9 @@
 #ifndef _Content_
 #define _Content_
 
-#include <qpid/framing/AMQContentBody.h>
-#include <qpid/framing/Buffer.h>
-#include <qpid/framing/OutputHandler.h>
+#include <AMQContentBody.h>
+#include <Buffer.h>
+#include <OutputHandler.h>
 
 namespace qpid {
     namespace broker {
diff --git a/cpp/src/qpid/broker/DeletingTxOp.cpp b/cpp/lib/broker/DeletingTxOp.cpp
index 1532bfa125..25fe9c98db 100644
--- a/cpp/src/qpid/broker/DeletingTxOp.cpp
+++ b/cpp/lib/broker/DeletingTxOp.cpp
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-#include <qpid/broker/DeletingTxOp.h>
+#include <DeletingTxOp.h>
 
 using namespace qpid::broker;
 
diff --git a/cpp/src/qpid/broker/DeletingTxOp.h b/cpp/lib/broker/DeletingTxOp.h
index f616fa8dab..3e026cd4ca 100644
--- a/cpp/src/qpid/broker/DeletingTxOp.h
+++ b/cpp/lib/broker/DeletingTxOp.h
@@ -21,7 +21,7 @@
 #ifndef _DeletingTxOp_
 #define _DeletingTxOp_
 
-#include <qpid/broker/TxOp.h>
+#include <TxOp.h>
 
 namespace qpid {
     namespace broker {
diff --git a/cpp/src/qpid/broker/Deliverable.h b/cpp/lib/broker/Deliverable.h
index 2d3defd376..e33443555d 100644
--- a/cpp/src/qpid/broker/Deliverable.h
+++ b/cpp/lib/broker/Deliverable.h
@@ -21,7 +21,7 @@
 #ifndef _Deliverable_
 #define _Deliverable_
 
-#include <qpid/broker/Queue.h>
+#include <BrokerQueue.h>
 
 namespace qpid {
     namespace broker {
diff --git a/cpp/src/qpid/broker/DeliverableMessage.cpp b/cpp/lib/broker/DeliverableMessage.cpp
index d90931398b..b9c89da690 100644
--- a/cpp/src/qpid/broker/DeliverableMessage.cpp
+++ b/cpp/lib/broker/DeliverableMessage.cpp
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-#include <qpid/broker/DeliverableMessage.h>
+#include <DeliverableMessage.h>
 
 using namespace qpid::broker;
 
diff --git a/cpp/src/qpid/broker/DeliverableMessage.h b/cpp/lib/broker/DeliverableMessage.h
index 76582a2bd9..962f0da640 100644
--- a/cpp/src/qpid/broker/DeliverableMessage.h
+++ b/cpp/lib/broker/DeliverableMessage.h
@@ -21,9 +21,9 @@
 #ifndef _DeliverableMessage_
 #define _DeliverableMessage_
 
-#include <qpid/broker/Deliverable.h>
-#include <qpid/broker/Message.h>
-#include <qpid/broker/Queue.h>
+#include <Deliverable.h>
+#include <BrokerMessage.h>
+#include <BrokerQueue.h>
 
 namespace qpid {
     namespace broker {
diff --git a/cpp/src/qpid/broker/DeliveryRecord.cpp b/cpp/lib/broker/DeliveryRecord.cpp
index 0e4e8c4336..9d02cb615e 100644
--- a/cpp/src/qpid/broker/DeliveryRecord.cpp
+++ b/cpp/lib/broker/DeliveryRecord.cpp
@@ -18,8 +18,8 @@
  * under the License.
  *
  */
-#include <qpid/broker/DeliveryRecord.h>
-#include <qpid/broker/Channel.h>
+#include <DeliveryRecord.h>
+#include <BrokerChannel.h>
 
 using namespace qpid::broker;
 using std::string;
diff --git a/cpp/src/qpid/broker/DeliveryRecord.h b/cpp/lib/broker/DeliveryRecord.h
index 4c4e4f0224..c1c8d6d13c 100644
--- a/cpp/src/qpid/broker/DeliveryRecord.h
+++ b/cpp/lib/broker/DeliveryRecord.h
@@ -23,10 +23,10 @@
 
 #include <algorithm>
 #include <list>
-#include <qpid/broker/AccumulatedAck.h>
-#include <qpid/broker/Message.h>
-#include <qpid/broker/Prefetch.h>
-#include <qpid/broker/Queue.h>
+#include <AccumulatedAck.h>
+#include <BrokerMessage.h>
+#include <Prefetch.h>
+#include <BrokerQueue.h>
 
 namespace qpid {
     namespace broker {
diff --git a/cpp/src/qpid/broker/DirectExchange.cpp b/cpp/lib/broker/DirectExchange.cpp
index 2713fb9482..c898ae8d7e 100644
--- a/cpp/src/qpid/broker/DirectExchange.cpp
+++ b/cpp/lib/broker/DirectExchange.cpp
@@ -18,8 +18,8 @@
  * under the License.
  *
  */
-#include <qpid/broker/DirectExchange.h>
-#include <qpid/broker/ExchangeBinding.h>
+#include <DirectExchange.h>
+#include <ExchangeBinding.h>
 #include <iostream>
 
 using namespace qpid::broker;
diff --git a/cpp/src/qpid/broker/DirectExchange.h b/cpp/lib/broker/DirectExchange.h
index 09909a8383..a7ef5aca9e 100644
--- a/cpp/src/qpid/broker/DirectExchange.h
+++ b/cpp/lib/broker/DirectExchange.h
@@ -23,11 +23,11 @@
 
 #include <map>
 #include <vector>
-#include <qpid/broker/Exchange.h>
-#include <qpid/framing/FieldTable.h>
-#include <qpid/broker/Message.h>
-#include <qpid/sys/Monitor.h>
-#include <qpid/broker/Queue.h>
+#include <BrokerExchange.h>
+#include <FieldTable.h>
+#include <BrokerMessage.h>
+#include <sys/Monitor.h>
+#include <BrokerQueue.h>
 
 namespace qpid {
 namespace broker {
diff --git a/cpp/src/qpid/broker/ExchangeBinding.cpp b/cpp/lib/broker/ExchangeBinding.cpp
index 375fbe165e..bf2102414d 100644
--- a/cpp/src/qpid/broker/ExchangeBinding.cpp
+++ b/cpp/lib/broker/ExchangeBinding.cpp
@@ -18,8 +18,8 @@
  * under the License.
  *
  */
-#include <qpid/broker/ExchangeBinding.h>
-#include <qpid/broker/Exchange.h>
+#include <ExchangeBinding.h>
+#include <BrokerExchange.h>
 
 using namespace qpid::broker;
 using namespace qpid::framing;
diff --git a/cpp/src/qpid/broker/ExchangeBinding.h b/cpp/lib/broker/ExchangeBinding.h
index fd1a05391a..2afaa89552 100644
--- a/cpp/src/qpid/broker/ExchangeBinding.h
+++ b/cpp/lib/broker/ExchangeBinding.h
@@ -21,9 +21,9 @@
 #ifndef _ExchangeBinding_
 #define _ExchangeBinding_
 
-#include <qpid/broker/Binding.h>
-#include <qpid/framing/FieldTable.h>
-#include <qpid/broker/Queue.h>
+#include <Binding.h>
+#include <FieldTable.h>
+#include <BrokerQueue.h>
 
 namespace qpid {
     namespace broker {
diff --git a/cpp/src/qpid/broker/ExchangeRegistry.cpp b/cpp/lib/broker/ExchangeRegistry.cpp
index 5e9fa9a9a6..7bf96c4544 100644
--- a/cpp/src/qpid/broker/ExchangeRegistry.cpp
+++ b/cpp/lib/broker/ExchangeRegistry.cpp
@@ -18,11 +18,11 @@
  * under the License.
  *
  */
-#include <qpid/broker/ExchangeRegistry.h>
-#include <qpid/broker/DirectExchange.h>
-#include <qpid/broker/FanOutExchange.h>
-#include <qpid/broker/HeadersExchange.h>
-#include <qpid/broker/TopicExchange.h>
+#include <ExchangeRegistry.h>
+#include <DirectExchange.h>
+#include <FanOutExchange.h>
+#include <HeadersExchange.h>
+#include <TopicExchange.h>
 
 using namespace qpid::broker;
 using namespace qpid::sys;
diff --git a/cpp/src/qpid/broker/ExchangeRegistry.h b/cpp/lib/broker/ExchangeRegistry.h
index 5c4da7c917..8dcd0d3623 100644
--- a/cpp/src/qpid/broker/ExchangeRegistry.h
+++ b/cpp/lib/broker/ExchangeRegistry.h
@@ -22,8 +22,8 @@
 #define _ExchangeRegistry_
 
 #include <map>
-#include <qpid/broker/Exchange.h>
-#include <qpid/sys/Monitor.h>
+#include <BrokerExchange.h>
+#include <sys/Monitor.h>
 
 namespace qpid {
 namespace broker {
diff --git a/cpp/src/qpid/broker/FanOutExchange.cpp b/cpp/lib/broker/FanOutExchange.cpp
index 0f3223d3a6..48afcc20d5 100644
--- a/cpp/src/qpid/broker/FanOutExchange.cpp
+++ b/cpp/lib/broker/FanOutExchange.cpp
@@ -18,8 +18,8 @@
  * under the License.
  *
  */
-#include <qpid/broker/FanOutExchange.h>
-#include <qpid/broker/ExchangeBinding.h>
+#include <FanOutExchange.h>
+#include <ExchangeBinding.h>
 #include <algorithm>
 
 using namespace qpid::broker;
@@ -43,7 +43,8 @@ void FanOutExchange::unbind(Queue::shared_ptr queue, const string& /*routingKey*
     Queue::vector::iterator i = std::find(bindings.begin(), bindings.end(), queue);
     if (i != bindings.end()) {
         bindings.erase(i);
-        // TODO aconway 2006-09-14: What about the ExchangeBinding object? Don't we have to verify routingKey/args match?
+        // TODO aconway 2006-09-14: What about the ExchangeBinding object?
+        // Don't we have to verify routingKey/args match?
     }
 }
 
diff --git a/cpp/src/qpid/broker/FanOutExchange.h b/cpp/lib/broker/FanOutExchange.h
index 0e309a0e79..6dc70e69bb 100644
--- a/cpp/src/qpid/broker/FanOutExchange.h
+++ b/cpp/lib/broker/FanOutExchange.h
@@ -23,11 +23,11 @@
 
 #include <map>
 #include <vector>
-#include <qpid/broker/Exchange.h>
-#include <qpid/framing/FieldTable.h>
-#include <qpid/broker/Message.h>
-#include <qpid/sys/Monitor.h>
-#include <qpid/broker/Queue.h>
+#include <BrokerExchange.h>
+#include <FieldTable.h>
+#include <BrokerMessage.h>
+#include <sys/Monitor.h>
+#include <BrokerQueue.h>
 
 namespace qpid {
 namespace broker {
diff --git a/cpp/src/qpid/broker/HeadersExchange.cpp b/cpp/lib/broker/HeadersExchange.cpp
index bf1a89c7e8..acd344725a 100644
--- a/cpp/src/qpid/broker/HeadersExchange.cpp
+++ b/cpp/lib/broker/HeadersExchange.cpp
@@ -18,10 +18,10 @@
  * under the License.
  *
  */
-#include <qpid/broker/HeadersExchange.h>
-#include <qpid/broker/ExchangeBinding.h>
-#include <qpid/framing/Value.h>
-#include <qpid/QpidError.h>
+#include <HeadersExchange.h>
+#include <ExchangeBinding.h>
+#include <Value.h>
+#include <QpidError.h>
 #include <algorithm>
 
 
diff --git a/cpp/src/qpid/broker/HeadersExchange.h b/cpp/lib/broker/HeadersExchange.h
index 5d1a51747f..5e8da5ad85 100644
--- a/cpp/src/qpid/broker/HeadersExchange.h
+++ b/cpp/lib/broker/HeadersExchange.h
@@ -22,11 +22,11 @@
 #define _HeadersExchange_
 
 #include <vector>
-#include <qpid/broker/Exchange.h>
-#include <qpid/framing/FieldTable.h>
-#include <qpid/broker/Message.h>
-#include <qpid/sys/Monitor.h>
-#include <qpid/broker/Queue.h>
+#include <BrokerExchange.h>
+#include <FieldTable.h>
+#include <BrokerMessage.h>
+#include <sys/Monitor.h>
+#include <BrokerQueue.h>
 
 namespace qpid {
 namespace broker {
diff --git a/cpp/src/qpid/broker/InMemoryContent.cpp b/cpp/lib/broker/InMemoryContent.cpp
index fe15def5c8..9d40877c86 100644
--- a/cpp/src/qpid/broker/InMemoryContent.cpp
+++ b/cpp/lib/broker/InMemoryContent.cpp
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-#include "qpid/broker/InMemoryContent.h"
+#include <InMemoryContent.h>
 
 using namespace qpid::broker;
 using namespace qpid::framing;
diff --git a/cpp/src/qpid/broker/InMemoryContent.h b/cpp/lib/broker/InMemoryContent.h
index 5e851722f2..c54d15447d 100644
--- a/cpp/src/qpid/broker/InMemoryContent.h
+++ b/cpp/lib/broker/InMemoryContent.h
@@ -21,7 +21,7 @@
 #ifndef _InMemoryContent_
 #define _InMemoryContent_
 
-#include <qpid/broker/Content.h>
+#include <Content.h>
 #include <vector>
 
 namespace qpid {
diff --git a/cpp/src/qpid/broker/LazyLoadedContent.cpp b/cpp/lib/broker/LazyLoadedContent.cpp
index eb7536dde3..c0da48efda 100644
--- a/cpp/src/qpid/broker/LazyLoadedContent.cpp
+++ b/cpp/lib/broker/LazyLoadedContent.cpp
@@ -18,17 +18,17 @@
  * under the License.
  *
  */
-#include "qpid/broker/LazyLoadedContent.h"
+#include <LazyLoadedContent.h>
 
 using namespace qpid::broker;
 using namespace qpid::framing;
 
-LazyLoadedContent::LazyLoadedContent(MessageStore* const _store, u_int64_t _msgId, u_int64_t _expectedSize) : 
-    store(_store), msgId(_msgId), expectedSize(_expectedSize) {}
+LazyLoadedContent::LazyLoadedContent(MessageStore* const _store, Message* const _msg, u_int64_t _expectedSize) : 
+    store(_store), msg(_msg), expectedSize(_expectedSize) {}
 
 void LazyLoadedContent::add(AMQContentBody::shared_ptr data)
 {
-    store->appendContent(msgId, data->getData());
+    store->appendContent(msg, data->getData());
 }
 
 u_int32_t LazyLoadedContent::size()
@@ -42,12 +42,12 @@ void LazyLoadedContent::send(OutputHandler* out, int channel, u_int32_t framesiz
         for (u_int64_t offset = 0; offset < expectedSize; offset += framesize) {            
             u_int64_t remaining = expectedSize - offset;
             string data;
-            store->loadContent(msgId, data, offset, remaining > framesize ? framesize : remaining);              
+            store->loadContent(msg, data, offset, remaining > framesize ? framesize : remaining);              
             out->send(new AMQFrame(channel, new AMQContentBody(data)));
         }
     } else {
         string data;
-        store->loadContent(msgId, data, 0, expectedSize);  
+        store->loadContent(msg, data, 0, expectedSize);  
         out->send(new AMQFrame(channel, new AMQContentBody(data)));
     }
 }
diff --git a/cpp/src/qpid/broker/LazyLoadedContent.h b/cpp/lib/broker/LazyLoadedContent.h
index 5a406e3131..fdb752f117 100644
--- a/cpp/src/qpid/broker/LazyLoadedContent.h
+++ b/cpp/lib/broker/LazyLoadedContent.h
@@ -21,17 +21,17 @@
 #ifndef _LazyLoadedContent_
 #define _LazyLoadedContent_
 
-#include <qpid/broker/Content.h>
-#include <qpid/broker/MessageStore.h>
+#include <Content.h>
+#include <MessageStore.h>
 
 namespace qpid {
     namespace broker {
         class LazyLoadedContent : public Content{
             MessageStore* const store;
-            const u_int64_t msgId;
+            Message* const msg;
             const u_int64_t expectedSize;
         public:
-            LazyLoadedContent(MessageStore* const store, u_int64_t msgId, u_int64_t expectedSize);
+            LazyLoadedContent(MessageStore* const store, Message* const msg, u_int64_t expectedSize);
             void add(qpid::framing::AMQContentBody::shared_ptr data);
             u_int32_t size();
             void send(qpid::framing::OutputHandler* out, int channel, u_int32_t framesize);
diff --git a/cpp/lib/broker/Makefile.am b/cpp/lib/broker/Makefile.am
new file mode 100644
index 0000000000..f02dc4f545
--- /dev/null
+++ b/cpp/lib/broker/Makefile.am
@@ -0,0 +1,81 @@
+AM_CXXFLAGS = $(WARNING_CFLAGS)
+INCLUDES =				\
+  -I$(top_srcdir)/gen			\
+  -I$(top_srcdir)/lib/common		\
+  -I$(top_srcdir)/lib/common/sys	\
+  -I$(top_srcdir)/lib/common/framing	\
+  $(APR_CXXFLAGS)
+
+lib_LTLIBRARIES = libbroker.la
+libbroker_la_LDFLAGS = -version-info $(LIBTOOL_VERSION_INFO_ARG)
+libbroker_la_SOURCES =				\
+  AccumulatedAck.cpp				\
+  AccumulatedAck.h				\
+  AutoDelete.cpp				\
+  AutoDelete.h					\
+  Binding.h					\
+  Broker.cpp					\
+  Broker.h					\
+  BrokerChannel.cpp				\
+  BrokerChannel.h				\
+  BrokerExchange.h				\
+  BrokerMessage.cpp				\
+  BrokerMessage.h				\
+  BrokerQueue.cpp				\
+  BrokerQueue.h					\
+  Configuration.cpp				\
+  Configuration.h				\
+  ConnectionToken.h				\
+  Consumer.h					\
+  Content.h					\
+  DeletingTxOp.cpp				\
+  DeletingTxOp.h				\
+  Deliverable.h					\
+  DeliverableMessage.cpp			\
+  DeliverableMessage.h				\
+  DeliveryRecord.cpp				\
+  DeliveryRecord.h				\
+  DirectExchange.cpp				\
+  DirectExchange.h				\
+  ExchangeBinding.cpp				\
+  ExchangeBinding.h				\
+  ExchangeRegistry.cpp				\
+  ExchangeRegistry.h				\
+  FanOutExchange.cpp				\
+  FanOutExchange.h				\
+  HeadersExchange.cpp				\
+  HeadersExchange.h				\
+  InMemoryContent.cpp				\
+  InMemoryContent.h				\
+  LazyLoadedContent.cpp				\
+  LazyLoadedContent.h				\
+  MessageBuilder.cpp				\
+  MessageBuilder.h				\
+  MessageStore.h				\
+  MessageStoreModule.cpp			\
+  MessageStoreModule.h				\
+  NameGenerator.cpp				\
+  NameGenerator.h				\
+  NullMessageStore.cpp				\
+  NullMessageStore.h				\
+  Prefetch.h					\
+  QueuePolicy.cpp				\
+  QueuePolicy.h					\
+  QueueRegistry.cpp				\
+  QueueRegistry.h				\
+  RecoveryManager.cpp				\
+  RecoveryManager.h				\
+  SessionHandlerFactoryImpl.cpp			\
+  SessionHandlerFactoryImpl.h			\
+  SessionHandlerImpl.cpp			\
+  SessionHandlerImpl.h				\
+  TopicExchange.cpp				\
+  TopicExchange.h				\
+  TransactionalStore.h				\
+  TxAck.cpp					\
+  TxAck.h					\
+  TxBuffer.cpp					\
+  TxBuffer.h					\
+  TxOp.h					\
+  TxPublish.cpp					\
+  TxPublish.h
diff --git a/cpp/src/qpid/broker/MessageBuilder.cpp b/cpp/lib/broker/MessageBuilder.cpp
index 1a58523c08..7f009d5cdf 100644
--- a/cpp/src/qpid/broker/MessageBuilder.cpp
+++ b/cpp/lib/broker/MessageBuilder.cpp
@@ -18,10 +18,10 @@
  * under the License.
  *
  */
-#include <qpid/broker/MessageBuilder.h>
+#include <MessageBuilder.h>
 
-#include <qpid/broker/InMemoryContent.h>
-#include <qpid/broker/LazyLoadedContent.h>
+#include <InMemoryContent.h>
+#include <LazyLoadedContent.h>
 
 using namespace qpid::broker;
 using namespace qpid::framing;
@@ -54,8 +54,7 @@ void MessageBuilder::setHeader(AMQHeaderBody::shared_ptr& header){
     message->setHeader(header);
     if (stagingThreshold && header->getContentSize() >= stagingThreshold) {
         store->stage(message);
-        auto_ptr<Content> content(new LazyLoadedContent(store, message->getPersistenceId(), message->expectedContentSize()));
-        message->setContent(content);
+        message->releaseContent(store);
     } else {
         auto_ptr<Content> content(new InMemoryContent());
         message->setContent(content);
diff --git a/cpp/src/qpid/broker/MessageBuilder.h b/cpp/lib/broker/MessageBuilder.h
index 982601f037..4e51f223f0 100644
--- a/cpp/src/qpid/broker/MessageBuilder.h
+++ b/cpp/lib/broker/MessageBuilder.h
@@ -22,13 +22,13 @@
 #define _MessageBuilder_
 
 #include <memory>
-#include <qpid/QpidError.h>
-#include <qpid/broker/Exchange.h>
-#include <qpid/broker/Message.h>
-#include <qpid/broker/MessageStore.h>
-#include <qpid/framing/AMQContentBody.h>
-#include <qpid/framing/AMQHeaderBody.h>
-#include <qpid/framing/BasicPublishBody.h>
+#include <QpidError.h>
+#include <BrokerExchange.h>
+#include <BrokerMessage.h>
+#include <MessageStore.h>
+#include <AMQContentBody.h>
+#include <AMQHeaderBody.h>
+#include <BasicPublishBody.h>
 
 namespace qpid {
     namespace broker {
diff --git a/cpp/src/qpid/broker/MessageStore.h b/cpp/lib/broker/MessageStore.h
index 1c5a16c50d..be9172e383 100644
--- a/cpp/src/qpid/broker/MessageStore.h
+++ b/cpp/lib/broker/MessageStore.h
@@ -21,12 +21,23 @@
 #ifndef _MessageStore_
 #define _MessageStore_
 
-#include <qpid/broker/Message.h>
-#include <qpid/broker/RecoveryManager.h>
-#include <qpid/broker/TransactionalStore.h>
+#include <BrokerMessage.h>
+#include <FieldTable.h>
+#include <RecoveryManager.h>
+#include <TransactionalStore.h>
 
 namespace qpid {
     namespace broker {
+        struct MessageStoreSettings
+        {
+            /**
+             * Messages whose content length is larger than this value
+             * will be staged (i.e. will have thier data written to
+             * disk as it arrives) and will load their data lazily. On
+             * recovery therefore, only the headers should be loaded.
+             */
+            u_int64_t stagingThreshold;
+        };
         /**
          * An abstraction of the persistent storage for messages.
          */
@@ -35,7 +46,7 @@ namespace qpid {
             /**
              * Record the existance of a durable queue
              */
-            virtual void create(const Queue& queue) = 0;
+            virtual void create(const Queue& queue, const qpid::framing::FieldTable& settings) = 0;
             /**
              * Destroy a durable queue
              */
@@ -44,7 +55,7 @@ namespace qpid {
             /**
              * Request recovery of queue and message state from store
              */
-            virtual void recover(RecoveryManager& queues) = 0;
+            virtual void recover(RecoveryManager& queues, const MessageStoreSettings* const settings = 0) = 0;
 
             /**
              * Stores a messages before it has been enqueued
@@ -68,17 +79,17 @@ namespace qpid {
             /**
              * Appends content to a previously staged message
              */
-            virtual void appendContent(u_int64_t msgId, const std::string& data) = 0;
+            virtual void appendContent(Message* const msg, const std::string& data) = 0;
 
             /**
              * Loads (a section) of content data for the specified
-             * message id (previously set on the message through a
-             * call to stage or enqueue) into data. The offset refers
-             * to the content only (i.e. an offset of 0 implies that
-             * the start of the content should be loaded, not the
-             * headers or related meta-data).
+             * message (previously stored through a call to stage or
+             * enqueue) into data. The offset refers to the content
+             * only (i.e. an offset of 0 implies that the start of the
+             * content should be loaded, not the headers or related
+             * meta-data).
              */
-            virtual void loadContent(u_int64_t msgId, std::string& data, u_int64_t offset, u_int32_t length) = 0;
+            virtual void loadContent(Message* const msg, std::string& data, u_int64_t offset, u_int32_t length) = 0;
 
             /**
              * Enqueues a message, storing the message if it has not
diff --git a/cpp/src/qpid/broker/MessageStoreModule.cpp b/cpp/lib/broker/MessageStoreModule.cpp
index 168cb3d5bb..b3f5d6e63c 100644
--- a/cpp/src/qpid/broker/MessageStoreModule.cpp
+++ b/cpp/lib/broker/MessageStoreModule.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include <qpid/broker/MessageStoreModule.h>
+#include <MessageStoreModule.h>
 #include <iostream>
 
 using namespace qpid::broker;
@@ -28,9 +28,9 @@ MessageStoreModule::MessageStoreModule(const std::string& name) : store(name)
 {
 }
 
-void MessageStoreModule::create(const Queue& queue)
+void MessageStoreModule::create(const Queue& queue, const qpid::framing::FieldTable& settings)
 {
-    store->create(queue);
+    store->create(queue, settings);
 }
 
 void MessageStoreModule::destroy(const Queue& queue)
@@ -38,9 +38,9 @@ void MessageStoreModule::destroy(const Queue& queue)
     store->destroy(queue);
 }
 
-void MessageStoreModule::recover(RecoveryManager& registry)
+void MessageStoreModule::recover(RecoveryManager& registry, const MessageStoreSettings* const settings)
 {
-    store->recover(registry);
+    store->recover(registry, settings);
 }
 
 void MessageStoreModule::stage(Message::shared_ptr& msg)
@@ -53,14 +53,14 @@ void MessageStoreModule::destroy(Message::shared_ptr& msg)
     store->destroy(msg);
 }
 
-void MessageStoreModule::appendContent(u_int64_t msgId, const std::string& data)
+void MessageStoreModule::appendContent(Message* const msg, const std::string& data)
 {
-    store->appendContent(msgId, data);
+    store->appendContent(msg, data);
 }
 
-void MessageStoreModule::loadContent(u_int64_t msgId, string& data, u_int64_t offset, u_int32_t length)
+void MessageStoreModule::loadContent(Message* const msg, string& data, u_int64_t offset, u_int32_t length)
 {
-    store->loadContent(msgId, data, offset, length);
+    store->loadContent(msg, data, offset, length);
 }
 
 void MessageStoreModule::enqueue(TransactionContext* ctxt, Message::shared_ptr& msg, const Queue& queue, const string * const xid)
diff --git a/cpp/src/qpid/broker/MessageStoreModule.h b/cpp/lib/broker/MessageStoreModule.h
index 306e1aa3ea..d70aab6d13 100644
--- a/cpp/src/qpid/broker/MessageStoreModule.h
+++ b/cpp/lib/broker/MessageStoreModule.h
@@ -21,11 +21,11 @@
 #ifndef _MessageStoreModule_
 #define _MessageStoreModule_
 
-#include <qpid/broker/Message.h>
-#include <qpid/broker/MessageStore.h>
-#include <qpid/broker/Queue.h>
-#include <qpid/broker/RecoveryManager.h>
-#include <qpid/sys/Module.h>
+#include <BrokerMessage.h>
+#include <MessageStore.h>
+#include <BrokerQueue.h>
+#include <RecoveryManager.h>
+#include <sys/Module.h>
 
 namespace qpid {
     namespace broker {
@@ -36,13 +36,13 @@ namespace qpid {
             qpid::sys::Module<MessageStore> store;
         public:
             MessageStoreModule(const std::string& name);
-            void create(const Queue& queue);
+            void create(const Queue& queue, const qpid::framing::FieldTable& settings);
             void destroy(const Queue& queue);
-            void recover(RecoveryManager& queues);
+            void recover(RecoveryManager& queues, const MessageStoreSettings* const settings = 0);
             void stage(Message::shared_ptr& msg);
             void destroy(Message::shared_ptr& msg);
-            void appendContent(u_int64_t msgId, const std::string& data);
-            void loadContent(u_int64_t msgId, std::string& data, u_int64_t offset, u_int32_t length);
+            void appendContent(Message* const msg, const std::string& data);
+            void loadContent(Message* const msg, std::string& data, u_int64_t offset, u_int32_t length);
             void enqueue(TransactionContext* ctxt, Message::shared_ptr& msg, const Queue& queue, const string * const xid);
             void dequeue(TransactionContext* ctxt, Message::shared_ptr& msg, const Queue& queue, const string * const xid);
             void committed(const string * const xid);
diff --git a/cpp/src/qpid/broker/NameGenerator.cpp b/cpp/lib/broker/NameGenerator.cpp
index d74e3dba0b..3f281859fa 100644
--- a/cpp/src/qpid/broker/NameGenerator.cpp
+++ b/cpp/lib/broker/NameGenerator.cpp
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-#include <qpid/broker/NameGenerator.h>
+#include <NameGenerator.h>
 #include <sstream>
 
 using namespace qpid::broker;
diff --git a/cpp/src/qpid/broker/NameGenerator.h b/cpp/lib/broker/NameGenerator.h
index 6068767404..b2dbbdfb69 100644
--- a/cpp/src/qpid/broker/NameGenerator.h
+++ b/cpp/lib/broker/NameGenerator.h
@@ -21,7 +21,7 @@
 #ifndef _NameGenerator_
 #define _NameGenerator_
 
-#include <qpid/broker/Message.h>
+#include <BrokerMessage.h>
 
 namespace qpid {
     namespace broker {
diff --git a/cpp/src/qpid/broker/NullMessageStore.cpp b/cpp/lib/broker/NullMessageStore.cpp
index 5a2837509d..3c29994aac 100644
--- a/cpp/src/qpid/broker/NullMessageStore.cpp
+++ b/cpp/lib/broker/NullMessageStore.cpp
@@ -19,10 +19,10 @@
  *
  */
 
-#include <qpid/broker/NullMessageStore.h>
+#include <NullMessageStore.h>
 
-#include <qpid/broker/Queue.h>
-#include <qpid/broker/RecoveryManager.h>
+#include <BrokerQueue.h>
+#include <RecoveryManager.h>
 
 #include <iostream>
 
@@ -30,7 +30,7 @@ using namespace qpid::broker;
 
 NullMessageStore::NullMessageStore(bool _warn) : warn(_warn){}
 
-void NullMessageStore::create(const Queue& queue)
+void NullMessageStore::create(const Queue& queue, const qpid::framing::FieldTable&)
 {
     if (warn) std::cout << "WARNING: Can't create durable queue '" << queue.getName() << "'. Persistence not enabled." << std::endl;
 }
@@ -40,7 +40,7 @@ void NullMessageStore::destroy(const Queue& queue)
     if (warn) std::cout << "WARNING: Can't destroy durable queue '" << queue.getName() << "'. Persistence not enabled." << std::endl;
 }
 
-void NullMessageStore::recover(RecoveryManager&)
+void NullMessageStore::recover(RecoveryManager&, const MessageStoreSettings* const)
 {
     if (warn) std::cout << "WARNING: Persistence not enabled, no recovery of queues or messages." << std::endl;
 }
@@ -55,12 +55,12 @@ void NullMessageStore::destroy(Message::shared_ptr&)
     if (warn) std::cout << "WARNING: No need to destroy staged message. Persistence not enabled." << std::endl;
 }
 
-void NullMessageStore::appendContent(u_int64_t, const string&)
+void NullMessageStore::appendContent(Message* const, const string&)
 {
     if (warn) std::cout << "WARNING: Can't append content. Persistence not enabled." << std::endl;
 }
 
-void NullMessageStore::loadContent(u_int64_t, string&, u_int64_t, u_int32_t)
+void NullMessageStore::loadContent(Message* const, string&, u_int64_t, u_int32_t)
 {
     if (warn) std::cout << "WARNING: Can't load content. Persistence not enabled." << std::endl;
 }
diff --git a/cpp/src/qpid/broker/NullMessageStore.h b/cpp/lib/broker/NullMessageStore.h
index c13a6c9f72..61afe36281 100644
--- a/cpp/src/qpid/broker/NullMessageStore.h
+++ b/cpp/lib/broker/NullMessageStore.h
@@ -21,9 +21,9 @@
 #ifndef _NullMessageStore_
 #define _NullMessageStore_
 
-#include <qpid/broker/Message.h>
-#include <qpid/broker/MessageStore.h>
-#include <qpid/broker/Queue.h>
+#include <BrokerMessage.h>
+#include <MessageStore.h>
+#include <BrokerQueue.h>
 
 namespace qpid {
     namespace broker {
@@ -35,13 +35,13 @@ namespace qpid {
             const bool warn;
         public:
             NullMessageStore(bool warn = true);
-            virtual void create(const Queue& queue);
+            virtual void create(const Queue& queue, const qpid::framing::FieldTable& settings);
             virtual void destroy(const Queue& queue);
-            virtual void recover(RecoveryManager& queues);
+            virtual void recover(RecoveryManager& queues, const MessageStoreSettings* const settings = 0);
             virtual void stage(Message::shared_ptr& msg);
             virtual void destroy(Message::shared_ptr& msg);
-            virtual void appendContent(u_int64_t msgId, const std::string& data);
-            virtual void loadContent(u_int64_t msgId, std::string& data, u_int64_t offset, u_int32_t length);
+            virtual void appendContent(Message* const msg, const std::string& data);
+            virtual void loadContent(Message* const msg, std::string& data, u_int64_t offset, u_int32_t length);
             virtual void enqueue(TransactionContext* ctxt, Message::shared_ptr& msg, const Queue& queue, const string * const xid);
             virtual void dequeue(TransactionContext* ctxt, Message::shared_ptr& msg, const Queue& queue, const string * const xid);
             virtual void committed(const string * const xid);
diff --git a/cpp/src/qpid/broker/Prefetch.h b/cpp/lib/broker/Prefetch.h
index 810da28fe5..a1adccaee7 100644
--- a/cpp/src/qpid/broker/Prefetch.h
+++ b/cpp/lib/broker/Prefetch.h
@@ -21,7 +21,7 @@
 #ifndef _Prefetch_
 #define _Prefetch_
 
-#include <qpid/framing/amqp_types.h>
+#include <amqp_types.h>
 
 namespace qpid {
     namespace broker {
diff --git a/cpp/lib/broker/QueuePolicy.cpp b/cpp/lib/broker/QueuePolicy.cpp
new file mode 100644
index 0000000000..055d415226
--- /dev/null
+++ b/cpp/lib/broker/QueuePolicy.cpp
@@ -0,0 +1,75 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+#include <QueuePolicy.h>
+
+using namespace qpid::broker;
+using namespace qpid::framing;
+
+QueuePolicy::QueuePolicy(u_int32_t _maxCount, u_int64_t _maxSize) : 
+    maxCount(_maxCount), maxSize(_maxSize) {}
+
+QueuePolicy::QueuePolicy(const FieldTable& settings) :
+    maxCount(getInt(settings, maxCountKey, 0)), 
+    maxSize(getInt(settings, maxSizeKey, 0)) {}
+
+void QueuePolicy::enqueued(Message::shared_ptr& msg, MessageStore* store)
+{
+    if (checkCount(msg) || checkSize(msg)) {
+        msg->releaseContent(store);
+    }
+}
+
+void QueuePolicy::dequeued(Message::shared_ptr& msg, MessageStore* /*store*/)
+{
+    if (maxCount) count--;
+    if (maxSize) size -= msg->contentSize();
+}
+
+bool QueuePolicy::checkCount(Message::shared_ptr& /*msg*/)
+{
+    return maxCount && ++count > maxCount;
+}
+
+bool QueuePolicy::checkSize(Message::shared_ptr& msg)
+{
+    return maxSize && (size += msg->contentSize()) > maxSize;
+}
+
+void QueuePolicy::update(FieldTable& settings)
+{
+    if (maxCount) settings.setInt(maxCountKey, maxCount);
+    if (maxSize) settings.setInt(maxSizeKey, maxSize);    
+}
+
+
+int QueuePolicy::getInt(const FieldTable& settings, const std::string& key, int defaultValue)
+{
+    //Note: currently field table only contain signed 32 bit ints, which
+    //      restricts the values that can be set on the queue policy.
+    try {
+        return settings.getInt(key); 
+    } catch (FieldNotFoundException& ignore) {
+        return defaultValue;
+    }
+}
+
+const std::string QueuePolicy::maxCountKey("qpid.max_count");
+const std::string QueuePolicy::maxSizeKey("qpid.max_size");
diff --git a/cpp/lib/broker/QueuePolicy.h b/cpp/lib/broker/QueuePolicy.h
new file mode 100644
index 0000000000..c31e9ec968
--- /dev/null
+++ b/cpp/lib/broker/QueuePolicy.h
@@ -0,0 +1,55 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+#ifndef _QueuePolicy_
+#define _QueuePolicy_
+
+#include <BrokerMessage.h>
+#include <FieldTable.h>
+
+namespace qpid {
+    namespace broker {
+        class QueuePolicy
+        {
+            static const std::string maxCountKey;
+            static const std::string maxSizeKey;
+
+            const u_int32_t maxCount;
+            const u_int64_t maxSize;
+            u_int32_t count;
+            u_int64_t size;
+            
+            static int getInt(const qpid::framing::FieldTable& settings, const std::string& key, int defaultValue);
+            bool checkCount(Message::shared_ptr& msg);
+            bool checkSize(Message::shared_ptr& msg);
+        public:
+            QueuePolicy(u_int32_t maxCount, u_int64_t maxSize);
+            QueuePolicy(const qpid::framing::FieldTable& settings);
+            void enqueued(Message::shared_ptr& msg, MessageStore* store);
+            void dequeued(Message::shared_ptr& msg, MessageStore* store);
+            void update(qpid::framing::FieldTable& settings);
+            u_int32_t getMaxCount() const { return maxCount; }
+            u_int64_t getMaxSize() const { return maxSize; }           
+        };
+    }
+}
+
+
+#endif
diff --git a/cpp/src/qpid/broker/QueueRegistry.cpp b/cpp/lib/broker/QueueRegistry.cpp
index 38765538d6..304f696a7f 100644
--- a/cpp/src/qpid/broker/QueueRegistry.cpp
+++ b/cpp/lib/broker/QueueRegistry.cpp
@@ -18,8 +18,8 @@
  * under the License.
  *
  */
-#include <qpid/broker/QueueRegistry.h>
-#include <qpid/broker/SessionHandlerImpl.h>
+#include <QueueRegistry.h>
+#include <SessionHandlerImpl.h>
 #include <sstream>
 #include <assert.h>
 
diff --git a/cpp/src/qpid/broker/QueueRegistry.h b/cpp/lib/broker/QueueRegistry.h
index f95015c0fd..bb9f2f4f26 100644
--- a/cpp/src/qpid/broker/QueueRegistry.h
+++ b/cpp/lib/broker/QueueRegistry.h
@@ -22,8 +22,8 @@
 #define _QueueRegistry_
 
 #include <map>
-#include <qpid/sys/Monitor.h>
-#include <qpid/broker/Queue.h>
+#include <sys/Monitor.h>
+#include <BrokerQueue.h>
 
 namespace qpid {
 namespace broker {
diff --git a/cpp/src/qpid/broker/RecoveryManager.cpp b/cpp/lib/broker/RecoveryManager.cpp
index 40275477b7..6ea4c00c65 100644
--- a/cpp/src/qpid/broker/RecoveryManager.cpp
+++ b/cpp/lib/broker/RecoveryManager.cpp
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-#include <qpid/broker/RecoveryManager.h>
+#include <RecoveryManager.h>
 
 using namespace qpid::broker;
 
diff --git a/cpp/src/qpid/broker/RecoveryManager.h b/cpp/lib/broker/RecoveryManager.h
index 6df5af687c..d4e4cff3fd 100644
--- a/cpp/src/qpid/broker/RecoveryManager.h
+++ b/cpp/lib/broker/RecoveryManager.h
@@ -21,8 +21,8 @@
 #ifndef _RecoveryManager_
 #define _RecoveryManager_
 
-#include <qpid/broker/ExchangeRegistry.h>
-#include <qpid/broker/QueueRegistry.h>
+#include <ExchangeRegistry.h>
+#include <QueueRegistry.h>
 
 namespace qpid {
 namespace broker {
diff --git a/cpp/src/qpid/broker/SessionHandlerFactoryImpl.cpp b/cpp/lib/broker/SessionHandlerFactoryImpl.cpp
index 75912c6560..2cc09a67e0 100644
--- a/cpp/src/qpid/broker/SessionHandlerFactoryImpl.cpp
+++ b/cpp/lib/broker/SessionHandlerFactoryImpl.cpp
@@ -18,14 +18,14 @@
  * under the License.
  *
  */
-#include <qpid/broker/SessionHandlerFactoryImpl.h>
+#include <SessionHandlerFactoryImpl.h>
 
-#include <qpid/broker/DirectExchange.h>
-#include <qpid/broker/FanOutExchange.h>
-#include <qpid/broker/HeadersExchange.h>
-#include <qpid/broker/MessageStoreModule.h>
-#include <qpid/broker/NullMessageStore.h>
-#include <qpid/broker/SessionHandlerImpl.h>
+#include <DirectExchange.h>
+#include <FanOutExchange.h>
+#include <HeadersExchange.h>
+#include <MessageStoreModule.h>
+#include <NullMessageStore.h>
+#include <SessionHandlerImpl.h>
 
 using namespace qpid::broker;
 using namespace qpid::sys;
diff --git a/cpp/src/qpid/broker/SessionHandlerFactoryImpl.h b/cpp/lib/broker/SessionHandlerFactoryImpl.h
index fb7462ac8b..73ae879a58 100644
--- a/cpp/src/qpid/broker/SessionHandlerFactoryImpl.h
+++ b/cpp/lib/broker/SessionHandlerFactoryImpl.h
@@ -21,16 +21,16 @@
 #ifndef _SessionHandlerFactoryImpl_
 #define _SessionHandlerFactoryImpl_
 
-#include <qpid/broker/AutoDelete.h>
-#include <qpid/broker/ExchangeRegistry.h>
-#include <qpid/broker/MessageStore.h>
-#include <qpid/broker/QueueRegistry.h>
-#include <qpid/framing/AMQFrame.h>
-#include <qpid/framing/ProtocolInitiation.h>
-#include <qpid/sys/SessionContext.h>
-#include <qpid/sys/SessionHandler.h>
-#include <qpid/sys/SessionHandlerFactory.h>
-#include <qpid/sys/TimeoutHandler.h>
+#include <AutoDelete.h>
+#include <ExchangeRegistry.h>
+#include <MessageStore.h>
+#include <QueueRegistry.h>
+#include <AMQFrame.h>
+#include <ProtocolInitiation.h>
+#include <sys/SessionContext.h>
+#include <sys/SessionHandler.h>
+#include <sys/SessionHandlerFactory.h>
+#include <sys/TimeoutHandler.h>
 #include <memory>
 
 namespace qpid {
diff --git a/cpp/src/qpid/broker/SessionHandlerImpl.cpp b/cpp/lib/broker/SessionHandlerImpl.cpp
index c8c7b440aa..6d7f5048ea 100644
--- a/cpp/src/qpid/broker/SessionHandlerImpl.cpp
+++ b/cpp/lib/broker/SessionHandlerImpl.cpp
@@ -19,10 +19,10 @@
  *
  */
 #include <iostream>
-#include <qpid/broker/SessionHandlerImpl.h>
-#include <qpid/broker/FanOutExchange.h>
-#include <qpid/broker/HeadersExchange.h>
-#include <qpid/broker/TopicExchange.h>
+#include <SessionHandlerImpl.h>
+#include <FanOutExchange.h>
+#include <HeadersExchange.h>
+#include <TopicExchange.h>
 #include "assert.h"
 
 using namespace boost;
@@ -256,7 +256,7 @@ void SessionHandlerImpl::ExchangeHandlerImpl::delete_(u_int16_t channel, u_int16
 
 void SessionHandlerImpl::QueueHandlerImpl::declare(u_int16_t channel, u_int16_t /*ticket*/, const string& name, 
                                                    bool passive, bool durable, bool exclusive, 
-                                                   bool autoDelete, bool nowait, const qpid::framing::FieldTable& /*arguments*/){
+                                                   bool autoDelete, bool nowait, const qpid::framing::FieldTable& arguments){
     Queue::shared_ptr queue;
     if (passive && !name.empty()) {
 	queue = parent->getQueue(name, channel);
@@ -268,8 +268,8 @@ void SessionHandlerImpl::QueueHandlerImpl::declare(u_int16_t channel, u_int16_t
 	if (queue_created.second) { // This is a new queue
 	    parent->getChannel(channel)->setDefaultQueue(queue);
 
-            //create persistent record if required
-            queue_created.first->create();
+            //apply settings & create persistent record if required
+            queue_created.first->create(arguments);
 
 	    //add default binding:
 	    parent->exchanges->getDefault()->bind(queue, name, 0);
diff --git a/cpp/src/qpid/broker/SessionHandlerImpl.h b/cpp/lib/broker/SessionHandlerImpl.h
index 2df4b10f9b..4b89dbeaa1 100644
--- a/cpp/src/qpid/broker/SessionHandlerImpl.h
+++ b/cpp/lib/broker/SessionHandlerImpl.h
@@ -25,21 +25,21 @@
 #include <sstream>
 #include <vector>
 #include <exception>
-#include <qpid/framing/AMQFrame.h>
-#include <qpid/framing/AMQP_ClientProxy.h>
-#include <qpid/framing/AMQP_ServerOperations.h>
-#include <qpid/broker/AutoDelete.h>
-#include <qpid/broker/ExchangeRegistry.h>
-#include <qpid/broker/Channel.h>
-#include <qpid/broker/ConnectionToken.h>
-#include <qpid/broker/DirectExchange.h>
-#include <qpid/framing/OutputHandler.h>
-#include <qpid/framing/ProtocolInitiation.h>
-#include <qpid/broker/QueueRegistry.h>
-#include <qpid/sys/SessionContext.h>
-#include <qpid/sys/SessionHandler.h>
-#include <qpid/sys/TimeoutHandler.h>
-#include <qpid/broker/TopicExchange.h>
+#include <AMQFrame.h>
+#include <AMQP_ClientProxy.h>
+#include <AMQP_ServerOperations.h>
+#include <AutoDelete.h>
+#include <ExchangeRegistry.h>
+#include <BrokerChannel.h>
+#include <ConnectionToken.h>
+#include <DirectExchange.h>
+#include <OutputHandler.h>
+#include <ProtocolInitiation.h>
+#include <QueueRegistry.h>
+#include <sys/SessionContext.h>
+#include <sys/SessionHandler.h>
+#include <sys/TimeoutHandler.h>
+#include <TopicExchange.h>
 
 namespace qpid {
 namespace broker {
diff --git a/cpp/src/qpid/broker/TopicExchange.cpp b/cpp/lib/broker/TopicExchange.cpp
index 34fb25781e..3ebb3c8c56 100644
--- a/cpp/src/qpid/broker/TopicExchange.cpp
+++ b/cpp/lib/broker/TopicExchange.cpp
@@ -18,8 +18,8 @@
  * under the License.
  *
  */
-#include <qpid/broker/TopicExchange.h>
-#include <qpid/broker/ExchangeBinding.h>
+#include <TopicExchange.h>
+#include <ExchangeBinding.h>
 #include <algorithm>
 
 using namespace qpid::broker;
@@ -82,7 +82,8 @@ void TopicPattern::normalize() {
 
 namespace {
 // TODO aconway 2006-09-20: Ineficient to convert every routingKey to a string.
-// Need more efficient Tokens impl that can operate on a string in place.
+// Need StringRef class that operates on a string in place witout copy.
+// Should be applied everywhere strings are extracted from frames.
 // 
 bool do_match(Tokens::const_iterator pattern_begin,  Tokens::const_iterator pattern_end, Tokens::const_iterator target_begin,  Tokens::const_iterator target_end)
 {
diff --git a/cpp/src/qpid/broker/TopicExchange.h b/cpp/lib/broker/TopicExchange.h
index 05fe871114..fa0c86863a 100644
--- a/cpp/src/qpid/broker/TopicExchange.h
+++ b/cpp/lib/broker/TopicExchange.h
@@ -23,11 +23,11 @@
 
 #include <map>
 #include <vector>
-#include <qpid/broker/Exchange.h>
-#include <qpid/framing/FieldTable.h>
-#include <qpid/broker/Message.h>
-#include <qpid/sys/Monitor.h>
-#include <qpid/broker/Queue.h>
+#include <BrokerExchange.h>
+#include <FieldTable.h>
+#include <BrokerMessage.h>
+#include <sys/Monitor.h>
+#include <BrokerQueue.h>
 
 namespace qpid {
 namespace broker {
diff --git a/cpp/src/qpid/broker/TransactionalStore.h b/cpp/lib/broker/TransactionalStore.h
index 17bca3878a..17bca3878a 100644
--- a/cpp/src/qpid/broker/TransactionalStore.h
+++ b/cpp/lib/broker/TransactionalStore.h
diff --git a/cpp/src/qpid/broker/TxAck.cpp b/cpp/lib/broker/TxAck.cpp
index 43e276f2be..2b55b81c58 100644
--- a/cpp/src/qpid/broker/TxAck.cpp
+++ b/cpp/lib/broker/TxAck.cpp
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-#include <qpid/broker/TxAck.h>
+#include <TxAck.h>
 
 using std::bind1st;
 using std::bind2nd;
diff --git a/cpp/src/qpid/broker/TxAck.h b/cpp/lib/broker/TxAck.h
index 49242cbd7e..d6ff8fea9c 100644
--- a/cpp/src/qpid/broker/TxAck.h
+++ b/cpp/lib/broker/TxAck.h
@@ -24,9 +24,9 @@
 #include <algorithm>
 #include <functional>
 #include <list>
-#include <qpid/broker/AccumulatedAck.h>
-#include <qpid/broker/DeliveryRecord.h>
-#include <qpid/broker/TxOp.h>
+#include <AccumulatedAck.h>
+#include <DeliveryRecord.h>
+#include <TxOp.h>
 
 namespace qpid {
     namespace broker {
diff --git a/cpp/src/qpid/broker/TxBuffer.cpp b/cpp/lib/broker/TxBuffer.cpp
index 2bbe59b0e1..acd3283bb7 100644
--- a/cpp/src/qpid/broker/TxBuffer.cpp
+++ b/cpp/lib/broker/TxBuffer.cpp
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-#include <qpid/broker/TxBuffer.h>
+#include <TxBuffer.h>
 
 using std::mem_fun;
 using namespace qpid::broker;
diff --git a/cpp/src/qpid/broker/TxBuffer.h b/cpp/lib/broker/TxBuffer.h
index ba24bf4dfa..2d9a2a3679 100644
--- a/cpp/src/qpid/broker/TxBuffer.h
+++ b/cpp/lib/broker/TxBuffer.h
@@ -24,8 +24,8 @@
 #include <algorithm>
 #include <functional>
 #include <vector>
-#include <qpid/broker/TransactionalStore.h>
-#include <qpid/broker/TxOp.h>
+#include <TransactionalStore.h>
+#include <TxOp.h>
 
 /**
  * Represents a single transaction. As such, an instance of this class
diff --git a/cpp/src/qpid/broker/TxOp.h b/cpp/lib/broker/TxOp.h
index c609e7ee41..abba84a8e8 100644
--- a/cpp/src/qpid/broker/TxOp.h
+++ b/cpp/lib/broker/TxOp.h
@@ -21,7 +21,7 @@
 #ifndef _TxOp_
 #define _TxOp_
 
-#include <qpid/broker/TransactionalStore.h>
+#include <TransactionalStore.h>
 
 namespace qpid {
     namespace broker {
diff --git a/cpp/src/qpid/broker/TxPublish.cpp b/cpp/lib/broker/TxPublish.cpp
index 6803e599c4..0de5fbb200 100644
--- a/cpp/src/qpid/broker/TxPublish.cpp
+++ b/cpp/lib/broker/TxPublish.cpp
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-#include <qpid/broker/TxPublish.h>
+#include <TxPublish.h>
 
 using namespace qpid::broker;
 
diff --git a/cpp/src/qpid/broker/TxPublish.h b/cpp/lib/broker/TxPublish.h
index c375bd0f94..2756addab7 100644
--- a/cpp/src/qpid/broker/TxPublish.h
+++ b/cpp/lib/broker/TxPublish.h
@@ -24,11 +24,11 @@
 #include <algorithm>
 #include <functional>
 #include <list>
-#include <qpid/broker/Deliverable.h>
-#include <qpid/broker/Message.h>
-#include <qpid/broker/MessageStore.h>
-#include <qpid/broker/Queue.h>
-#include <qpid/broker/TxOp.h>
+#include <Deliverable.h>
+#include <BrokerMessage.h>
+#include <MessageStore.h>
+#include <BrokerQueue.h>
+#include <TxOp.h>
 
 namespace qpid {
     namespace broker {
diff --git a/cpp/src/qpid/client/Channel.cpp b/cpp/lib/client/ClientChannel.cpp
index ab4ea5b787..ba21199732 100644
--- a/cpp/src/qpid/client/Channel.cpp
+++ b/cpp/lib/client/ClientChannel.cpp
@@ -18,11 +18,11 @@
  * under the License.
  *
  */
-#include <qpid/client/Channel.h>
-#include <qpid/sys/Monitor.h>
-#include <qpid/client/Message.h>
-#include <qpid/QpidError.h>
-#include <qpid/client/MethodBodyInstances.h>
+#include <ClientChannel.h>
+#include <sys/Monitor.h>
+#include <ClientMessage.h>
+#include <QpidError.h>
+#include <MethodBodyInstances.h>
 
 using namespace boost;          //to use dynamic_pointer_cast
 using namespace qpid::client;
diff --git a/cpp/src/qpid/client/Channel.h b/cpp/lib/client/ClientChannel.h
index e850c1c626..f76569498a 100644
--- a/cpp/src/qpid/client/Channel.h
+++ b/cpp/lib/client/ClientChannel.h
@@ -26,15 +26,15 @@
 #ifndef _Channel_
 #define _Channel_
 
-#include <qpid/framing/amqp_framing.h>
-#include <qpid/client/Connection.h>
-#include <qpid/client/Exchange.h>
-#include <qpid/client/IncomingMessage.h>
-#include <qpid/client/Message.h>
-#include <qpid/client/MessageListener.h>
-#include <qpid/client/Queue.h>
-#include <qpid/client/ResponseHandler.h>
-#include <qpid/client/ReturnedMessageHandler.h>
+#include <framing/amqp_framing.h>
+#include <Connection.h>
+#include <ClientExchange.h>
+#include <IncomingMessage.h>
+#include <ClientMessage.h>
+#include <MessageListener.h>
+#include <ClientQueue.h>
+#include <ResponseHandler.h>
+#include <ReturnedMessageHandler.h>
 
 namespace qpid {
 namespace client {
diff --git a/cpp/src/qpid/client/Exchange.cpp b/cpp/lib/client/ClientExchange.cpp
index 5a4cfe45ad..8252c3e2f6 100644
--- a/cpp/src/qpid/client/Exchange.cpp
+++ b/cpp/lib/client/ClientExchange.cpp
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-#include <qpid/client/Exchange.h>
+#include <ClientExchange.h>
 
 qpid::client::Exchange::Exchange(std::string _name, std::string _type) : name(_name), type(_type){}
 const std::string& qpid::client::Exchange::getName() const { return name; }
diff --git a/cpp/src/qpid/client/Exchange.h b/cpp/lib/client/ClientExchange.h
index 8edc62713b..8edc62713b 100644
--- a/cpp/src/qpid/client/Exchange.h
+++ b/cpp/lib/client/ClientExchange.h
diff --git a/cpp/src/qpid/client/Message.cpp b/cpp/lib/client/ClientMessage.cpp
index 3871d54e1c..e8a2a6019e 100644
--- a/cpp/src/qpid/client/Message.cpp
+++ b/cpp/lib/client/ClientMessage.cpp
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-#include <qpid/client/Message.h>
+#include <ClientMessage.h>
 
 using namespace qpid::client;
 using namespace qpid::framing;
diff --git a/cpp/src/qpid/client/Message.h b/cpp/lib/client/ClientMessage.h
index 28e6adc608..c1bcea3720 100644
--- a/cpp/src/qpid/client/Message.h
+++ b/cpp/lib/client/ClientMessage.h
@@ -19,7 +19,7 @@
  *
  */
 #include <string>
-#include <qpid/framing/amqp_framing.h>
+#include <framing/amqp_framing.h>
 
 #ifndef _Message_
 #define _Message_
diff --git a/cpp/src/qpid/client/Queue.cpp b/cpp/lib/client/ClientQueue.cpp
index d30cf8fc80..455bb64d0b 100644
--- a/cpp/src/qpid/client/Queue.cpp
+++ b/cpp/lib/client/ClientQueue.cpp
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-#include <qpid/client/Queue.h>
+#include <ClientQueue.h>
 
 qpid::client::Queue::Queue() : name(""), autodelete(true), exclusive(true){}
 
diff --git a/cpp/src/qpid/client/Queue.h b/cpp/lib/client/ClientQueue.h
index df7235e4ab..df7235e4ab 100644
--- a/cpp/src/qpid/client/Queue.h
+++ b/cpp/lib/client/ClientQueue.h
diff --git a/cpp/src/qpid/client/Connection.cpp b/cpp/lib/client/Connection.cpp
index de324fdab4..9c81192573 100644
--- a/cpp/src/qpid/client/Connection.cpp
+++ b/cpp/lib/client/Connection.cpp
@@ -18,12 +18,12 @@
  * under the License.
  *
  */
-#include <qpid/client/Connection.h>
-#include <qpid/client/Channel.h>
-#include <qpid/client/Message.h>
-#include <qpid/QpidError.h>
+#include <Connection.h>
+#include <ClientChannel.h>
+#include <ClientMessage.h>
+#include <QpidError.h>
 #include <iostream>
-#include <qpid/client/MethodBodyInstances.h>
+#include <MethodBodyInstances.h>
 
 using namespace qpid::client;
 using namespace qpid::framing;
@@ -216,7 +216,7 @@ void Connection::error(int code, const string& msg, int classid, int methodid){
 }
 
 void Connection::channelException(Channel* channel, AMQMethodBody* method, QpidError& e){
-    std::cout << "Caught error from channel [" << e.code << "] " << e.msg << " (" << e.file << ":" << e.line << ")" << std::endl;
+    std::cout << "Caught error from channel [" << e.code << "] " << e.msg << " (" << e.location.file << ":" << e.location.line << ")" << std::endl;
     int code = e.code == PROTOCOL_ERROR ? e.code - PROTOCOL_ERROR : 500;
     string msg = e.msg;
     if(method == 0){
diff --git a/cpp/src/qpid/client/Connection.h b/cpp/lib/client/Connection.h
index c7b1fb8dd0..2da4eb50e3 100644
--- a/cpp/src/qpid/client/Connection.h
+++ b/cpp/lib/client/Connection.h
@@ -24,18 +24,18 @@
 #ifndef _Connection_
 #define _Connection_
 
-#include <qpid/QpidError.h>
-#include <qpid/client/Connector.h>
-#include <qpid/sys/ShutdownHandler.h>
-#include <qpid/sys/TimeoutHandler.h>
-
-#include <qpid/framing/amqp_framing.h>
-#include <qpid/client/Exchange.h>
-#include <qpid/client/IncomingMessage.h>
-#include <qpid/client/Message.h>
-#include <qpid/client/MessageListener.h>
-#include <qpid/client/Queue.h>
-#include <qpid/client/ResponseHandler.h>
+#include <QpidError.h>
+#include <Connector.h>
+#include <sys/ShutdownHandler.h>
+#include <sys/TimeoutHandler.h>
+
+#include <framing/amqp_framing.h>
+#include <ClientExchange.h>
+#include <IncomingMessage.h>
+#include <ClientMessage.h>
+#include <MessageListener.h>
+#include <ClientQueue.h>
+#include <ResponseHandler.h>
 
 namespace qpid {
 namespace client {
diff --git a/cpp/src/qpid/client/Connector.cpp b/cpp/lib/client/Connector.cpp
index 86fbdc062c..2bd77c1bcd 100644
--- a/cpp/src/qpid/client/Connector.cpp
+++ b/cpp/lib/client/Connector.cpp
@@ -19,8 +19,8 @@
  *
  */
 #include <iostream>
-#include <qpid/QpidError.h>
-#include <qpid/sys/Time.h>
+#include <QpidError.h>
+#include <sys/Time.h>
 #include "Connector.h"
 
 using namespace qpid::sys;
@@ -44,6 +44,7 @@ Connector::Connector(bool _debug, u_int32_t buffer_size) :
 Connector::~Connector(){ }
 
 void Connector::connect(const std::string& host, int port){
+    socket = Socket::createTcp();
     socket.connect(host, port);
     closed = false;
     receiver = Thread(this);
@@ -92,7 +93,7 @@ void Connector::writeToSocket(char* data, size_t available){
     while(written < available && !closed){
 	ssize_t sent = socket.send(data + written, available-written);
         if(sent > 0) {
-            lastOut = Time::now().msecs();
+            lastOut = now() * TIME_MSEC;
             written += sent;
         }
     }
@@ -106,17 +107,17 @@ void Connector::handleClosed(){
 
 void Connector::checkIdle(ssize_t status){
     if(timeoutHandler){
-        int64_t now = Time::now().msecs();
+         Time t = now() * TIME_MSEC;
         if(status == Socket::SOCKET_TIMEOUT) {
-            if(idleIn && (now - lastIn > idleIn)){
+            if(idleIn && (t - lastIn > idleIn)){
                 timeoutHandler->idleIn();
             }
         }else if(status == Socket::SOCKET_EOF){
             handleClosed();
         }else{
-            lastIn = now;
+            lastIn = t;
         }
-        if(idleOut && (now - lastOut > idleOut)){
+        if(idleOut && (t - lastOut > idleOut)){
             timeoutHandler->idleOut();
         }
     }
@@ -140,7 +141,7 @@ void Connector::setWriteTimeout(u_int16_t t){
 }
 
 void Connector::setSocketTimeout(){
-    socket.setTimeout(timeout);
+    socket.setTimeout(timeout*TIME_MSEC);
 }
 
 void Connector::setTimeoutHandler(TimeoutHandler* handler){
@@ -171,7 +172,9 @@ void Connector::run(){
 	    }
 	}
     }catch(QpidError error){
-	std::cout << "Error [" << error.code << "] " << error.msg << " (" << error.file << ":" << error.line << ")" << std::endl;
+	std::cout << "Error [" << error.code << "] " << error.msg
+                  << " (" << error.location.file << ":" << error.location.line
+                  << ")" << std::endl;
         handleClosed();
     }
 }
diff --git a/cpp/src/qpid/client/Connector.h b/cpp/lib/client/Connector.h
index 08705a4eb3..c64472bd53 100644
--- a/cpp/src/qpid/client/Connector.h
+++ b/cpp/lib/client/Connector.h
@@ -22,15 +22,15 @@
 #define _Connector_
 
 
-#include <qpid/framing/InputHandler.h>
-#include <qpid/framing/OutputHandler.h>
-#include <qpid/framing/InitiationHandler.h>
-#include <qpid/framing/ProtocolInitiation.h>
-#include <qpid/sys/ShutdownHandler.h>
-#include <qpid/sys/TimeoutHandler.h>
-#include <qpid/sys/Thread.h>
-#include <qpid/sys/Monitor.h>
-#include <qpid/sys/Socket.h>
+#include <framing/InputHandler.h>
+#include <framing/OutputHandler.h>
+#include <framing/InitiationHandler.h>
+#include <framing/ProtocolInitiation.h>
+#include <sys/ShutdownHandler.h>
+#include <sys/TimeoutHandler.h>
+#include <sys/Thread.h>
+#include <sys/Monitor.h>
+#include <sys/Socket.h>
 
 namespace qpid {
 namespace client {
diff --git a/cpp/src/qpid/client/IncomingMessage.cpp b/cpp/lib/client/IncomingMessage.cpp
index 6dabc16be4..2ff143ba94 100644
--- a/cpp/src/qpid/client/IncomingMessage.cpp
+++ b/cpp/lib/client/IncomingMessage.cpp
@@ -18,8 +18,8 @@
  * under the License.
  *
  */
-#include <qpid/client/IncomingMessage.h>
-#include <qpid/QpidError.h>
+#include <IncomingMessage.h>
+#include <QpidError.h>
 #include <iostream>
 
 using namespace qpid::client;
diff --git a/cpp/src/qpid/client/IncomingMessage.h b/cpp/lib/client/IncomingMessage.h
index b72c78575e..464e05d877 100644
--- a/cpp/src/qpid/client/IncomingMessage.h
+++ b/cpp/lib/client/IncomingMessage.h
@@ -20,12 +20,12 @@
  */
 #include <string>
 #include <vector>
-#include <qpid/framing/amqp_framing.h>
+#include <framing/amqp_framing.h>
 
 #ifndef _IncomingMessage_
 #define _IncomingMessage_
 
-#include <qpid/client/Message.h>
+#include <ClientMessage.h>
 
 namespace qpid {
 namespace client {
diff --git a/cpp/lib/client/Makefile.am b/cpp/lib/client/Makefile.am
new file mode 100644
index 0000000000..28b96d7844
--- /dev/null
+++ b/cpp/lib/client/Makefile.am
@@ -0,0 +1,32 @@
+AM_CXXFLAGS = $(WARNING_CFLAGS)
+INCLUDES =				\
+  -I$(top_srcdir)/gen			\
+  -I$(top_srcdir)/lib/common		\
+  -I$(top_srcdir)/lib/common/sys	\
+  -I$(top_srcdir)/lib/common/framing	\
+  $(APR_CXXFLAGS)
+
+lib_LTLIBRARIES = libclient.la
+libclient_la_LDFLAGS = -version-info $(LIBTOOL_VERSION_INFO_ARG)
+libclient_la_SOURCES =				\
+  ClientChannel.cpp				\
+  ClientChannel.h				\
+  ClientExchange.cpp				\
+  ClientExchange.h				\
+  ClientMessage.cpp				\
+  ClientMessage.h				\
+  ClientQueue.cpp				\
+  ClientQueue.h					\
+  Connection.cpp				\
+  Connection.h					\
+  Connector.cpp					\
+  Connector.h					\
+  IncomingMessage.cpp				\
+  IncomingMessage.h				\
+  MessageListener.cpp				\
+  MessageListener.h				\
+  MethodBodyInstances.h				\
+  ResponseHandler.cpp				\
+  ResponseHandler.h				\
+  ReturnedMessageHandler.cpp			\
+  ReturnedMessageHandler.h
diff --git a/cpp/src/qpid/client/MessageListener.cpp b/cpp/lib/client/MessageListener.cpp
index 664ac06849..70d44e7040 100644
--- a/cpp/src/qpid/client/MessageListener.cpp
+++ b/cpp/lib/client/MessageListener.cpp
@@ -19,6 +19,6 @@
  *
  */
 
-#include <qpid/client/MessageListener.h>
+#include <MessageListener.h>
 
 qpid::client::MessageListener::~MessageListener() {}
diff --git a/cpp/src/qpid/client/MessageListener.h b/cpp/lib/client/MessageListener.h
index 69e3089cdb..669a8d2a05 100644
--- a/cpp/src/qpid/client/MessageListener.h
+++ b/cpp/lib/client/MessageListener.h
@@ -23,7 +23,7 @@
 #ifndef _MessageListener_
 #define _MessageListener_
 
-#include <qpid/client/Message.h>
+#include <ClientMessage.h>
 
 namespace qpid {
 namespace client {
diff --git a/cpp/src/qpid/client/MethodBodyInstances.h b/cpp/lib/client/MethodBodyInstances.h
index f961ad183b..7663a8b3ae 100644
--- a/cpp/src/qpid/client/MethodBodyInstances.h
+++ b/cpp/lib/client/MethodBodyInstances.h
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-#include <qpid/framing/amqp_framing.h>
+#include <framing/amqp_framing.h>
 
 /**
  * This file replaces the auto-generated instances in the former
diff --git a/cpp/src/qpid/client/ResponseHandler.cpp b/cpp/lib/client/ResponseHandler.cpp
index 4e14d9938b..ac8b4a9ced 100644
--- a/cpp/src/qpid/client/ResponseHandler.cpp
+++ b/cpp/lib/client/ResponseHandler.cpp
@@ -18,9 +18,9 @@
  * under the License.
  *
  */
-#include <qpid/client/ResponseHandler.h>
-#include <qpid/sys/Monitor.h>
-#include <qpid/QpidError.h>
+#include <ResponseHandler.h>
+#include <sys/Monitor.h>
+#include <QpidError.h>
 
 using namespace qpid::sys;
 
diff --git a/cpp/src/qpid/client/ResponseHandler.h b/cpp/lib/client/ResponseHandler.h
index 7584ed6419..c3d499d046 100644
--- a/cpp/src/qpid/client/ResponseHandler.h
+++ b/cpp/lib/client/ResponseHandler.h
@@ -19,8 +19,8 @@
  *
  */
 #include <string>
-#include <qpid/framing/amqp_framing.h>
-#include <qpid/sys/Monitor.h>
+#include <framing/amqp_framing.h>
+#include <sys/Monitor.h>
 
 #ifndef _ResponseHandler_
 #define _ResponseHandler_
diff --git a/cpp/src/qpid/client/ReturnedMessageHandler.cpp b/cpp/lib/client/ReturnedMessageHandler.cpp
index 099477c06b..ee9f7462ef 100644
--- a/cpp/src/qpid/client/ReturnedMessageHandler.cpp
+++ b/cpp/lib/client/ReturnedMessageHandler.cpp
@@ -19,6 +19,6 @@
  *
  */
 
-#include <qpid/client/ReturnedMessageHandler.h>
+#include <ReturnedMessageHandler.h>
 
 qpid::client::ReturnedMessageHandler::~ReturnedMessageHandler() {}
diff --git a/cpp/src/qpid/client/ReturnedMessageHandler.h b/cpp/lib/client/ReturnedMessageHandler.h
index c1b5ee92f1..2b5edbe2ea 100644
--- a/cpp/src/qpid/client/ReturnedMessageHandler.h
+++ b/cpp/lib/client/ReturnedMessageHandler.h
@@ -23,7 +23,7 @@
 #ifndef _ReturnedMessageHandler_
 #define _ReturnedMessageHandler_
 
-#include <qpid/client/Message.h>
+#include <ClientMessage.h>
 
 namespace qpid {
 namespace client {
diff --git a/cpp/lib/common/Exception.cpp b/cpp/lib/common/Exception.cpp
new file mode 100644
index 0000000000..0161518011
--- /dev/null
+++ b/cpp/lib/common/Exception.cpp
@@ -0,0 +1,42 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+#include <Exception.h>
+
+namespace qpid {
+
+Exception::Exception() throw() {}
+
+Exception::Exception(const std::string& str) throw() : whatStr(str) {}
+
+Exception::Exception(const char* str) throw() : whatStr(str) {}
+
+Exception::~Exception() throw() {}
+
+const char* Exception::what() const throw() { return whatStr.c_str(); }
+
+std::string Exception::toString() const throw() { return whatStr; }
+
+Exception* Exception::clone() const throw() { return new Exception(*this); }
+
+void Exception::throwSelf() const  { throw *this; }
+
+} // namespace qpid
diff --git a/cpp/lib/common/Exception.h b/cpp/lib/common/Exception.h
new file mode 100644
index 0000000000..f35d427bb0
--- /dev/null
+++ b/cpp/lib/common/Exception.h
@@ -0,0 +1,61 @@
+#ifndef _Exception_
+#define _Exception_
+
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+#include <exception>
+#include <string>
+#include <memory>
+#include <boost/shared_ptr.hpp>
+
+namespace qpid
+{
+/**
+ * Exception base class for all Qpid exceptions.
+ */
+class Exception : public std::exception
+{
+  protected:
+    std::string whatStr;
+
+  public:
+    Exception() throw();
+    Exception(const std::string& str) throw();
+    Exception(const char* str) throw();
+    Exception(const std::exception&) throw();
+
+    virtual ~Exception() throw();
+
+    virtual const char* what() const throw();
+    virtual std::string toString() const throw();
+
+    virtual Exception* clone() const throw();
+    virtual void throwSelf() const;
+
+    typedef boost::shared_ptr<Exception> shared_ptr;
+};
+
+
+
+}
+
+#endif  /*!_Exception_*/
diff --git a/cpp/src/qpid/posix/EpollEventChannel.h b/cpp/lib/common/ExceptionHolder.cpp
index 8128d5276f..de8d7b2487 100644
--- a/cpp/src/qpid/posix/EpollEventChannel.h
+++ b/cpp/lib/common/ExceptionHolder.cpp
@@ -16,33 +16,17 @@
  *
  */
 
-#include <qpid/sys/EventChannel.h>
+#include "ExceptionHolder.h"
 
 namespace qpid {
-namespace sys {
 
-/** Epoll-based implementation of the event channel */
-class EpollEventChannel : public EventChannel
-{
-  public:
+ExceptionHolder::ExceptionHolder(const std::exception& e) {
+    const Exception* ex = dynamic_cast<const Exception*>(&e);
+    if (ex) {
+        reset(ex->clone());
+    } else {
+        reset(new Exception(e.what()));
+    }
+}
 
-    EpollEventChannel();
-    ~EpollEventChannel();
-
-    virtual void post(ReadEvent& event);
-    virtual void post(WriteEvent& event);
-    virtual void post(AcceptEvent& event);
-    virtual void post(NotifyEvent& event);
-
-    inline void post(Event& event);
-
-    virtual Event* getEvent();
-
-    virtual void dispose(void* buffer, size_t size);
-
-  private:
-    int epollFd;
-    
-};
-
-}}
+}
diff --git a/cpp/lib/common/ExceptionHolder.h b/cpp/lib/common/ExceptionHolder.h
new file mode 100644
index 0000000000..83d0884be9
--- /dev/null
+++ b/cpp/lib/common/ExceptionHolder.h
@@ -0,0 +1,62 @@
+#ifndef _qpid_ExceptionHolder_h
+#define _qpid_ExceptionHolder_h
+
+/*
+ *
+ * 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.
+ *
+ */
+
+#include <Exception.h>
+#include <boost/shared_ptr.hpp>
+
+namespace qpid {
+
+/**
+ * Holder for a heap-allocated exc eption that can be stack allocated
+ * and thrown safely.
+ *
+ * Basically this is a shared_ptr with the Exception functions added
+ * so the catcher need not be aware that it is a pointer rather than a
+ * reference.
+ * 
+ * shared_ptr is chosen over auto_ptr because it has normal 
+ * copy semantics. 
+ */
+class ExceptionHolder : public Exception, public boost::shared_ptr<Exception>
+{
+  public:
+    typedef boost::shared_ptr<Exception> shared_ptr;
+
+    ExceptionHolder() throw() {}
+    ExceptionHolder(Exception* p) throw() : shared_ptr(p) {}
+    ExceptionHolder(shared_ptr p) throw() : shared_ptr(p) {}
+
+    ExceptionHolder(const Exception& e) throw() : shared_ptr(e.clone()) {}
+    ExceptionHolder(const std::exception& e);
+
+    ~ExceptionHolder() throw() {}
+
+    const char* what() const throw() { return (*this)->what(); }
+    std::string toString() const throw() { return (*this)->toString(); }
+    virtual Exception* clone() const throw() { return (*this)->clone(); }
+    virtual void throwSelf() const { (*this)->throwSelf(); }
+};
+
+} // namespace qpid
+
+
+
+#endif  /*!_qpid_ExceptionHolder_h*/
diff --git a/cpp/lib/common/Makefile.am b/cpp/lib/common/Makefile.am
new file mode 100644
index 0000000000..ed2ccd61a8
--- /dev/null
+++ b/cpp/lib/common/Makefile.am
@@ -0,0 +1,116 @@
+AM_CXXFLAGS = $(WARNING_CFLAGS)
+
+INCLUDES =				\
+  -I$(top_srcdir)/gen			\
+  -I$(top_srcdir)/lib/common/sys	\
+  -I$(top_srcdir)/lib/common/framing	\
+  $(APR_CXXFLAGS)
+
+apr = sys/apr
+apr_src =			\
+  $(apr)/APRAcceptor.cpp	\
+  $(apr)/APRBase.cpp		\
+  $(apr)/APRBase.h		\
+  $(apr)/APRPool.cpp		\
+  $(apr)/APRPool.h		\
+  $(apr)/APRSocket.cpp		\
+  $(apr)/APRSocket.h		\
+  $(apr)/LFProcessor.cpp	\
+  $(apr)/LFProcessor.h		\
+  $(apr)/LFSessionContext.cpp	\
+  $(apr)/LFSessionContext.h	\
+  $(apr)/Socket.cpp		\
+  $(apr)/Thread.cpp
+
+posix = sys/posix
+posix_src =					\
+  $(posix)/PosixAcceptor.cpp			\
+  $(posix)/Socket.cpp				\
+  $(posix)/Thread.cpp				\
+  $(posix)/check.cpp				\
+  $(posix)/check.h				\
+  $(posix)/EventChannel.cpp			\
+  $(posix)/EventChannel.h			\
+  $(posix)/EventChannelThreads.cpp		\
+  $(posix)/EventChannelThreads.h
+
+EXTRA_DIST=$(posix_src)
+platform_src = $(apr_src)
+
+framing = framing
+gen     = $(srcdir)/../../gen
+
+lib_LTLIBRARIES = libcommon.la
+libcommon_la_LIBADD =		\
+  $(APR_LIBS)			\
+  $(LIB_DLOPEN)			\
+  $(LIB_CLOCK_GETTIME)
+
+libcommon_la_LDFLAGS =		\
+  -version-info			\
+  $(LIBTOOL_VERSION_INFO_ARG)
+
+libcommon_la_SOURCES =				\
+  $(platform_src)				\
+  $(framing)/AMQBody.cpp			\
+  $(framing)/AMQBody.h				\
+  $(framing)/AMQContentBody.cpp			\
+  $(framing)/AMQContentBody.h			\
+  $(framing)/AMQDataBlock.h			\
+  $(framing)/AMQFrame.cpp			\
+  $(framing)/AMQFrame.h				\
+  $(framing)/AMQHeaderBody.cpp			\
+  $(framing)/AMQHeaderBody.h			\
+  $(framing)/AMQHeartbeatBody.cpp		\
+  $(framing)/AMQHeartbeatBody.h			\
+  $(framing)/AMQMethodBody.cpp			\
+  $(framing)/AMQMethodBody.h			\
+  $(framing)/BasicHeaderProperties.cpp		\
+  $(framing)/BasicHeaderProperties.h		\
+  $(framing)/BodyHandler.cpp			\
+  $(framing)/BodyHandler.h			\
+  $(framing)/Buffer.cpp				\
+  $(framing)/Buffer.h				\
+  $(framing)/FieldTable.cpp			\
+  $(framing)/FieldTable.h			\
+  $(framing)/HeaderProperties.h			\
+  $(framing)/InitiationHandler.cpp		\
+  $(framing)/InitiationHandler.h		\
+  $(framing)/InputHandler.h			\
+  $(framing)/OutputHandler.h			\
+  $(framing)/ProtocolInitiation.cpp		\
+  $(framing)/ProtocolInitiation.h		\
+  $(framing)/ProtocolVersion.cpp		\
+  $(framing)/ProtocolVersion.h			\
+  $(framing)/ProtocolVersionException.cpp	\
+  $(framing)/ProtocolVersionException.h		\
+  $(framing)/Value.cpp				\
+  $(framing)/Value.h				\
+  $(framing)/amqp_framing.h			\
+  $(framing)/amqp_types.h			\
+  $(gen)/AMQP_ClientProxy.cpp			\
+  $(gen)/AMQP_MethodVersionMap.cpp		\
+  $(gen)/AMQP_ServerProxy.cpp			\
+  Exception.cpp					\
+  Exception.h					\
+  ExceptionHolder.cpp				\
+  ExceptionHolder.h				\
+  QpidError.cpp					\
+  QpidError.h					\
+  SharedObject.h				\
+  sys/Acceptor.h				\
+  sys/AtomicCount.h				\
+  sys/Module.h					\
+  sys/Monitor.h					\
+  sys/Mutex.h					\
+  sys/Runnable.cpp				\
+  sys/Runnable.h				\
+  sys/SessionContext.h				\
+  sys/SessionHandler.h				\
+  sys/SessionHandlerFactory.h			\
+  sys/ShutdownHandler.h				\
+  sys/Socket.h					\
+  sys/Thread.h					\
+  sys/Time.cpp					\
+  sys/Time.h					\
+  sys/TimeoutHandler.h
diff --git a/cpp/src/qpid/QpidError.cpp b/cpp/lib/common/QpidError.cpp
index 0b5135269b..7f4f9e2f34 100644
--- a/cpp/src/qpid/QpidError.cpp
+++ b/cpp/lib/common/QpidError.cpp
@@ -19,17 +19,26 @@
  *
  */
 
-#include <qpid/QpidError.h>
+#include <QpidError.h>
 #include <sstream>
 
 using namespace qpid;
 
-QpidError::QpidError(int _code, const std::string& _msg, const std::string& _file, int _line) throw()
-    : code(_code), msg(_msg), file(_file), line(_line) 
+QpidError::QpidError() : code(0) {}
+
+QpidError::QpidError(int _code, const std::string& _msg,
+                     const SrcLine& _loc) throw()
+    : code(_code), msg(_msg), location(_loc)
 {
     std::ostringstream os;
-    os << "QpidError(" << code << ") " << msg << " (" << file << ":" << line << ")";
+    os << "Error [" << code << "] " << msg << " ("
+       << location.file << ":" << location.line << ")";
     whatStr = os.str();
 }
 
 QpidError::~QpidError() throw() {}
+
+Exception* QpidError::clone() const throw() { return new QpidError(*this); }
+
+void QpidError::throwSelf() const  { throw *this; }
+
diff --git a/cpp/lib/common/QpidError.h b/cpp/lib/common/QpidError.h
new file mode 100644
index 0000000000..30d9d27076
--- /dev/null
+++ b/cpp/lib/common/QpidError.h
@@ -0,0 +1,67 @@
+#ifndef __QpidError__
+#define __QpidError__
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+#include <string>
+#include <memory>
+#include <ostream>
+#include <Exception.h>
+
+namespace qpid {
+
+struct SrcLine {
+  public:
+    SrcLine(const std::string& file_="", int line_=0) :
+        file(file_), line(line_) {}
+
+    std::string file;
+    int line;
+};
+    
+class QpidError : public Exception { 
+  public:
+    const int code;
+    const std::string msg;
+    const SrcLine location;
+
+    QpidError();
+    QpidError(int _code, const std::string& _msg, const SrcLine& _loc) throw();
+    ~QpidError() throw();
+    Exception* clone() const throw();
+    void throwSelf() const;
+};
+
+
+} // namespace qpid
+
+#define SRCLINE ::qpid::SrcLine(__FILE__, __LINE__)
+
+#define QPID_ERROR(CODE, MESSAGE) ::qpid::QpidError((CODE), (MESSAGE), SRCLINE)
+
+#define THROW_QPID_ERROR(CODE, MESSAGE) throw QPID_ERROR(CODE,MESSAGE)
+
+const int PROTOCOL_ERROR = 10000;
+const int APR_ERROR = 20000;
+const int FRAMING_ERROR = 30000;
+const int CLIENT_ERROR = 40000;
+const int INTERNAL_ERROR = 50000;
+
+#endif
diff --git a/cpp/src/qpid/SharedObject.h b/cpp/lib/common/SharedObject.h
index 852a036ab9..852a036ab9 100644
--- a/cpp/src/qpid/SharedObject.h
+++ b/cpp/lib/common/SharedObject.h
diff --git a/cpp/src/qpid/framing/AMQBody.cpp b/cpp/lib/common/framing/AMQBody.cpp
index ee5c9d4101..b095312a16 100644
--- a/cpp/src/qpid/framing/AMQBody.cpp
+++ b/cpp/lib/common/framing/AMQBody.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include <qpid/framing/AMQBody.h>
+#include <AMQBody.h>
 #include <iostream>
 
 std::ostream& qpid::framing::operator<<(std::ostream& out, const qpid::framing::AMQBody& body) 
diff --git a/cpp/src/qpid/framing/AMQBody.h b/cpp/lib/common/framing/AMQBody.h
index 866cd41adb..5547d3c506 100644
--- a/cpp/src/qpid/framing/AMQBody.h
+++ b/cpp/lib/common/framing/AMQBody.h
@@ -19,8 +19,8 @@
  *
  */
 #include <boost/shared_ptr.hpp>
-#include <qpid/framing/amqp_types.h>
-#include <qpid/framing/Buffer.h>
+#include <amqp_types.h>
+#include <Buffer.h>
 
 #ifndef _AMQBody_
 #define _AMQBody_
diff --git a/cpp/src/qpid/framing/AMQContentBody.cpp b/cpp/lib/common/framing/AMQContentBody.cpp
index d064943e61..4f51dca243 100644
--- a/cpp/src/qpid/framing/AMQContentBody.cpp
+++ b/cpp/lib/common/framing/AMQContentBody.cpp
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-#include <qpid/framing/AMQContentBody.h>
+#include <AMQContentBody.h>
 #include <iostream>
 
 qpid::framing::AMQContentBody::AMQContentBody(){
diff --git a/cpp/src/qpid/framing/AMQContentBody.h b/cpp/lib/common/framing/AMQContentBody.h
index 80f837fba3..172228671a 100644
--- a/cpp/src/qpid/framing/AMQContentBody.h
+++ b/cpp/lib/common/framing/AMQContentBody.h
@@ -18,9 +18,9 @@
  * under the License.
  *
  */
-#include <qpid/framing/amqp_types.h>
-#include <qpid/framing/AMQBody.h>
-#include <qpid/framing/Buffer.h>
+#include <amqp_types.h>
+#include <AMQBody.h>
+#include <Buffer.h>
 
 #ifndef _AMQContentBody_
 #define _AMQContentBody_
diff --git a/cpp/src/qpid/framing/AMQDataBlock.h b/cpp/lib/common/framing/AMQDataBlock.h
index 3f9030cf34..ac91c52164 100644
--- a/cpp/src/qpid/framing/AMQDataBlock.h
+++ b/cpp/lib/common/framing/AMQDataBlock.h
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-#include <qpid/framing/Buffer.h>
+#include <Buffer.h>
 
 #ifndef _AMQDataBlock_
 #define _AMQDataBlock_
diff --git a/cpp/src/qpid/framing/AMQFrame.cpp b/cpp/lib/common/framing/AMQFrame.cpp
index b58bc93545..ca8bf41758 100644
--- a/cpp/src/qpid/framing/AMQFrame.cpp
+++ b/cpp/lib/common/framing/AMQFrame.cpp
@@ -19,25 +19,29 @@
  * under the License.
  *
  */
-#include <qpid/framing/AMQFrame.h>
-#include <qpid/QpidError.h>
+#include <AMQFrame.h>
+#include <QpidError.h>
 
 using namespace qpid::framing;
 
-// AMQP version management change - kpvdr 2006-11-17
-// TODO: Make this class version-aware and link these hard-wired numbers to that version
-AMQFrame::AMQFrame() : versionMap(8, 0) {}
+// This only works as a static as the version is currently fixed to 8.0
+// TODO: When the class is version-aware this will need to change
+AMQP_MethodVersionMap AMQFrame::versionMap(8,0);
+
+// AMQP version management change - kpvdr 2-11-17
+// TODO: Make this class version-aware
+AMQFrame::AMQFrame() {}
 
 // AMQP version management change - kpvdr 2006-11-17
-// TODO: Make this class version-aware and link these hard-wired numbers to that version
+// TODO: Make this class version-aware
 AMQFrame::AMQFrame(u_int16_t _channel, AMQBody* _body) :
-channel(_channel), body(_body), versionMap(8, 0)
+channel(_channel), body(_body)
 {}
 
 // AMQP version management change - kpvdr 2006-11-17
-// TODO: Make this class version-aware and link these hard-wired numbers to that version
+// TODO: Make this class version-aware
 AMQFrame::AMQFrame(u_int16_t _channel, AMQBody::shared_ptr& _body) :
-channel(_channel), body(_body), versionMap(8, 0)
+channel(_channel), body(_body)
 {}
 
 AMQFrame::~AMQFrame() {}
diff --git a/cpp/src/qpid/framing/AMQFrame.h b/cpp/lib/common/framing/AMQFrame.h
index 29ee1250e1..bec1946fb7 100644
--- a/cpp/src/qpid/framing/AMQFrame.h
+++ b/cpp/lib/common/framing/AMQFrame.h
@@ -19,15 +19,15 @@
  *
  */
 /*#include <qpid/framing/amqp_methods.h>*/
-#include <qpid/framing/amqp_types.h>
-#include <qpid/framing/AMQBody.h>
-#include <qpid/framing/AMQDataBlock.h>
-#include <qpid/framing/AMQMethodBody.h>
-#include <qpid/framing/AMQHeaderBody.h>
-#include <qpid/framing/AMQContentBody.h>
-#include <qpid/framing/AMQHeartbeatBody.h>
-#include <qpid/framing/AMQP_MethodVersionMap.h>
-#include <qpid/framing/Buffer.h>
+#include <amqp_types.h>
+#include <AMQBody.h>
+#include <AMQDataBlock.h>
+#include <AMQMethodBody.h>
+#include <AMQHeaderBody.h>
+#include <AMQContentBody.h>
+#include <AMQHeartbeatBody.h>
+#include <AMQP_MethodVersionMap.h>
+#include <Buffer.h>
 
 #ifndef _AMQFrame_
 #define _AMQFrame_
@@ -37,10 +37,11 @@ namespace qpid {
 
         class AMQFrame : virtual public AMQDataBlock
         {
+            static AMQP_MethodVersionMap versionMap;
+            
             u_int16_t channel;
             u_int8_t type;//used if the body is decoded separately from the 'head'
             AMQBody::shared_ptr body;
-            AMQP_MethodVersionMap versionMap;
 			AMQBody::shared_ptr createMethodBody(Buffer& buffer);
             
         public:
diff --git a/cpp/src/qpid/framing/AMQHeaderBody.cpp b/cpp/lib/common/framing/AMQHeaderBody.cpp
index 5746abfab5..3653073f29 100644
--- a/cpp/src/qpid/framing/AMQHeaderBody.cpp
+++ b/cpp/lib/common/framing/AMQHeaderBody.cpp
@@ -18,9 +18,9 @@
  * under the License.
  *
  */
-#include <qpid/framing/AMQHeaderBody.h>
-#include <qpid/QpidError.h>
-#include <qpid/framing/BasicHeaderProperties.h>
+#include <AMQHeaderBody.h>
+#include <QpidError.h>
+#include <BasicHeaderProperties.h>
 
 qpid::framing::AMQHeaderBody::AMQHeaderBody(int classId) : weight(0), contentSize(0){
     createProperties(classId);
diff --git a/cpp/src/qpid/framing/AMQHeaderBody.h b/cpp/lib/common/framing/AMQHeaderBody.h
index 3af26c6a00..31cf7d575e 100644
--- a/cpp/src/qpid/framing/AMQHeaderBody.h
+++ b/cpp/lib/common/framing/AMQHeaderBody.h
@@ -18,10 +18,10 @@
  * under the License.
  *
  */
-#include <qpid/framing/amqp_types.h>
-#include <qpid/framing/AMQBody.h>
-#include <qpid/framing/Buffer.h>
-#include <qpid/framing/HeaderProperties.h>
+#include <amqp_types.h>
+#include <AMQBody.h>
+#include <Buffer.h>
+#include <HeaderProperties.h>
 
 #ifndef _AMQHeaderBody_
 #define _AMQHeaderBody_
diff --git a/cpp/src/qpid/framing/AMQHeartbeatBody.cpp b/cpp/lib/common/framing/AMQHeartbeatBody.cpp
index 91f1dd01f4..63f83a3d29 100644
--- a/cpp/src/qpid/framing/AMQHeartbeatBody.cpp
+++ b/cpp/lib/common/framing/AMQHeartbeatBody.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include <qpid/framing/AMQHeartbeatBody.h>
+#include <AMQHeartbeatBody.h>
 #include <iostream>
 
 qpid::framing::AMQHeartbeatBody::~AMQHeartbeatBody() {}
diff --git a/cpp/src/qpid/framing/AMQHeartbeatBody.h b/cpp/lib/common/framing/AMQHeartbeatBody.h
index 60d6fae18a..a2315119e4 100644
--- a/cpp/src/qpid/framing/AMQHeartbeatBody.h
+++ b/cpp/lib/common/framing/AMQHeartbeatBody.h
@@ -18,9 +18,9 @@
  * under the License.
  *
  */
-#include <qpid/framing/amqp_types.h>
-#include <qpid/framing/AMQBody.h>
-#include <qpid/framing/Buffer.h>
+#include <amqp_types.h>
+#include <AMQBody.h>
+#include <Buffer.h>
 
 #ifndef _AMQHeartbeatBody_
 #define _AMQHeartbeatBody_
diff --git a/cpp/src/qpid/framing/AMQMethodBody.cpp b/cpp/lib/common/framing/AMQMethodBody.cpp
index e8a4244c6f..525310f3d4 100644
--- a/cpp/src/qpid/framing/AMQMethodBody.cpp
+++ b/cpp/lib/common/framing/AMQMethodBody.cpp
@@ -18,8 +18,8 @@
  * under the License.
  *
  */
-#include <qpid/framing/AMQMethodBody.h>
-#include <qpid/QpidError.h>
+#include <AMQMethodBody.h>
+#include <QpidError.h>
 
 void qpid::framing::AMQMethodBody::encode(Buffer& buffer) const{
     buffer.putShort(amqpClassId());
diff --git a/cpp/src/qpid/framing/AMQMethodBody.h b/cpp/lib/common/framing/AMQMethodBody.h
index e6e592761e..da25c7c545 100644
--- a/cpp/src/qpid/framing/AMQMethodBody.h
+++ b/cpp/lib/common/framing/AMQMethodBody.h
@@ -19,10 +19,10 @@
  *
  */
 #include <iostream>
-#include <qpid/framing/amqp_types.h>
-#include <qpid/framing/AMQBody.h>
-#include <qpid/framing/Buffer.h>
-#include <qpid/framing/AMQP_ServerOperations.h>
+#include <amqp_types.h>
+#include <AMQBody.h>
+#include <Buffer.h>
+#include <AMQP_ServerOperations.h>
 
 #ifndef _AMQMethodBody_
 #define _AMQMethodBody_
diff --git a/cpp/src/qpid/framing/BasicHeaderProperties.cpp b/cpp/lib/common/framing/BasicHeaderProperties.cpp
index 655accc771..f673215536 100644
--- a/cpp/src/qpid/framing/BasicHeaderProperties.cpp
+++ b/cpp/lib/common/framing/BasicHeaderProperties.cpp
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-#include <qpid/framing/BasicHeaderProperties.h>
+#include <BasicHeaderProperties.h>
 
 //TODO: This could be easily generated from the spec
 
diff --git a/cpp/src/qpid/framing/BasicHeaderProperties.h b/cpp/lib/common/framing/BasicHeaderProperties.h
index 6dbfd55a5c..bcd81b4776 100644
--- a/cpp/src/qpid/framing/BasicHeaderProperties.h
+++ b/cpp/lib/common/framing/BasicHeaderProperties.h
@@ -18,10 +18,10 @@
  * under the License.
  *
  */
-#include <qpid/framing/amqp_types.h>
-#include <qpid/framing/Buffer.h>
-#include <qpid/framing/FieldTable.h>
-#include <qpid/framing/HeaderProperties.h>
+#include <amqp_types.h>
+#include <Buffer.h>
+#include <FieldTable.h>
+#include <HeaderProperties.h>
 
 #ifndef _BasicHeaderProperties_
 #define _BasicHeaderProperties_
diff --git a/cpp/src/qpid/framing/BodyHandler.cpp b/cpp/lib/common/framing/BodyHandler.cpp
index c96be5fbd7..8ccfb222df 100644
--- a/cpp/src/qpid/framing/BodyHandler.cpp
+++ b/cpp/lib/common/framing/BodyHandler.cpp
@@ -19,7 +19,7 @@
  *
  */
 #include <boost/shared_ptr.hpp>
-#include <qpid/framing/BodyHandler.h>
+#include <BodyHandler.h>
 
 using namespace qpid::framing;
 using namespace boost;
diff --git a/cpp/src/qpid/framing/BodyHandler.h b/cpp/lib/common/framing/BodyHandler.h
index 1825b0319a..3923258d1c 100644
--- a/cpp/src/qpid/framing/BodyHandler.h
+++ b/cpp/lib/common/framing/BodyHandler.h
@@ -23,10 +23,10 @@
 #ifndef _BodyHandler_
 #define _BodyHandler_
 
-#include <qpid/framing/AMQMethodBody.h>
-#include <qpid/framing/AMQHeaderBody.h>
-#include <qpid/framing/AMQContentBody.h>
-#include <qpid/framing/AMQHeartbeatBody.h>
+#include <AMQMethodBody.h>
+#include <AMQHeaderBody.h>
+#include <AMQContentBody.h>
+#include <AMQHeartbeatBody.h>
 
 namespace qpid {
 namespace framing {
diff --git a/cpp/src/qpid/framing/Buffer.cpp b/cpp/lib/common/framing/Buffer.cpp
index d39556120d..f25b2a47c0 100644
--- a/cpp/src/qpid/framing/Buffer.cpp
+++ b/cpp/lib/common/framing/Buffer.cpp
@@ -18,8 +18,8 @@
  * under the License.
  *
  */
-#include <qpid/framing/Buffer.h>
-#include <qpid/framing/FieldTable.h> 
+#include <Buffer.h>
+#include <FieldTable.h> 
 
 qpid::framing::Buffer::Buffer(u_int32_t _size) : size(_size), owner(true), position(0), limit(_size){
     data = new char[size];
diff --git a/cpp/src/qpid/framing/Buffer.h b/cpp/lib/common/framing/Buffer.h
index 3e6a9b98d4..92a25ee4c8 100644
--- a/cpp/src/qpid/framing/Buffer.h
+++ b/cpp/lib/common/framing/Buffer.h
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-#include <qpid/framing/amqp_types.h>
+#include <amqp_types.h>
 
 #ifndef _Buffer_
 #define _Buffer_
diff --git a/cpp/src/qpid/framing/FieldTable.cpp b/cpp/lib/common/framing/FieldTable.cpp
index 1c24ca3aff..cf16e87272 100644
--- a/cpp/src/qpid/framing/FieldTable.cpp
+++ b/cpp/lib/common/framing/FieldTable.cpp
@@ -18,10 +18,10 @@
  * under the License.
  *
  */
-#include <qpid/framing/FieldTable.h>
-#include <qpid/QpidError.h>
-#include <qpid/framing/Buffer.h>
-#include <qpid/framing/Value.h>
+#include <FieldTable.h>
+#include <QpidError.h>
+#include <Buffer.h>
+#include <Value.h>
 #include <assert.h>
 
 namespace qpid {
diff --git a/cpp/src/qpid/framing/FieldTable.h b/cpp/lib/common/framing/FieldTable.h
index c8ed218aed..3d09cdec64 100644
--- a/cpp/src/qpid/framing/FieldTable.h
+++ b/cpp/lib/common/framing/FieldTable.h
@@ -22,7 +22,7 @@
 #include <vector>
 #include <boost/shared_ptr.hpp>
 #include <map>
-#include <qpid/framing/amqp_types.h>
+#include <amqp_types.h>
 
 #ifndef _FieldTable_
 #define _FieldTable_
diff --git a/cpp/src/qpid/framing/HeaderProperties.h b/cpp/lib/common/framing/HeaderProperties.h
index c2d6b9f199..7a8c65549d 100644
--- a/cpp/src/qpid/framing/HeaderProperties.h
+++ b/cpp/lib/common/framing/HeaderProperties.h
@@ -18,8 +18,8 @@
  * under the License.
  *
  */
-#include <qpid/framing/amqp_types.h>
-#include <qpid/framing/Buffer.h>
+#include <amqp_types.h>
+#include <Buffer.h>
 
 #ifndef _HeaderProperties_
 #define _HeaderProperties_
diff --git a/cpp/src/qpid/framing/InitiationHandler.cpp b/cpp/lib/common/framing/InitiationHandler.cpp
index aad67be6d0..dd92c9859b 100644
--- a/cpp/src/qpid/framing/InitiationHandler.cpp
+++ b/cpp/lib/common/framing/InitiationHandler.cpp
@@ -19,6 +19,6 @@
  *
  */
 
-#include <qpid/framing/InitiationHandler.h>
+#include <InitiationHandler.h>
 
 qpid::framing::InitiationHandler::~InitiationHandler() {}
diff --git a/cpp/src/qpid/framing/InitiationHandler.h b/cpp/lib/common/framing/InitiationHandler.h
index a527a23ca2..d94fc58d2c 100644
--- a/cpp/src/qpid/framing/InitiationHandler.h
+++ b/cpp/lib/common/framing/InitiationHandler.h
@@ -23,7 +23,7 @@
 #ifndef _InitiationHandler_
 #define _InitiationHandler_
 
-#include <qpid/framing/ProtocolInitiation.h>
+#include <ProtocolInitiation.h>
 
 namespace qpid {
 namespace framing {
diff --git a/cpp/src/qpid/framing/InputHandler.h b/cpp/lib/common/framing/InputHandler.h
index 6924e2ff70..4e2d4bcc9b 100644
--- a/cpp/src/qpid/framing/InputHandler.h
+++ b/cpp/lib/common/framing/InputHandler.h
@@ -21,7 +21,7 @@
  *
  */
 
-#include <qpid/framing/AMQFrame.h>
+#include <AMQFrame.h>
 #include <boost/noncopyable.hpp>
 
 namespace qpid {
diff --git a/cpp/src/qpid/framing/OutputHandler.h b/cpp/lib/common/framing/OutputHandler.h
index 1d444236be..2e01e34df2 100644
--- a/cpp/src/qpid/framing/OutputHandler.h
+++ b/cpp/lib/common/framing/OutputHandler.h
@@ -22,7 +22,7 @@
  *
  */
 #include <boost/noncopyable.hpp>
-#include <qpid/framing/AMQFrame.h>
+#include <AMQFrame.h>
 
 namespace qpid {
 namespace framing {
diff --git a/cpp/src/qpid/framing/ProtocolInitiation.cpp b/cpp/lib/common/framing/ProtocolInitiation.cpp
index 22a2bd44e5..471f736a7d 100644
--- a/cpp/src/qpid/framing/ProtocolInitiation.cpp
+++ b/cpp/lib/common/framing/ProtocolInitiation.cpp
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-#include <qpid/framing/ProtocolInitiation.h>
+#include <ProtocolInitiation.h>
 
 qpid::framing::ProtocolInitiation::ProtocolInitiation(){}
 
diff --git a/cpp/src/qpid/framing/ProtocolInitiation.h b/cpp/lib/common/framing/ProtocolInitiation.h
index 77c64363dd..003c3bba81 100644
--- a/cpp/src/qpid/framing/ProtocolInitiation.h
+++ b/cpp/lib/common/framing/ProtocolInitiation.h
@@ -18,10 +18,10 @@
  * under the License.
  *
  */
-#include <qpid/framing/amqp_types.h>
-#include <qpid/framing/Buffer.h>
-#include <qpid/framing/AMQDataBlock.h>
-#include <qpid/framing/ProtocolVersion.h>
+#include <amqp_types.h>
+#include <Buffer.h>
+#include <AMQDataBlock.h>
+#include <ProtocolVersion.h>
 
 #ifndef _ProtocolInitiation_
 #define _ProtocolInitiation_
diff --git a/cpp/src/qpid/framing/ProtocolVersion.cpp b/cpp/lib/common/framing/ProtocolVersion.cpp
index 4d9b954f99..69ff89ec32 100644
--- a/cpp/src/qpid/framing/ProtocolVersion.cpp
+++ b/cpp/lib/common/framing/ProtocolVersion.cpp
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-#include <qpid/framing/ProtocolVersion.h>
+#include <ProtocolVersion.h>
 #include <sstream>
 
 using namespace qpid::framing;
diff --git a/cpp/src/qpid/framing/ProtocolVersion.h b/cpp/lib/common/framing/ProtocolVersion.h
index 3dbbd18535..331cf53555 100644
--- a/cpp/src/qpid/framing/ProtocolVersion.h
+++ b/cpp/lib/common/framing/ProtocolVersion.h
@@ -21,7 +21,7 @@
 #ifndef _ProtocolVersion_
 #define _ProtocolVersion_
 
-#include <qpid/framing/amqp_types.h>
+#include <amqp_types.h>
 
 namespace qpid
 {
diff --git a/cpp/src/qpid/framing/ProtocolVersionException.cpp b/cpp/lib/common/framing/ProtocolVersionException.cpp
index 31357f1f4a..8249a88f4b 100644
--- a/cpp/src/qpid/framing/ProtocolVersionException.cpp
+++ b/cpp/lib/common/framing/ProtocolVersionException.cpp
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-#include <qpid/framing/ProtocolVersionException.h>
+#include <ProtocolVersionException.h>
 #include <sstream>
 
 using namespace qpid::framing;
diff --git a/cpp/src/qpid/framing/ProtocolVersionException.h b/cpp/lib/common/framing/ProtocolVersionException.h
index 956733224b..4494d87064 100644
--- a/cpp/src/qpid/framing/ProtocolVersionException.h
+++ b/cpp/lib/common/framing/ProtocolVersionException.h
@@ -22,8 +22,8 @@
 #ifndef _ProtocolVersionException_
 #define _ProtocolVersionException_
 
-#include <qpid/Exception.h>
-#include <qpid/framing/ProtocolVersion.h>
+#include <Exception.h>
+#include <ProtocolVersion.h>
 #include <string>
 #include <vector>
 
diff --git a/cpp/src/qpid/framing/Value.cpp b/cpp/lib/common/framing/Value.cpp
index 39c3843519..fc087043e5 100644
--- a/cpp/src/qpid/framing/Value.cpp
+++ b/cpp/lib/common/framing/Value.cpp
@@ -18,10 +18,10 @@
  * under the License.
  *
  */
-#include <qpid/framing/Value.h>
-#include <qpid/framing/Buffer.h>
-#include <qpid/framing/FieldTable.h>
-#include <qpid/QpidError.h>
+#include <Value.h>
+#include <Buffer.h>
+#include <FieldTable.h>
+#include <QpidError.h>
 
 namespace qpid {
 namespace framing {
diff --git a/cpp/src/qpid/framing/Value.h b/cpp/lib/common/framing/Value.h
index b8b8a5cd30..6d240c2eb9 100644
--- a/cpp/src/qpid/framing/Value.h
+++ b/cpp/lib/common/framing/Value.h
@@ -20,8 +20,8 @@
  */
 #include <iostream>
 #include <vector>
-#include <qpid/framing/amqp_types.h>
-#include <qpid/framing/FieldTable.h>
+#include <amqp_types.h>
+#include <FieldTable.h>
 
 #ifndef _Value_
 #define _Value_
diff --git a/cpp/src/qpid/Exception.cpp b/cpp/lib/common/framing/amqp_framing.h
index 1263ba8472..62f87352f8 100644
--- a/cpp/src/qpid/Exception.cpp
+++ b/cpp/lib/common/framing/amqp_framing.h
@@ -18,7 +18,19 @@
  * under the License.
  *
  */
-
-#include <qpid/Exception.h>
-
-qpid::Exception::~Exception() throw() {}
+#include <amqp_types.h>
+#include <AMQFrame.h>
+#include <AMQBody.h>
+#include <BodyHandler.h>
+#include <AMQMethodBody.h>
+#include <AMQHeaderBody.h>
+#include <AMQContentBody.h>
+#include <AMQHeartbeatBody.h>
+#include <AMQP_MethodVersionMap.h>
+#include <InputHandler.h>
+#include <OutputHandler.h>
+#include <InitiationHandler.h>
+#include <ProtocolInitiation.h>
+#include <BasicHeaderProperties.h>
+#include <ProtocolVersion.h>
+#include <ProtocolVersionException.h>
diff --git a/cpp/src/qpid/framing/amqp_types.h b/cpp/lib/common/framing/amqp_types.h
index 3d8e9632c0..3d8e9632c0 100644
--- a/cpp/src/qpid/framing/amqp_types.h
+++ b/cpp/lib/common/framing/amqp_types.h
diff --git a/cpp/src/qpid/sys/Acceptor.h b/cpp/lib/common/sys/Acceptor.h
index c493a48f0e..e6bc27a593 100644
--- a/cpp/src/qpid/sys/Acceptor.h
+++ b/cpp/lib/common/sys/Acceptor.h
@@ -23,7 +23,7 @@
  */
 
 #include <stdint.h>
-#include <qpid/SharedObject.h>
+#include <SharedObject.h>
 
 namespace qpid {
 namespace sys {
diff --git a/cpp/lib/common/sys/AtomicCount.h b/cpp/lib/common/sys/AtomicCount.h
new file mode 100644
index 0000000000..b625b2c9b0
--- /dev/null
+++ b/cpp/lib/common/sys/AtomicCount.h
@@ -0,0 +1,71 @@
+#ifndef _posix_AtomicCount_h
+#define _posix_AtomicCount_h
+
+/*
+ *
+ * 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.
+ *
+ */
+
+#include <boost/detail/atomic_count.hpp>
+#include <boost/noncopyable.hpp>
+
+namespace qpid {
+namespace sys {
+
+/**
+ * Atomic counter.
+ */
+class AtomicCount : boost::noncopyable {
+  public:
+    class ScopedDecrement : boost::noncopyable {
+      public:
+        /** Decrement counter in constructor and increment in destructor. */
+        ScopedDecrement(AtomicCount& c) : count(c) { value = --count; }
+        ~ScopedDecrement() { ++count; }
+        /** Return the value returned by the decrement. */
+        operator long() { return value; }
+      private:
+        AtomicCount& count;
+        long value;
+    };
+
+    class ScopedIncrement : boost::noncopyable {
+      public:
+        /** Increment counter in constructor and increment in destructor. */
+        ScopedIncrement(AtomicCount& c) : count(c) { ++count; }
+        ~ScopedIncrement() { --count; }
+      private:
+        AtomicCount& count;
+    };
+
+    AtomicCount(long value = 0) : count(value) {}
+    
+    void operator++() { ++count ; }
+    
+    long operator--() { return --count; }
+    
+    operator long() const { return count; }
+
+    
+  private:
+    boost::detail::atomic_count  count;
+};
+
+
+}}
+
+
+#endif // _posix_AtomicCount_h
diff --git a/cpp/src/qpid/sys/Module.h b/cpp/lib/common/sys/Module.h
index db791666e0..9bf5d6e1fc 100644
--- a/cpp/src/qpid/sys/Module.h
+++ b/cpp/lib/common/sys/Module.h
@@ -23,7 +23,7 @@
  */
 #include <boost/noncopyable.hpp>
 #include <iostream>
-#include <qpid/QpidError.h>
+#include <QpidError.h>
 
 namespace qpid {
 namespace sys {
@@ -99,8 +99,8 @@ template <class T> Module<T>::~Module() throw()
 // APR ================================================================
 #if USE_APR
 
-#include <qpid/apr/APRBase.h>
-#include <qpid/apr/APRPool.h>
+#include <apr/APRBase.h>
+#include <apr/APRPool.h>
 
 template <class T> void Module<T>::load(const std::string& name)
 {
diff --git a/cpp/lib/common/sys/Monitor.h b/cpp/lib/common/sys/Monitor.h
new file mode 100644
index 0000000000..e58931e699
--- /dev/null
+++ b/cpp/lib/common/sys/Monitor.h
@@ -0,0 +1,127 @@
+#ifndef _sys_Monitor_h
+#define _sys_Monitor_h
+
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+#include <sys/errno.h>
+#include <boost/noncopyable.hpp>
+#include <sys/Mutex.h>
+#include <sys/Time.h>
+
+#ifdef USE_APR
+#  include <apr_thread_cond.h>
+#endif
+
+namespace qpid {
+namespace sys {
+
+/**
+ * A monitor is a condition variable and a mutex
+ */
+class Monitor : public Mutex
+{
+  public:
+    inline Monitor();
+    inline ~Monitor();
+    inline void wait();
+    inline bool wait(const Time& absoluteTime);
+    inline void notify();
+    inline void notifyAll();
+
+  private:
+#ifdef USE_APR
+    apr_thread_cond_t* condition;
+#else
+    pthread_cond_t condition;
+#endif
+};
+
+
+// APR ================================================================
+#ifdef USE_APR
+
+Monitor::Monitor() {
+    CHECK_APR_SUCCESS(apr_thread_cond_create(&condition, APRPool::get()));
+}
+
+Monitor::~Monitor() {
+    CHECK_APR_SUCCESS(apr_thread_cond_destroy(condition));
+}
+
+void Monitor::wait() {
+    CHECK_APR_SUCCESS(apr_thread_cond_wait(condition, mutex));
+}
+
+bool Monitor::wait(const Time& absoluteTime){
+    // APR uses microseconds.
+    apr_status_t status =
+        apr_thread_cond_timedwait(condition, mutex, absoluteTime/TIME_USEC);
+    if(status != APR_TIMEUP) CHECK_APR_SUCCESS(status);
+    return status == 0;
+}
+
+void Monitor::notify(){
+    CHECK_APR_SUCCESS(apr_thread_cond_signal(condition));
+}
+
+void Monitor::notifyAll(){
+    CHECK_APR_SUCCESS(apr_thread_cond_broadcast(condition));
+}
+
+#else
+// POSIX ================================================================
+
+Monitor::Monitor() {
+    QPID_POSIX_THROW_IF(pthread_cond_init(&condition, 0));
+}
+
+Monitor::~Monitor() {
+    QPID_POSIX_THROW_IF(pthread_cond_destroy(&condition));
+}
+
+void Monitor::wait() {
+    QPID_POSIX_THROW_IF(pthread_cond_wait(&condition, &mutex));
+}
+
+bool Monitor::wait(const Time& absoluteTime){
+    struct timespec ts;
+    toTimespec(ts, absoluteTime);
+    int status = pthread_cond_timedwait(&condition, &mutex, &ts);
+    if (status != 0) {
+        if (status == ETIMEDOUT) return false;
+        throw QPID_POSIX_ERROR(status);
+    }
+    return true;
+}
+
+void Monitor::notify(){
+    QPID_POSIX_THROW_IF(pthread_cond_signal(&condition));
+}
+
+void Monitor::notifyAll(){
+    QPID_POSIX_THROW_IF(pthread_cond_broadcast(&condition));
+}
+#endif  /*USE_APR*/
+
+
+}}
+#endif  /*!_sys_Monitor_h*/
diff --git a/cpp/lib/common/sys/Mutex.h b/cpp/lib/common/sys/Mutex.h
new file mode 100644
index 0000000000..4022da2f6e
--- /dev/null
+++ b/cpp/lib/common/sys/Mutex.h
@@ -0,0 +1,151 @@
+#ifndef _sys_Mutex_h
+#define _sys_Mutex_h
+
+/*
+ *
+ * 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.
+ *
+ */
+
+#ifdef USE_APR
+#  include <apr_thread_mutex.h>
+#  include <apr/APRBase.h>
+#  include <apr/APRPool.h>
+#else
+#  include <pthread.h>
+#  include <posix/check.h>
+#endif
+#include <boost/noncopyable.hpp>
+
+namespace qpid {
+namespace sys {
+
+/**
+ * Scoped lock template: calls lock() in ctor, unlock() in dtor.
+ * L can be any class with lock() and unlock() functions.
+ */
+template <class L>
+class ScopedLock
+{
+  public:
+    ScopedLock(L& l) : mutex(l) { l.lock(); }
+    ~ScopedLock() { mutex.unlock(); }
+  private:
+    L& mutex;
+};
+
+/**
+ * Mutex lock.
+ */
+class Mutex : private boost::noncopyable {
+  public:
+    typedef ScopedLock<Mutex> ScopedLock;
+    
+    inline Mutex();
+    inline ~Mutex();
+    inline void lock();
+    inline void unlock();
+    inline void trylock();
+
+  protected:
+#ifdef USE_APR
+    apr_thread_mutex_t* mutex;
+#else
+    pthread_mutex_t mutex;
+#endif
+};
+
+#ifdef USE_APR
+// APR ================================================================
+
+Mutex::Mutex() {
+    CHECK_APR_SUCCESS(apr_thread_mutex_create(&mutex, APR_THREAD_MUTEX_NESTED, APRPool::get()));
+}
+
+Mutex::~Mutex(){
+    CHECK_APR_SUCCESS(apr_thread_mutex_destroy(mutex));
+}
+
+void Mutex::lock() {
+    CHECK_APR_SUCCESS(apr_thread_mutex_lock(mutex));
+}
+void Mutex::unlock() {
+    CHECK_APR_SUCCESS(apr_thread_mutex_unlock(mutex));
+}
+
+void Mutex::trylock() {
+    CHECK_APR_SUCCESS(apr_thread_mutex_trylock(mutex));
+}
+
+#else
+// POSIX ================================================================
+
+/**
+ * PODMutex is a POD, can be static-initialized with
+ * PODMutex m = QPID_PODMUTEX_INITIALIZER
+ */
+struct PODMutex 
+{
+    typedef ScopedLock<PODMutex> ScopedLock;
+
+    inline void lock();
+    inline void unlock();
+    inline void trylock();
+
+    // Must be public to be a POD:
+    pthread_mutex_t mutex;
+};
+
+#define QPID_MUTEX_INITIALIZER { PTHREAD_MUTEX_INITIALIZER }
+
+
+void PODMutex::lock() {
+    QPID_POSIX_THROW_IF(pthread_mutex_lock(&mutex));
+}
+void PODMutex::unlock() {
+    QPID_POSIX_THROW_IF(pthread_mutex_unlock(&mutex));
+}
+
+void PODMutex::trylock() {
+    QPID_POSIX_THROW_IF(pthread_mutex_trylock(&mutex));
+}
+
+
+Mutex::Mutex() {
+    QPID_POSIX_THROW_IF(pthread_mutex_init(&mutex, 0));
+}
+
+Mutex::~Mutex(){
+    QPID_POSIX_THROW_IF(pthread_mutex_destroy(&mutex));
+}
+
+void Mutex::lock() {
+    QPID_POSIX_THROW_IF(pthread_mutex_lock(&mutex));
+}
+void Mutex::unlock() {
+    QPID_POSIX_THROW_IF(pthread_mutex_unlock(&mutex));
+}
+
+void Mutex::trylock() {
+    QPID_POSIX_THROW_IF(pthread_mutex_trylock(&mutex));
+}
+
+#endif // USE_APR
+
+}}
+
+
+
+#endif  /*!_sys_Mutex_h*/
diff --git a/cpp/src/qpid/sys/signal.h b/cpp/lib/common/sys/Runnable.cpp
index b7cfc8a950..30122c682f 100644
--- a/cpp/src/qpid/sys/signal.h
+++ b/cpp/lib/common/sys/Runnable.cpp
@@ -1,6 +1,3 @@
-#ifndef _sys_signal_h
-#define _sys_signal_h
-
 /*
  *
  * Copyright (c) 2006 The Apache Software Foundation
@@ -19,28 +16,17 @@
  *
  */
 
-#ifdef USE_APR
-#  include <apr_signal.h>
-#else
-#  include <signal.h>
-#endif
+#include "Runnable.h"
+#include <boost/bind.hpp>
 
 namespace qpid {
 namespace sys {
 
-typedef void (*SignalHandler)(int);
+Runnable::~Runnable() {}
 
-SignalHandler signal(int sig, SignalHandler handler)
+Runnable::Functor Runnable::functor() 
 {
-#ifdef USE_APR
-    return apr_signal(sig, handler);
-#else
-    return ::signal (sig, handler);
-#endif
+    return boost::bind(&Runnable::run, this);
 }
 
 }}
-
-
-
-#endif  /*!_sys_signal_h*/
diff --git a/cpp/src/qpid/sys/Runnable.h b/cpp/lib/common/sys/Runnable.h
index 8379afb2f9..fb3927c612 100644
--- a/cpp/src/qpid/sys/Runnable.h
+++ b/cpp/lib/common/sys/Runnable.h
@@ -1,3 +1,5 @@
+#ifndef _Runnable_
+#define _Runnable_
 /*
  *
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -18,18 +20,28 @@
  * under the License.
  *
  */
-#ifndef _Runnable_
-#define _Runnable_
+
+#include <boost/function.hpp>
 
 namespace qpid {
 namespace sys {
 
-/** Base class for classes that run in a thread. */
+/**
+ * Interface for objects that can be run, e.g. in a thread.
+ */
 class Runnable
 {
   public:
-    virtual ~Runnable() {}
+    /** Type to represent a runnable as a Functor */
+    typedef boost::function0<void> Functor;
+    
+    virtual ~Runnable();
+
+    /** Derived classes override run(). */
     virtual void run() = 0;
+
+    /** Create a functor object that will call this->run(). */
+    Functor functor();
 };
 
 }}
diff --git a/cpp/src/qpid/sys/SessionContext.h b/cpp/lib/common/sys/SessionContext.h
index f83cbe4c7a..671e00774f 100644
--- a/cpp/src/qpid/sys/SessionContext.h
+++ b/cpp/lib/common/sys/SessionContext.h
@@ -21,7 +21,7 @@
 #ifndef _SessionContext_
 #define _SessionContext_
 
-#include <qpid/framing/OutputHandler.h>
+#include <OutputHandler.h>
 
 namespace qpid {
 namespace sys {
diff --git a/cpp/src/qpid/sys/SessionHandler.h b/cpp/lib/common/sys/SessionHandler.h
index f55b52806a..76f79d421d 100644
--- a/cpp/src/qpid/sys/SessionHandler.h
+++ b/cpp/lib/common/sys/SessionHandler.h
@@ -21,10 +21,10 @@
 #ifndef _SessionHandler_
 #define _SessionHandler_
 
-#include <qpid/framing/InputHandler.h>
-#include <qpid/framing/InitiationHandler.h>
-#include <qpid/framing/ProtocolInitiation.h>
-#include <qpid/sys/TimeoutHandler.h>
+#include <InputHandler.h>
+#include <InitiationHandler.h>
+#include <ProtocolInitiation.h>
+#include <sys/TimeoutHandler.h>
 
 namespace qpid {
 namespace sys {
diff --git a/cpp/src/qpid/sys/SessionHandlerFactory.h b/cpp/lib/common/sys/SessionHandlerFactory.h
index 2a01aebcb0..2a01aebcb0 100644
--- a/cpp/src/qpid/sys/SessionHandlerFactory.h
+++ b/cpp/lib/common/sys/SessionHandlerFactory.h
diff --git a/cpp/src/qpid/sys/ShutdownHandler.h b/cpp/lib/common/sys/ShutdownHandler.h
index 88baecb5b6..88baecb5b6 100644
--- a/cpp/src/qpid/sys/ShutdownHandler.h
+++ b/cpp/lib/common/sys/ShutdownHandler.h
diff --git a/cpp/src/qpid/sys/Socket.h b/cpp/lib/common/sys/Socket.h
index cf757e7a27..d793a240c6 100644
--- a/cpp/src/qpid/sys/Socket.h
+++ b/cpp/lib/common/sys/Socket.h
@@ -23,6 +23,7 @@
  */
 
 #include <string>
+#include <sys/Time.h>
 
 #ifdef USE_APR
 #  include <apr_network_io.h>
@@ -34,10 +35,18 @@ namespace sys {
 class Socket
 {
   public:
-    Socket();
+    /** Create an initialized TCP socket */
+    static Socket createTcp();
 
+    /** Create a socket wrapper for descriptor. */
+#ifdef USE_APR
+    Socket(apr_socket_t* descriptor = 0);
+#else
+    Socket(int descriptor = 0);
+#endif
+    
     /** Set timeout for read and write */
-    void setTimeout(long msecs);
+    void setTimeout(Time interval);
 
     void connect(const std::string& host, int port);
 
@@ -46,19 +55,30 @@ class Socket
     enum { SOCKET_TIMEOUT=-2, SOCKET_EOF=-3 } ErrorCode;
 
     /** Returns bytes sent or an ErrorCode value < 0. */
-    ssize_t send(const char* data, size_t size);
+    ssize_t send(const void* data, size_t size);
 
     /**
      * Returns bytes received, an ErrorCode value < 0 or 0
      * if the connection closed in an orderly manner.
      */
-    ssize_t recv(char* data, size_t size);
+    ssize_t recv(void* data, size_t size);
+
+    /** Bind to a port and start listening.
+     *@param port 0 means choose an available port.
+     *@param backlog maximum number of pending connections.
+     *@return The bound port.
+     */
+    int listen(int port = 0, int backlog = 10);
 
+    /** Get file descriptor */
+    int fd(); 
+    
   private:
 #ifdef USE_APR    
     apr_socket_t* socket;
 #else
-    int socket;
+    void init() const;
+    mutable int socket;         // Initialized on demand. 
 #endif
 };
 
diff --git a/cpp/src/qpid/sys/Thread.h b/cpp/lib/common/sys/Thread.h
index 2aad7c24d7..47b95b6234 100644
--- a/cpp/src/qpid/sys/Thread.h
+++ b/cpp/lib/common/sys/Thread.h
@@ -22,15 +22,15 @@
  *
  */
 
-#include <qpid/sys/Runnable.h>
+#include <sys/Runnable.h>
 
 #ifdef USE_APR
 #  include <apr_thread_proc.h>
 #  include <apr_portable.h>
-#  include <qpid/apr/APRPool.h>
-#  include <qpid/apr/APRBase.h>
+#  include <apr/APRPool.h>
+#  include <apr/APRBase.h>
 #else
-#  include <qpid/posix/check.h>
+#  include <posix/check.h>
 #  include <pthread.h>
 #endif
 
@@ -40,11 +40,17 @@ namespace sys {
 class Thread
 {
   public:
+    inline static Thread current();
+    inline static void yield();
+
     inline Thread();
     inline explicit Thread(qpid::sys::Runnable*);
+    inline explicit Thread(qpid::sys::Runnable&);
+    
     inline void join();
-    inline static Thread current();
 
+    inline long id();
+        
   private:
 #ifdef USE_APR
     static void* APR_THREAD_FUNC runRunnable(apr_thread_t* thread, void *data);
@@ -68,12 +74,21 @@ Thread::Thread(Runnable* runnable) {
         apr_thread_create(&thread, 0, runRunnable, runnable, APRPool::get()));
 }
 
+Thread::Thread(Runnable& runnable) {
+    CHECK_APR_SUCCESS(
+        apr_thread_create(&thread, 0, runRunnable, &runnable, APRPool::get()));
+}
+
 void Thread::join(){
     apr_status_t status;
     if (thread != 0) 
         CHECK_APR_SUCCESS(apr_thread_join(&status, thread));
 }
 
+long Thread::id() {
+    return long(thread);
+}
+
 Thread::Thread(apr_thread_t* t) : thread(t) {}
 
 Thread Thread::current(){
@@ -83,15 +98,29 @@ Thread Thread::current(){
     return Thread(thr);
 }
 
+void Thread::yield() 
+{
+    apr_thread_yield();
+}
+
+
 // POSIX ================================================================
 #else
 
 Thread::Thread(Runnable* runnable) {
-    CHECK0(pthread_create(&thread, NULL, runRunnable, runnable));
+    QPID_POSIX_THROW_IF(pthread_create(&thread, NULL, runRunnable, runnable));
+}
+
+Thread::Thread(Runnable& runnable) {
+    QPID_POSIX_THROW_IF(pthread_create(&thread, NULL, runRunnable, &runnable));
 }
 
 void Thread::join(){
-    if (thread != 0) CHECK0(pthread_join(thread, 0));
+    QPID_POSIX_THROW_IF(pthread_join(thread, 0));
+}
+
+long Thread::id() {
+    return long(thread);
 }
 
 Thread::Thread(pthread_t thr) : thread(thr) {}
@@ -99,6 +128,13 @@ Thread::Thread(pthread_t thr) : thread(thr) {}
 Thread Thread::current() {
     return Thread(pthread_self());
 }
+
+void Thread::yield() 
+{
+    QPID_POSIX_THROW_IF(pthread_yield());
+}
+
+
 #endif
 
 }}
diff --git a/cpp/src/qpid/sys/Time.cpp b/cpp/lib/common/sys/Time.cpp
index 3971297ec2..ad6185b966 100644
--- a/cpp/src/qpid/sys/Time.cpp
+++ b/cpp/lib/common/sys/Time.cpp
@@ -27,37 +27,34 @@ namespace sys {
 // APR ================================================================
 #if USE_APR
 
-Time Time::now() {
-    return Time(apr_time_now(), NSEC_PER_USEC);
-}
-
-void Time::set(int64_t ticks, long nsec_per_tick) {
-    time = (ticks * nsec_per_tick) / NSEC_PER_USEC;
-}
-
-int64_t Time::nsecs() const {
-    return time * NSEC_PER_USEC;
-}
+Time now() { return apr_time_now() * TIME_USEC; }
 
 // POSIX================================================================
 #else 
 
-Time Time::now() {
-    Time t;
-    clock_gettime(CLOCK_REALTIME, &t.time);
-    return t;
+Time now() {
+    struct timespec ts;
+    clock_gettime(CLOCK_REALTIME, &ts);
+    return toTime(ts);
+}
+
+struct timespec toTimespec(const Time& t) {
+    struct timespec ts;
+    toTimespec(ts, t);
+    return ts;
 }
 
-void Time::set(int64_t ticks, long nsec_per_tick) {
-    int64_t ns = ticks * nsec_per_tick;
-    time.tv_sec  = ns / NSEC_PER_SEC;
-    time.tv_nsec = ns % NSEC_PER_SEC;
+struct timespec& toTimespec(struct timespec& ts, const Time& t) {
+    ts.tv_sec  = t / TIME_SEC;
+    ts.tv_nsec = t % TIME_SEC;
+    return  ts;
 }
 
-int64_t Time::nsecs() const {
-    return time.tv_sec * NSEC_PER_SEC + time.tv_nsec;
+Time toTime(const struct timespec& ts) {
+    return ts.tv_sec*TIME_SEC + ts.tv_nsec;
 }
 
+
 #endif
 }}
 
diff --git a/cpp/lib/common/sys/Time.h b/cpp/lib/common/sys/Time.h
new file mode 100644
index 0000000000..3dd46741d8
--- /dev/null
+++ b/cpp/lib/common/sys/Time.h
@@ -0,0 +1,58 @@
+#ifndef _sys_Time_h
+#define _sys_Time_h
+
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+#include <stdint.h>
+
+#ifdef USE_APR
+#  include <apr_time.h>
+#else
+#  include <time.h>
+#endif
+
+namespace qpid {
+namespace sys {
+
+/** Time in nanoseconds */
+typedef int64_t Time;
+
+Time now();
+
+/** Nanoseconds per second. */
+const Time TIME_SEC  = 1000*1000*1000;
+/** Nanoseconds per millisecond */
+const Time TIME_MSEC = 1000*1000;
+/** Nanoseconds per microseconds. */
+const Time TIME_USEC = 1000;
+/** Nanoseconds per nanosecond. */
+const Time TIME_NSEC = 1;
+
+#ifndef USE_APR
+struct timespec toTimespec(const Time& t);
+struct timespec& toTimespec(struct timespec& ts, const Time& t);
+Time toTime(const struct timespec& ts);
+#endif
+
+}}
+
+#endif  /*!_sys_Time_h*/
diff --git a/cpp/src/qpid/sys/TimeoutHandler.h b/cpp/lib/common/sys/TimeoutHandler.h
index 0c10709bbf..0c10709bbf 100644
--- a/cpp/src/qpid/sys/TimeoutHandler.h
+++ b/cpp/lib/common/sys/TimeoutHandler.h
diff --git a/cpp/src/qpid/apr/APRAcceptor.cpp b/cpp/lib/common/sys/apr/APRAcceptor.cpp
index 43fcbc7f8e..6853833797 100644
--- a/cpp/src/qpid/apr/APRAcceptor.cpp
+++ b/cpp/lib/common/sys/apr/APRAcceptor.cpp
@@ -18,8 +18,8 @@
  * under the License.
  *
  */
-#include <qpid/sys/Acceptor.h>
-#include <qpid/sys/SessionHandlerFactory.h>
+#include <sys/Acceptor.h>
+#include <sys/SessionHandlerFactory.h>
 #include "LFProcessor.h"
 #include "LFSessionContext.h"
 #include "APRBase.h"
@@ -37,11 +37,15 @@ class APRAcceptor : public Acceptor
     virtual void shutdown();
 
   private:
+    void shutdownImpl();
+
+  private:
     int16_t port;
     bool trace;
     LFProcessor processor;
     apr_socket_t* socket;
     volatile bool running;
+    Mutex shutdownLock;
 };
 
 // Define generic Acceptor::create() to return APRAcceptor.
@@ -88,23 +92,30 @@ void APRAcceptor::run(SessionHandlerFactory* factory) {
             LFSessionContext* session = new LFSessionContext(APRPool::get(), client, &processor, trace);
             session->init(factory->create(session));
         }else{
-            running = false;
-            if(status != APR_EINTR){
-                std::cout << "ERROR: " << get_desc(status) << std::endl;
+            Mutex::ScopedLock locker(shutdownLock);                
+            if(running) {
+                if(status != APR_EINTR){
+                    std::cout << "ERROR: " << get_desc(status) << std::endl;
+                }
+                shutdownImpl();
             }
         }
     }
-    shutdown();
 }
 
 void APRAcceptor::shutdown() {
-    // TODO aconway 2006-10-12: Cleanup, this is not thread safe.
+    Mutex::ScopedLock locker(shutdownLock);                
     if (running) {
-        running = false;
-        processor.stop();
-        CHECK_APR_SUCCESS(apr_socket_close(socket));
+        shutdownImpl();
     }
 }
 
+void APRAcceptor::shutdownImpl() {
+    Mutex::ScopedLock locker(shutdownLock);                
+    running = false;
+    processor.stop();
+    CHECK_APR_SUCCESS(apr_socket_close(socket));
+}
+
 
 }}
diff --git a/cpp/src/qpid/apr/APRBase.cpp b/cpp/lib/common/sys/apr/APRBase.cpp
index c3dbda3df0..30c84e8736 100644
--- a/cpp/src/qpid/apr/APRBase.cpp
+++ b/cpp/lib/common/sys/apr/APRBase.cpp
@@ -19,7 +19,7 @@
  *
  */
 #include <iostream>
-#include <qpid/QpidError.h>
+#include <QpidError.h>
 #include "APRBase.h"
 
 using namespace qpid::sys;
@@ -82,12 +82,13 @@ void APRBase::decrement(){
     getInstance()->_decrement();
 }
 
-void qpid::sys::check(apr_status_t status, const std::string& file, const int line){
+void qpid::sys::check(apr_status_t status, const char* file, const int line){
     if (status != APR_SUCCESS){
         const int size = 50;
         char tmp[size];
         std::string msg(apr_strerror(status, tmp, size));
-        throw QpidError(APR_ERROR + ((int) status), msg, file, line);
+        throw QpidError(APR_ERROR + ((int) status), msg,
+                        qpid::SrcLine(file, line));
     }
 }
 
diff --git a/cpp/src/qpid/apr/APRBase.h b/cpp/lib/common/sys/apr/APRBase.h
index d1b3e21b91..9beba9fbad 100644
--- a/cpp/src/qpid/apr/APRBase.h
+++ b/cpp/lib/common/sys/apr/APRBase.h
@@ -52,7 +52,7 @@ namespace sys {
     };
 
     //this is also a convenient place for a helper function for error checking:
-    void check(apr_status_t status, const std::string& file, const int line);
+    void check(apr_status_t status, const char* file, const int line);
     std::string get_desc(apr_status_t status);
 
 #define CHECK_APR_SUCCESS(A) qpid::sys::check(A, __FILE__, __LINE__); 
diff --git a/cpp/src/qpid/apr/APRPool.cpp b/cpp/lib/common/sys/apr/APRPool.cpp
index e8b71f6e8a..e8b71f6e8a 100644
--- a/cpp/src/qpid/apr/APRPool.cpp
+++ b/cpp/lib/common/sys/apr/APRPool.cpp
diff --git a/cpp/src/qpid/apr/APRPool.h b/cpp/lib/common/sys/apr/APRPool.h
index da7661fcfa..da7661fcfa 100644
--- a/cpp/src/qpid/apr/APRPool.h
+++ b/cpp/lib/common/sys/apr/APRPool.h
diff --git a/cpp/src/qpid/apr/APRSocket.cpp b/cpp/lib/common/sys/apr/APRSocket.cpp
index 4917803370..4917803370 100644
--- a/cpp/src/qpid/apr/APRSocket.cpp
+++ b/cpp/lib/common/sys/apr/APRSocket.cpp
diff --git a/cpp/src/qpid/apr/APRSocket.h b/cpp/lib/common/sys/apr/APRSocket.h
index 803740f97e..53f1055c6a 100644
--- a/cpp/src/qpid/apr/APRSocket.h
+++ b/cpp/lib/common/sys/apr/APRSocket.h
@@ -22,7 +22,7 @@
 #define _APRSocket_
 
 #include <apr_network_io.h>
-#include <qpid/framing/Buffer.h>
+#include <Buffer.h>
 
 namespace qpid {
 namespace sys {
diff --git a/cpp/src/qpid/apr/LFProcessor.cpp b/cpp/lib/common/sys/apr/LFProcessor.cpp
index c8a583a34c..2b6fc92623 100644
--- a/cpp/src/qpid/apr/LFProcessor.cpp
+++ b/cpp/lib/common/sys/apr/LFProcessor.cpp
@@ -19,7 +19,7 @@
  *
  */
 #include <sstream>
-#include <qpid/QpidError.h>
+#include <QpidError.h>
 #include "LFProcessor.h"
 #include "APRBase.h"
 #include "LFSessionContext.h"
@@ -134,8 +134,8 @@ void LFProcessor::run(){
                 session->stopProcessing();
             }
         }
-    }catch(QpidError error){
-	std::cout << "Error [" << error.code << "] " << error.msg << " (" << error.file << ":" << error.line << ")" << std::endl;
+    }catch(std::exception e){
+	std::cout << e.what() << std::endl;
     }
 }
 
diff --git a/cpp/src/qpid/apr/LFProcessor.h b/cpp/lib/common/sys/apr/LFProcessor.h
index 1d1162d034..de90199472 100644
--- a/cpp/src/qpid/apr/LFProcessor.h
+++ b/cpp/lib/common/sys/apr/LFProcessor.h
@@ -24,9 +24,9 @@
 #include <apr_poll.h>
 #include <iostream>
 #include <vector>
-#include <qpid/sys/Monitor.h>
-#include <qpid/sys/Runnable.h>
-#include <qpid/sys/Thread.h>
+#include <sys/Monitor.h>
+#include <sys/Runnable.h>
+#include <sys/Thread.h>
 
 namespace qpid {
 namespace sys {
diff --git a/cpp/src/qpid/apr/LFSessionContext.cpp b/cpp/lib/common/sys/apr/LFSessionContext.cpp
index 7dc70ca245..7fb8d5a91b 100644
--- a/cpp/src/qpid/apr/LFSessionContext.cpp
+++ b/cpp/lib/common/sys/apr/LFSessionContext.cpp
@@ -20,7 +20,7 @@
  */
 #include "LFSessionContext.h"
 #include "APRBase.h"
-#include <qpid/QpidError.h>
+#include <QpidError.h>
 #include <assert.h>
 
 using namespace qpid::sys;
diff --git a/cpp/src/qpid/apr/LFSessionContext.h b/cpp/lib/common/sys/apr/LFSessionContext.h
index 7060c971a5..9483cbe590 100644
--- a/cpp/src/qpid/apr/LFSessionContext.h
+++ b/cpp/lib/common/sys/apr/LFSessionContext.h
@@ -27,11 +27,11 @@
 #include <apr_poll.h>
 #include <apr_time.h>
 
-#include <qpid/framing/AMQFrame.h>
-#include <qpid/framing/Buffer.h>
-#include <qpid/sys/Monitor.h>
-#include <qpid/sys/SessionContext.h>
-#include <qpid/sys/SessionHandler.h>
+#include <AMQFrame.h>
+#include <Buffer.h>
+#include <sys/Monitor.h>
+#include <sys/SessionContext.h>
+#include <sys/SessionHandler.h>
 
 #include "APRSocket.h"
 #include "LFProcessor.h"
diff --git a/cpp/src/qpid/apr/Socket.cpp b/cpp/lib/common/sys/apr/Socket.cpp
index 9ef6baeb88..336eb4996a 100644
--- a/cpp/src/qpid/apr/Socket.cpp
+++ b/cpp/lib/common/sys/apr/Socket.cpp
@@ -20,28 +20,31 @@
  */
 
 
-#include <qpid/sys/Socket.h>
-#include <qpid/apr/APRBase.h>
-#include <qpid/apr/APRPool.h>
+#include <sys/Socket.h>
+#include <apr/APRBase.h>
+#include <apr/APRPool.h>
 
 
 using namespace qpid::sys;
 
-Socket::Socket()
-{
+Socket Socket::createTcp() {
+    Socket s;
     CHECK_APR_SUCCESS(
         apr_socket_create(
-            &socket, APR_INET, SOCK_STREAM, APR_PROTO_TCP,
+            &s.socket, APR_INET, SOCK_STREAM, APR_PROTO_TCP,
             APRPool::get()));
+    return s;
 }
 
-void Socket::setTimeout(long msecs)
-{
-    apr_socket_timeout_set(socket, msecs*1000);
+Socket::Socket(apr_socket_t* s) {
+    socket = s;
 }
 
-void Socket::connect(const std::string& host, int port)
-{
+void Socket::setTimeout(Time interval) {
+    apr_socket_timeout_set(socket, interval/TIME_USEC);
+}
+
+void Socket::connect(const std::string& host, int port) {
     apr_sockaddr_t* address;
     CHECK_APR_SUCCESS(
         apr_sockaddr_info_get(
@@ -50,27 +53,28 @@ void Socket::connect(const std::string& host, int port)
     CHECK_APR_SUCCESS(apr_socket_connect(socket, address));
 }
 
-void Socket::close()
-{
+void Socket::close() {
     if (socket == 0) return;
     CHECK_APR_SUCCESS(apr_socket_close(socket));
     socket = 0;
 }
 
-ssize_t Socket::send(const char* data, size_t size)
+ssize_t Socket::send(const void* data, size_t size)
 {
     apr_size_t sent = size;
-    apr_status_t status = apr_socket_send(socket, data, &sent);
+    apr_status_t status =
+        apr_socket_send(socket, reinterpret_cast<const char*>(data), &sent);
     if (APR_STATUS_IS_TIMEUP(status)) return SOCKET_TIMEOUT;
     if (APR_STATUS_IS_EOF(status)) return SOCKET_EOF;
     CHECK_APR_SUCCESS(status);
     return sent;
 }
 
-ssize_t Socket::recv(char* data, size_t size)
+ssize_t Socket::recv(void* data, size_t size)
 {
     apr_size_t received = size;
-    apr_status_t status = apr_socket_recv(socket, data, &received);
+    apr_status_t status =
+        apr_socket_recv(socket, reinterpret_cast<char*>(data), &received);
     if (APR_STATUS_IS_TIMEUP(status)) return SOCKET_TIMEOUT;
     CHECK_APR_SUCCESS(status);
      return received;
diff --git a/cpp/src/qpid/apr/Thread.cpp b/cpp/lib/common/sys/apr/Thread.cpp
index 7bb3537899..5c4799aa96 100644
--- a/cpp/src/qpid/apr/Thread.cpp
+++ b/cpp/lib/common/sys/apr/Thread.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include <qpid/sys/Thread.h>
+#include <sys/Thread.h>
 
 using namespace qpid::sys;
 using qpid::sys::Runnable;
diff --git a/cpp/lib/common/sys/posix/EventChannel.cpp b/cpp/lib/common/sys/posix/EventChannel.cpp
new file mode 100644
index 0000000000..16c7ec9c3f
--- /dev/null
+++ b/cpp/lib/common/sys/posix/EventChannel.cpp
@@ -0,0 +1,325 @@
+/*
+ *
+ * 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.
+ *
+ */
+
+#include <mqueue.h>
+#include <string.h>
+#include <iostream>
+
+#include <sys/errno.h>
+#include <sys/socket.h>
+#include <sys/epoll.h>
+
+#include <typeinfo>
+#include <iostream>
+#include <queue>
+
+#include <boost/ptr_container/ptr_map.hpp>
+#include <boost/current_function.hpp>
+
+#include <QpidError.h>
+#include <sys/Monitor.h>
+
+#include "check.h"
+#include "EventChannel.h"
+
+using namespace std;
+
+
+// Convenience template to zero out a struct.
+template <class S> struct ZeroStruct : public S {
+    ZeroStruct() { memset(this, 0, sizeof(*this)); }
+};
+    
+namespace qpid {
+namespace sys {
+
+
+/**
+ * EventHandler wraps an epoll file descriptor. Acts as private
+ * interface between EventChannel and subclasses.
+ *
+ * Also implements Event interface for events that are not associated
+ * with a file descriptor and are passed via the message queue.
+ */ 
+class EventHandler : public Event, private Monitor
+{
+  public:
+    EventHandler(int epollSize = 256);
+    ~EventHandler();
+
+    int getEpollFd() { return epollFd; }
+    void epollAdd(int fd, uint32_t epollEvents, Event* event);
+    void epollMod(int fd, uint32_t epollEvents, Event* event);
+    void epollDel(int fd);
+
+    void mqPut(Event* event);
+    Event* mqGet();
+    
+  protected:
+    // Should never be called, only complete.
+    void prepare(EventHandler&) { assert(0); }
+    Event* complete(EventHandler& eh);
+    
+  private:
+    int epollFd;
+    std::string mqName;
+    int mqFd;
+    std::queue<Event*> mqEvents;
+};
+
+EventHandler::EventHandler(int epollSize)
+{
+    epollFd = epoll_create(epollSize);
+    if (epollFd < 0) throw QPID_POSIX_ERROR(errno);
+
+    // Create a POSIX message queue for non-fd events.
+    // We write one byte and never read it is always ready for read
+    // when we add it to epoll.
+    // 
+    ZeroStruct<struct mq_attr> attr;
+    attr.mq_maxmsg = 1;
+    attr.mq_msgsize = 1;
+    do {
+        char tmpnam[L_tmpnam];
+        tmpnam_r(tmpnam);
+        mqName = tmpnam + 4; // Skip "tmp/"
+        mqFd = mq_open(
+            mqName.c_str(), O_CREAT|O_EXCL|O_RDWR|O_NONBLOCK, S_IRWXU, &attr);
+        if (mqFd < 0) throw QPID_POSIX_ERROR(errno);
+    } while (mqFd == EEXIST);  // Name already taken, try again.
+
+    static char zero = '\0';
+    mq_send(mqFd, &zero, 1, 0);
+    epollAdd(mqFd, 0, this);
+}
+
+EventHandler::~EventHandler() {
+    mq_close(mqFd);
+    mq_unlink(mqName.c_str());
+}
+
+void EventHandler::mqPut(Event* event) {
+    ScopedLock l(*this);
+    assert(event != 0);
+    mqEvents.push(event);
+    epollMod(mqFd, EPOLLIN|EPOLLONESHOT, this);
+}
+
+Event* EventHandler::mqGet() {
+    ScopedLock l(*this);
+    if (mqEvents.empty()) 
+        return 0;
+    Event* event = mqEvents.front();
+    mqEvents.pop();
+    if(!mqEvents.empty())
+        epollMod(mqFd, EPOLLIN|EPOLLONESHOT, this);
+    return event;
+}
+
+void EventHandler::epollAdd(int fd, uint32_t epollEvents, Event* event)
+{
+    ZeroStruct<struct epoll_event> ee;
+    ee.data.ptr = event;
+    ee.events = epollEvents;
+    if (epoll_ctl(epollFd, EPOLL_CTL_ADD, fd, &ee) < 0) 
+        throw QPID_POSIX_ERROR(errno);
+}
+
+void EventHandler::epollMod(int fd, uint32_t epollEvents, Event* event)
+{
+    ZeroStruct<struct epoll_event> ee;
+    ee.data.ptr = event;
+    ee.events = epollEvents;
+    if (epoll_ctl(epollFd, EPOLL_CTL_MOD, fd, &ee) < 0) 
+        throw QPID_POSIX_ERROR(errno);
+}
+
+void EventHandler::epollDel(int fd) {
+    if (epoll_ctl(epollFd, EPOLL_CTL_DEL, fd, 0) < 0)
+        throw QPID_POSIX_ERROR(errno);
+}
+
+Event* EventHandler::complete(EventHandler& eh)
+{
+    assert(&eh == this);
+    Event* event =  mqGet();
+    return event==0 ? 0 : event->complete(eh);
+}
+    
+// ================================================================
+// EventChannel
+
+EventChannel::shared_ptr EventChannel::create() {
+    return shared_ptr(new EventChannel());
+}
+
+EventChannel::EventChannel() : handler(new EventHandler()) {}
+
+EventChannel::~EventChannel() {}
+
+void EventChannel::postEvent(Event& e) 
+{
+    e.prepare(*handler);
+}
+
+Event* EventChannel::getEvent()
+{
+    static const int infiniteTimeout = -1; 
+    ZeroStruct<struct epoll_event> epollEvent;
+
+    // Loop until we can complete the event. Some events may re-post
+    // themselves and return 0 from complete, e.g. partial reads. // 
+    Event* event = 0;
+    while (event == 0) {
+        int eventCount = epoll_wait(handler->getEpollFd(),
+                                    &epollEvent, 1, infiniteTimeout);
+        if (eventCount < 0) {
+            if (errno != EINTR) {
+                // TODO aconway 2006-11-28: Proper handling/logging of errors.
+                cerr << BOOST_CURRENT_FUNCTION << " ignoring error "
+                     << PosixError::getMessage(errno) << endl;
+                assert(0);
+            }
+        }
+        else if (eventCount == 1) {
+            event = reinterpret_cast<Event*>(epollEvent.data.ptr);
+            assert(event != 0);
+            try {
+                event = event->complete(*handler);
+            }
+            catch (const Exception& e) {
+                if (event)
+                    event->setError(e);
+            }
+            catch (const std::exception& e) {
+                if (event)
+                    event->setError(e);
+            }
+        }
+    }
+    return event;
+}
+
+Event::~Event() {}
+    
+void Event::prepare(EventHandler& handler)
+{
+    handler.mqPut(this);
+}
+
+bool Event::hasError() const {
+    return error;
+}
+
+void Event::throwIfError() throw (Exception) {
+    if (hasError())
+        error.throwSelf();
+}
+
+Event* Event::complete(EventHandler&)
+{
+    return this;
+}
+
+void Event::dispatch()
+{
+    try {
+        if (!callback.empty())
+            callback();
+    } catch (const std::exception&) {
+        throw;
+    } catch (...) {
+        throw QPID_ERROR(INTERNAL_ERROR, "Unknown exception.");
+    }
+}
+
+void Event::setError(const ExceptionHolder& e) {
+    error = e;
+}
+
+void ReadEvent::prepare(EventHandler& handler)
+{
+    handler.epollAdd(descriptor, EPOLLIN | EPOLLONESHOT, this);
+}
+
+ssize_t ReadEvent::doRead() {
+    ssize_t n = ::read(descriptor, static_cast<char*>(buffer) + received,
+                       size - received);
+    if (n > 0) received += n;
+    return n;
+}
+
+Event* ReadEvent::complete(EventHandler& handler)
+{
+    // Read as much as possible without blocking.
+    ssize_t n = doRead();
+    while (n > 0 && received < size) doRead();
+
+    if (received == size) {
+        handler.epollDel(descriptor);
+        received = 0;           // Reset for re-use.
+        return this;
+    }
+    else if (n <0 && (errno == EAGAIN)) {
+        // Keep polling for more.
+        handler.epollMod(descriptor, EPOLLIN | EPOLLONESHOT, this);
+        return 0;
+    }
+    else {
+        // Unexpected EOF or error. Throw ENODATA for EOF.
+        handler.epollDel(descriptor);
+        received = 0;           // Reset for re-use.
+        throw QPID_POSIX_ERROR((n < 0) ? errno : ENODATA);
+    }
+}
+
+void WriteEvent::prepare(EventHandler& handler)
+{
+    handler.epollAdd(descriptor, EPOLLOUT | EPOLLONESHOT, this);
+}
+
+Event* WriteEvent::complete(EventHandler& handler)
+{
+    ssize_t n = write(descriptor, static_cast<const char*>(buffer) + written,
+                      size - written);
+    if (n < 0) throw QPID_POSIX_ERROR(errno);
+    written += n;
+    if(written < size) {
+        // Keep polling.
+        handler.epollMod(descriptor, EPOLLOUT | EPOLLONESHOT, this);
+        return 0;
+    }
+    written = 0;                // Reset for re-use.
+    handler.epollDel(descriptor);
+    return this;
+}
+
+void AcceptEvent::prepare(EventHandler& handler)
+{
+    handler.epollAdd(descriptor, EPOLLIN | EPOLLONESHOT, this);
+}
+
+Event* AcceptEvent::complete(EventHandler& handler)
+{
+    handler.epollDel(descriptor);
+    accepted = ::accept(descriptor, 0, 0);
+    if (accepted < 0) throw QPID_POSIX_ERROR(errno);
+    return this;
+}
+
+}}
diff --git a/cpp/lib/common/sys/posix/EventChannel.h b/cpp/lib/common/sys/posix/EventChannel.h
new file mode 100644
index 0000000000..49c7fce740
--- /dev/null
+++ b/cpp/lib/common/sys/posix/EventChannel.h
@@ -0,0 +1,176 @@
+#ifndef _sys_EventChannel_h
+#define _sys_EventChannel_h
+
+/*
+ *
+ * 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.
+ *
+ */
+
+#include <SharedObject.h>
+#include <ExceptionHolder.h>
+#include <boost/function.hpp>
+#include <memory>
+
+namespace qpid {
+namespace sys {
+
+class Event;
+class EventHandler;
+class EventChannel;
+
+/**
+ * Base class for all Events.
+ */
+class Event
+{
+  public:
+    /** Type for callback when event is dispatched */
+    typedef boost::function0<void> Callback;
+
+    /**
+     * Create an event with optional callback.
+     * Instances of Event are sent directly through the channel.
+     * Derived classes define additional waiting behaviour.
+     *@param cb A callback functor that is invoked when dispatch() is called.
+     */
+    Event(Callback cb = 0) : callback(cb) {}
+
+    virtual ~Event();
+
+    /** Call the callback provided to the constructor, if any. */
+    void dispatch();
+
+    /** True if there was an error processing this event */
+    bool hasError() const;
+
+    /** If hasError() throw the corresponding exception. */
+    void throwIfError() throw(Exception);
+
+  protected:
+    virtual void prepare(EventHandler&);
+    virtual Event* complete(EventHandler&);
+    void setError(const ExceptionHolder& e);
+
+    Callback callback;
+    ExceptionHolder error;
+
+  friend class EventChannel;
+  friend class EventHandler;
+};
+
+template <class BufT>
+class IOEvent : public Event {
+  public:
+    void getDescriptor() const { return descriptor; }
+    size_t getSize() const { return size; }
+    BufT getBuffer() const { return buffer; }
+  
+  protected:
+    IOEvent(int fd, Callback cb, size_t sz, BufT buf) :
+        Event(cb), descriptor(fd), buffer(buf), size(sz) {}
+
+    int descriptor;
+    BufT buffer;
+    size_t size;
+};
+
+/** Asynchronous read event */
+class ReadEvent : public IOEvent<void*>
+{
+  public:
+    explicit ReadEvent(int fd=-1, void* buf=0, size_t sz=0, Callback cb=0) :
+        IOEvent<void*>(fd, cb, sz, buf), received(0) {}
+
+  private:
+    void prepare(EventHandler&);
+    Event* complete(EventHandler&);
+    ssize_t doRead();
+
+    size_t received;
+};
+
+/** Asynchronous write event */
+class WriteEvent : public IOEvent<const void*>
+{
+  public:
+    explicit WriteEvent(int fd=-1, const void* buf=0, size_t sz=0,
+                        Callback cb=0) :
+        IOEvent<const void*>(fd, cb, sz, buf), written(0) {}
+
+  protected:
+    void prepare(EventHandler&);
+    Event* complete(EventHandler&);
+
+  private:
+    ssize_t doWrite();
+    size_t written;
+};
+
+/** Asynchronous socket accept event */
+class AcceptEvent : public Event
+{
+  public:
+    /** Accept a connection on fd. */
+    explicit AcceptEvent(int fd=-1, Callback cb=0) :
+        Event(cb), descriptor(fd), accepted(0) {}
+
+    /** Get descriptor for server socket */
+    int getAcceptedDesscriptor() const { return accepted; }
+
+  private:
+    void prepare(EventHandler&);
+    Event* complete(EventHandler&);
+
+    int descriptor;
+    int accepted;
+};
+
+
+class QueueSet;
+
+/**
+ * Channel to post and wait for events.
+ */
+class EventChannel : public qpid::SharedObject<EventChannel>
+{
+  public:
+    static shared_ptr create();
+    
+    ~EventChannel();
+    
+    /** Post an event to the channel. */
+    void postEvent(Event& event);
+
+    /** Post an event to the channel. Must not be 0. */
+    void postEvent(Event* event) { postEvent(*event); }
+        
+    /**
+     * Wait for the next complete event.
+     *@return Pointer to event. Will never return 0.
+     */
+    Event* getEvent();
+
+  private:
+    EventChannel();
+    boost::shared_ptr<EventHandler> handler;
+};
+
+
+}}
+
+
+
+#endif  /*!_sys_EventChannel_h*/
diff --git a/cpp/lib/common/sys/posix/EventChannelThreads.cpp b/cpp/lib/common/sys/posix/EventChannelThreads.cpp
new file mode 100644
index 0000000000..95e699e0b0
--- /dev/null
+++ b/cpp/lib/common/sys/posix/EventChannelThreads.cpp
@@ -0,0 +1,119 @@
+/*
+ *
+ * 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.
+ *
+ */
+
+#include "EventChannelThreads.h"
+#include <sys/Runnable.h>
+#include <iostream>
+using namespace std;
+#include <boost/bind.hpp>
+
+namespace qpid {
+namespace sys {
+
+EventChannelThreads::shared_ptr EventChannelThreads::create(
+    EventChannel::shared_ptr ec)
+{
+    return EventChannelThreads::shared_ptr(new EventChannelThreads(ec));
+}
+
+EventChannelThreads::EventChannelThreads(EventChannel::shared_ptr ec) :
+    channel(ec), nWaiting(0), state(RUNNING)
+{
+    // TODO aconway 2006-11-15: Estimate initial threads based on CPUs.
+    addThread();
+}
+
+EventChannelThreads::~EventChannelThreads() {
+    shutdown();
+    join();
+}
+
+void EventChannelThreads::shutdown() 
+{
+    ScopedLock lock(*this);
+    if (state != RUNNING)       // Already shutting down.
+        return;
+    for (size_t i = 0; i < workers.size(); ++i) {
+        channel->postEvent(terminate);
+    }
+    state = TERMINATE_SENT;
+    notify();                // Wake up one join() thread.
+}
+
+void EventChannelThreads::join() 
+{
+    {
+        ScopedLock lock(*this);
+        while (state == RUNNING)    // Wait for shutdown to start.
+            wait();
+        if (state == SHUTDOWN)      // Shutdown is complete
+            return;
+        if (state == JOINING) {
+            // Someone else is doing the join.
+            while (state != SHUTDOWN)
+                wait();
+            return;
+        }
+        // I'm the  joining thread
+        assert(state == TERMINATE_SENT); 
+        state = JOINING; 
+    } // Drop the lock.
+
+    for (size_t i = 0; i < workers.size(); ++i) {
+        assert(state == JOINING); // Only this thread can change JOINING.
+        workers[i].join();
+    }
+    state = SHUTDOWN;
+    notifyAll();                // Notify other join() threaeds.
+}
+
+void EventChannelThreads::addThread() {
+    ScopedLock l(*this);
+    workers.push_back(Thread(*this));
+}
+
+void EventChannelThreads::run()
+{
+    // Start life waiting. Decrement on exit.
+    AtomicCount::ScopedIncrement inc(nWaiting);
+    try {
+        while (true) {
+            Event* e = channel->getEvent(); 
+            assert(e != 0);
+            if (e == &terminate) {
+                return;
+            }
+            AtomicCount::ScopedDecrement dec(nWaiting);
+            // I'm no longer waiting, make sure someone is.
+            if (dec == 0)
+                addThread();
+            e->dispatch();
+        }
+    }
+    catch (const std::exception& e) {
+        // TODO aconway 2006-11-15: need better logging across the board.
+        std::cerr << "EventChannelThreads::run() caught: " << e.what()
+                  << std::endl;
+    }
+    catch (...) {
+        std::cerr << "EventChannelThreads::run() caught unknown exception."
+                  << std::endl;
+    }
+}
+
+}}
diff --git a/cpp/lib/common/sys/posix/EventChannelThreads.h b/cpp/lib/common/sys/posix/EventChannelThreads.h
new file mode 100644
index 0000000000..98403c0869
--- /dev/null
+++ b/cpp/lib/common/sys/posix/EventChannelThreads.h
@@ -0,0 +1,92 @@
+#ifndef _posix_EventChannelThreads_h
+#define _sys_EventChannelThreads_h
+
+/*
+ *
+ * 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.
+ *
+ */
+#include <vector>
+
+#include <Exception.h>
+#include <sys/Time.h>
+#include <sys/Monitor.h>
+#include <sys/Thread.h>
+#include <sys/AtomicCount.h>
+#include "EventChannel.h"
+
+namespace qpid {
+namespace sys {
+
+/**
+   Dynamic thread pool serving an EventChannel.
+
+   Threads run a loop { e = getEvent(); e->dispatch(); }
+   The size of the thread pool is automatically adjusted to optimal size.
+*/
+class EventChannelThreads :
+        public qpid::SharedObject<EventChannelThreads>,
+        public sys::Monitor, private sys::Runnable
+{
+  public:
+    /** Create the thread pool and start initial threads. */
+    static EventChannelThreads::shared_ptr create(
+        EventChannel::shared_ptr channel
+    );
+
+    ~EventChannelThreads();
+
+    /** Post event to the underlying channel */
+    void postEvent(Event& event) { channel->postEvent(event); }
+
+    /** Post event to the underlying channel Must not be 0. */
+    void postEvent(Event* event) { channel->postEvent(event); }
+
+    /**
+     * Terminate all threads.
+     *
+     * Returns immediately, use join() to wait till all threads are
+     * shut down. 
+     */
+    void shutdown();
+    
+    /** Wait for all threads to terminate. */
+    void join();
+
+  private:
+    typedef std::vector<sys::Thread> Threads;
+    typedef enum {
+        RUNNING, TERMINATE_SENT, JOINING, SHUTDOWN
+    } State;
+
+    EventChannelThreads(EventChannel::shared_ptr underlyingChannel);
+    void addThread();
+
+    void run();
+    bool keepRunning();
+    void adjustThreads();
+
+    EventChannel::shared_ptr channel;
+    Threads workers;
+    sys::AtomicCount nWaiting;
+    State state;
+    Event terminate;
+};
+
+
+}}
+
+
+#endif  /*!_sys_EventChannelThreads_h*/
diff --git a/cpp/src/qpid/posix/PosixAcceptor.cpp b/cpp/lib/common/sys/posix/PosixAcceptor.cpp
index 9b37766e5c..842aa76f36 100644
--- a/cpp/src/qpid/posix/PosixAcceptor.cpp
+++ b/cpp/lib/common/sys/posix/PosixAcceptor.cpp
@@ -19,8 +19,8 @@
  *
  */
 
-#include <qpid/sys/Acceptor.h>
-#include <qpid/Exception.h>
+#include <sys/Acceptor.h>
+#include <Exception.h>
 
 namespace qpid {
 namespace sys {
diff --git a/cpp/src/qpid/posix/Socket.cpp b/cpp/lib/common/sys/posix/Socket.cpp
index 1321ae6b0d..5bd13742f6 100644
--- a/cpp/src/qpid/posix/Socket.cpp
+++ b/cpp/lib/common/sys/posix/Socket.cpp
@@ -20,71 +20,99 @@
  */
 
 #include <sys/socket.h>
+#include <sys/errno.h>
 #include <netinet/in.h>
 #include <netdb.h>
 
 #include <boost/format.hpp>
 
-#include <qpid/QpidError.h>
-#include <qpid/posix/check.h>
-#include <qpid/sys/Socket.h>
+#include <QpidError.h>
+#include <posix/check.h>
+#include <sys/Socket.h>
 
 using namespace qpid::sys;
 
-Socket::Socket() : socket(::socket (PF_INET, SOCK_STREAM, 0))
+Socket Socket::createTcp() 
 {
-    CHECKNN(socket == 0);
+    int s = ::socket (PF_INET, SOCK_STREAM, 0);
+    if (s < 0) throw QPID_POSIX_ERROR(errno);
+    return s;
 }
 
-void
-Socket::setTimeout(long msecs)
+Socket::Socket(int descriptor) : socket(descriptor) {}
+
+void Socket::setTimeout(Time interval)
 {
     struct timeval tv;
-    tv.tv_sec = msecs / 1000;
-    tv.tv_usec = (msecs % 1000)*1000;
+    tv.tv_sec = interval/TIME_SEC;
+    tv.tv_usec = (interval%TIME_SEC)/TIME_USEC;
     setsockopt(socket, SOL_SOCKET, SO_SNDTIMEO, &tv, sizeof(tv));
     setsockopt(socket, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(tv));
 }
 
-void
-Socket::connect(const std::string& host, int port)
+void Socket::connect(const std::string& host, int port)
 {
     struct sockaddr_in name;
     name.sin_family = AF_INET;
     name.sin_port = htons(port);
     struct hostent* hp = gethostbyname ( host.c_str() );
-    if (hp == 0) CHECK0(-1);     // TODO aconway 2006-11-09: error message?
+    if (hp == 0) throw QPID_POSIX_ERROR(errno);
     memcpy(&name.sin_addr.s_addr, hp->h_addr_list[0], hp->h_length);
-    CHECK0(::connect(socket, (struct sockaddr*)(&name), sizeof(name)));
+    if (::connect(socket, (struct sockaddr*)(&name), sizeof(name)) < 0)
+        throw QPID_POSIX_ERROR(errno);
 }
 
 void
 Socket::close()
 {
     if (socket == 0) return;
-    CHECK0(::close(socket));
+    if (::close(socket) < 0) throw QPID_POSIX_ERROR(errno);
     socket = 0;
 }
 
 ssize_t
-Socket::send(const char* data, size_t size)
+Socket::send(const void* data, size_t size)
 {
     ssize_t sent = ::send(socket, data, size, 0);
     if (sent < 0) {
         if (errno == ECONNRESET) return SOCKET_EOF;
         if (errno == ETIMEDOUT) return SOCKET_TIMEOUT;
-        CHECK0(sent);
+        throw QPID_POSIX_ERROR(errno);
     }
     return sent;
 }
 
 ssize_t
-Socket::recv(char* data, size_t size)
+Socket::recv(void* data, size_t size)
 {
     ssize_t received = ::recv(socket, data, size, 0);
     if (received < 0) {
         if (errno == ETIMEDOUT) return SOCKET_TIMEOUT;
-        CHECK0(received);
+        throw QPID_POSIX_ERROR(errno);
     }
     return received;
 }
+
+int Socket::listen(int port, int backlog) 
+{
+    struct sockaddr_in name;
+    name.sin_family = AF_INET;
+    name.sin_port = htons(port);
+    name.sin_addr.s_addr = 0;
+    if (::bind(socket, (struct sockaddr*)&name, sizeof(name)) < 0)
+        throw QPID_POSIX_ERROR(errno);
+    if (::listen(socket, backlog) < 0)
+        throw QPID_POSIX_ERROR(errno);
+    
+    socklen_t namelen = sizeof(name);
+    if (::getsockname(socket, (struct sockaddr*)&name, &namelen) < 0)
+        throw QPID_POSIX_ERROR(errno);
+
+    return ntohs(name.sin_port);
+}
+
+
+int Socket::fd() 
+{
+    return socket;
+}
diff --git a/cpp/src/qpid/posix/Thread.cpp b/cpp/lib/common/sys/posix/Thread.cpp
index 091b045e66..f524799556 100644
--- a/cpp/src/qpid/posix/Thread.cpp
+++ b/cpp/lib/common/sys/posix/Thread.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include <qpid/sys/Thread.h>
+#include <sys/Thread.h>
 
 void* qpid::sys::Thread::runRunnable(void* p)
 {
diff --git a/cpp/src/qpid/posix/check.cpp b/cpp/lib/common/sys/posix/check.cpp
index 2ef52f68b7..408679caa8 100644
--- a/cpp/src/qpid/posix/check.cpp
+++ b/cpp/lib/common/sys/posix/check.cpp
@@ -19,15 +19,21 @@
  *
  */
 
-#include <qpid/QpidError.h>
+#include <cerrno>
 #include "check.h" 
 
 namespace qpid {
 namespace sys {
 
-std::string errnoToString() {
+std::string
+PosixError::getMessage(int errNo)
+{
     char buf[512];
-    return strerror_r(errno, buf, sizeof(buf));
+    return std::string(strerror_r(errNo, buf, sizeof(buf)));
 }
 
+PosixError::PosixError(int errNo, const qpid::SrcLine& loc) throw()
+    : qpid::QpidError(INTERNAL_ERROR + errNo, getMessage(errNo), loc)
+{ }
+    
 }}
diff --git a/cpp/src/qpid/posix/check.h b/cpp/lib/common/sys/posix/check.h
index 666637b1c2..5afbe8f5a8 100644
--- a/cpp/src/qpid/posix/check.h
+++ b/cpp/lib/common/sys/posix/check.h
@@ -22,18 +22,41 @@
  *
  */
 
-#include <errno.h>
+#include <cerrno>
 #include <string>
-#include <qpid/QpidError.h>
+#include <QpidError.h>
 
 namespace qpid {
 namespace sys {
 
-std::string errnoToString();
+/**
+ * Exception with message from errno.
+ */
+class PosixError : public qpid::QpidError
+{
+  public:
+    static std::string getMessage(int errNo);
+    
+    PosixError(int errNo, const qpid::SrcLine& location) throw();
+    
+    ~PosixError() throw() {}
+    
+    int getErrNo() { return errNo; }
+
+    Exception* clone() const throw() { return new PosixError(*this); }
+        
+    void throwSelf() { throw *this; }
+
+  private:
+    int errNo;
+};
 
-#define CHECK0(N) if ((N)!=0) THROW_QPID_ERROR(INTERNAL_ERROR, errnoToString())
-#define CHECKNN(N) if ((N)<0) THROW_QPID_ERROR(INTERNAL_ERROR, errnoToString())
 }}
 
+/** Create a PosixError for the current file/line and errno. */
+#define QPID_POSIX_ERROR(errNo) ::qpid::sys::PosixError(errNo, SRCLINE)
 
+/** Throw a posix error if errNo is non-zero */
+#define QPID_POSIX_THROW_IF(ERRNO)              \
+    if ((ERRNO) != 0) throw QPID_POSIX_ERROR((ERRNO))
 #endif  /*!_posix_check_h*/
diff --git a/cpp/m4/clock_time.m4 b/cpp/m4/clock_time.m4
new file mode 100644
index 0000000000..227a5978e5
--- /dev/null
+++ b/cpp/m4/clock_time.m4
@@ -0,0 +1,30 @@
+# clock_time.m4 serial 8
+dnl Copyright (C) 2002-2006 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+# Check for clock_gettime and clock_settime, and set LIB_CLOCK_GETTIME.
+# For a program named, say foo, you should add a line like the following
+# in the corresponding Makefile.am file:
+# foo_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME)
+
+AC_DEFUN([gl_CLOCK_TIME],
+[
+  dnl Persuade glibc and Solaris <time.h> to declare these functions.
+  AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
+
+  # Solaris 2.5.1 needs -lposix4 to get the clock_gettime function.
+  # Solaris 7 prefers the library name -lrt to the obsolescent name -lposix4.
+
+  # Save and restore LIBS so e.g., -lrt, isn't added to it.  Otherwise, *all*
+  # programs in the package would end up linked with that potentially-shared
+  # library, inducing unnecessary run-time overhead.
+  gl_saved_libs=$LIBS
+    AC_SEARCH_LIBS(clock_gettime, [rt posix4],
+                   [test "$ac_cv_search_clock_gettime" = "none required" ||
+                    LIB_CLOCK_GETTIME=$ac_cv_search_clock_gettime])
+    AC_SUBST([LIB_CLOCK_GETTIME])
+    AC_CHECK_FUNCS(clock_gettime clock_settime)
+  LIBS=$gl_saved_libs
+])
diff --git a/cpp/m4/compiler-flags.m4 b/cpp/m4/compiler-flags.m4
new file mode 100644
index 0000000000..01cb728f02
--- /dev/null
+++ b/cpp/m4/compiler-flags.m4
@@ -0,0 +1,23 @@
+# serial 3
+# Find valid warning flags for the C Compiler.           -*-Autoconf-*-
+dnl Copyright (C) 2001, 2002, 2006 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl Written by Jesse Thilo.
+
+AC_DEFUN([gl_COMPILER_FLAGS],
+  [AC_MSG_CHECKING(whether compiler accepts $1)
+   AC_SUBST(COMPILER_FLAGS)
+   ac_save_CFLAGS="$CFLAGS"
+   CFLAGS="$CFLAGS $1"
+   ac_save_CXXFLAGS="$CXXFLAGS"
+   CXXFLAGS="$CXXFLAGS $1"
+   AC_TRY_COMPILE(,
+    [int x;],
+    COMPILER_FLAGS="$COMPILER_FLAGS $1"
+    AC_MSG_RESULT(yes),
+    AC_MSG_RESULT(no))
+  CFLAGS="$ac_save_CFLAGS"
+  CXXFLAGS="$ac_save_CXXFLAGS"
+ ])
diff --git a/cpp/m4/extensions.m4 b/cpp/m4/extensions.m4
new file mode 100644
index 0000000000..143a9e5403
--- /dev/null
+++ b/cpp/m4/extensions.m4
@@ -0,0 +1,58 @@
+# serial 4  -*- Autoconf -*-
+# Enable extensions on systems that normally disable them.
+
+# Copyright (C) 2003, 2006 Free Software Foundation, Inc.
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This definition of AC_USE_SYSTEM_EXTENSIONS is stolen from CVS
+# Autoconf.  Perhaps we can remove this once we can assume Autoconf
+# 2.61 or later everywhere, but since CVS Autoconf mutates rapidly
+# enough in this area it's likely we'll need to redefine
+# AC_USE_SYSTEM_EXTENSIONS for quite some time.
+
+# AC_USE_SYSTEM_EXTENSIONS
+# ------------------------
+# Enable extensions on systems that normally disable them,
+# typically due to standards-conformance issues.
+AC_DEFUN([AC_USE_SYSTEM_EXTENSIONS],
+[
+  AC_BEFORE([$0], [AC_COMPILE_IFELSE])
+  AC_BEFORE([$0], [AC_RUN_IFELSE])
+
+  AC_REQUIRE([AC_GNU_SOURCE])
+  AC_REQUIRE([AC_AIX])
+  AC_REQUIRE([AC_MINIX])
+
+  AH_VERBATIM([__EXTENSIONS__],
+[/* Enable extensions on Solaris.  */
+#ifndef __EXTENSIONS__
+# undef __EXTENSIONS__
+#endif
+#ifndef _POSIX_PTHREAD_SEMANTICS
+# undef _POSIX_PTHREAD_SEMANTICS
+#endif
+#ifndef _TANDEM_SOURCE
+# undef _TANDEM_SOURCE
+#endif])
+  AC_CACHE_CHECK([whether it is safe to define __EXTENSIONS__],
+    [ac_cv_safe_to_define___extensions__],
+    [AC_COMPILE_IFELSE(
+       [AC_LANG_PROGRAM([
+#	  define __EXTENSIONS__ 1
+	  AC_INCLUDES_DEFAULT])],
+       [ac_cv_safe_to_define___extensions__=yes],
+       [ac_cv_safe_to_define___extensions__=no])])
+  test $ac_cv_safe_to_define___extensions__ = yes &&
+    AC_DEFINE([__EXTENSIONS__])
+  AC_DEFINE([_POSIX_PTHREAD_SEMANTICS])
+  AC_DEFINE([_TANDEM_SOURCE])
+])
+
+# gl_USE_SYSTEM_EXTENSIONS
+# ------------------------
+# Enable extensions on systems that normally disable them,
+# typically due to standards-conformance issues.
+AC_DEFUN([gl_USE_SYSTEM_EXTENSIONS],
+  [AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])])
diff --git a/cpp/options-rhel3.mk b/cpp/options-rhel3.mk
index c84cab94b1..be5741e8c6 100644
--- a/cpp/options-rhel3.mk
+++ b/cpp/options-rhel3.mk
@@ -2,8 +2,6 @@
 # Expects dependencies in ~/local
 #
 
-RELEASE := 1
-
 # Configure Boost.
 BOOST_CXXFLAGS := -I$(HOME)/local/boost-1.33.1/include/boost-1_33_1
 CXXFLAGS := $(CXXFLAGS) $(BOOST_CXXFLAGS)
diff --git a/cpp/release.client.rhel3 b/cpp/release.client.rhel3
index f1f3b0fe88..839277a5c0 100755
--- a/cpp/release.client.rhel3
+++ b/cpp/release.client.rhel3
@@ -7,8 +7,13 @@ elif [[ $# -ne 0 ]]; then
   exit 2
 else
   # Default the name to the svn revision
-  svnRevision=$(svn info | grep ^Revision: | awk '{print $2}')
-  name=r${svnRevision}
+  if which svn >/dev/null 2>&1; then
+    svnRevision=$(svn info | grep ^Revision: | awk '{print $2}')
+    name=r${svnRevision}
+  else
+    echo "You need to have svn in your PATH or specify a release name"
+    exit 2
+  fi
 fi
 
 name=qpid-cpp-client-$name
@@ -29,8 +34,13 @@ cp \
   build/apr-release/lib/libqpid_client.so.1.0 \
   build/apr-release/lib/libqpid_common.so.1.0 \
   $dir/lib
-cp -r ~/local/apr-1.2.7 $dir/lib
-cp -r ~/local/boost-1.33.1 $dir/lib
+mkdir $dir/lib.debug
+cp \
+  build/apr-debug/lib/libqpid_client.so.1.0 \
+  build/apr-debug/lib/libqpid_common.so.1.0 \
+  $dir/lib.debug
+#cp -r ~/local/apr-1.2.7 $dir/lib
+#cp -r ~/local/boost-1.33.1 $dir/lib
 
 #
 # Copy over headers.
diff --git a/cpp/src/Makefile.am b/cpp/src/Makefile.am
new file mode 100644
index 0000000000..61f721dc1a
--- /dev/null
+++ b/cpp/src/Makefile.am
@@ -0,0 +1,14 @@
+AM_CXXFLAGS = $(WARNING_CFLAGS)
+INCLUDES = \
+  -I$(top_srcdir)/gen \
+  -I$(top_srcdir)/lib/broker \
+  -I$(top_srcdir)/lib/common \
+  -I$(top_srcdir)/lib/common/framing \
+  -I$(top_srcdir)/lib/common/sys
+
+LDADD =				\
+  ../lib/broker/libbroker.la	\
+  ../lib/common/libcommon.la
+
+bin_PROGRAMS = qpidd
+qpidd_SOURCES = qpidd.cpp
diff --git a/cpp/src/qpid/Exception.h b/cpp/src/qpid/Exception.h
deleted file mode 100644
index 2aba43586d..0000000000
--- a/cpp/src/qpid/Exception.h
+++ /dev/null
@@ -1,78 +0,0 @@
-#ifndef _Exception_
-#define _Exception_
-
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-#include <exception>
-#include <string>
-#include <memory>
-
-namespace qpid
-{
-/**
- * Exception base class for all Qpid exceptions.
- */
-class Exception : public std::exception
-{
-  protected:
-    std::string whatStr;
-
-  public:
-    Exception() throw() {}
-    Exception(const std::string& str) throw() : whatStr(str) {}
-    Exception(const char* str) throw() : whatStr(str) {}
-    virtual ~Exception() throw();
-
-    virtual const char* what() const throw() { return whatStr.c_str(); }
-    virtual std::string toString() const throw() { return whatStr; }
-};
-
-/**
- * Wrapper for heap-allocated exceptions. Use like this:
- * <code>
- * std::auto_ptr<Exception> ex = new SomeEx(...)
- * HeapException hex(ex);       // Takes ownership
- * throw hex;                   // Auto-deletes ex
- * </code>
- */
-class HeapException : public Exception, public std::auto_ptr<Exception>
-{
-  public:
-    HeapException() {}
-    HeapException(std::auto_ptr<Exception> e) : std::auto_ptr<Exception>(e) {}
-
-    HeapException& operator=(std::auto_ptr<Exception>& e) {
-        std::auto_ptr<Exception>::operator=(e);
-        return *this;
-    }
-
-    ~HeapException() throw() {}
-    
-    virtual const char* what() const throw() { return (*this)->what(); }
-    virtual std::string toString() const throw() {
-        return (*this)->toString();
-    }
-};
-    
-}
-
-#endif  /*!_Exception_*/
diff --git a/cpp/src/qpid/QpidError.h b/cpp/src/qpid/QpidError.h
deleted file mode 100644
index 79ccd2f579..0000000000
--- a/cpp/src/qpid/QpidError.h
+++ /dev/null
@@ -1,49 +0,0 @@
-#ifndef __QpidError__
-#define __QpidError__
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-#include <string>
-#include <qpid/Exception.h>
-
-namespace qpid {
-
-    class QpidError : public Exception { 
-      public:
-        const int code;
-        const std::string msg;
-        const std::string file;
-        const int line;
-
-        QpidError(int _code, const std::string& _msg, const std::string& _file, int _line) throw();
-        ~QpidError() throw();
-    };
-
-#define THROW_QPID_ERROR(A, B) throw QpidError(A, B, __FILE__, __LINE__)
-
-}
-
-#define PROTOCOL_ERROR 10000
-#define APR_ERROR 20000
-#define FRAMING_ERROR 30000
-#define CLIENT_ERROR 40000
-#define INTERNAL_ERROR 50000
-
-#endif
diff --git a/cpp/src/qpid/framing/amqp_framing.h b/cpp/src/qpid/framing/amqp_framing.h
deleted file mode 100644
index 6714eddf07..0000000000
--- a/cpp/src/qpid/framing/amqp_framing.h
+++ /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.
- *
- */
-#include <qpid/framing/amqp_types.h>
-#include <qpid/framing/AMQFrame.h>
-#include <qpid/framing/AMQBody.h>
-#include <qpid/framing/BodyHandler.h>
-#include <qpid/framing/AMQMethodBody.h>
-#include <qpid/framing/AMQHeaderBody.h>
-#include <qpid/framing/AMQContentBody.h>
-#include <qpid/framing/AMQHeartbeatBody.h>
-#include <qpid/framing/AMQP_MethodVersionMap.h>
-#include <qpid/framing/InputHandler.h>
-#include <qpid/framing/OutputHandler.h>
-#include <qpid/framing/InitiationHandler.h>
-#include <qpid/framing/ProtocolInitiation.h>
-#include <qpid/framing/BasicHeaderProperties.h>
-#include <qpid/framing/ProtocolVersion.h>
-#include <qpid/framing/ProtocolVersionException.h>
diff --git a/cpp/src/qpid/posix/EpollEventChannel.cpp b/cpp/src/qpid/posix/EpollEventChannel.cpp
deleted file mode 100644
index 7dce4bc58c..0000000000
--- a/cpp/src/qpid/posix/EpollEventChannel.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- *
- * 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.
- *
- */
-
-#include <qpid/sys/EventChannel.h>
-#include <sys/epoll.h>
-#include "EpollEventChannel.h"
-
-namespace qpid {
-namespace sys {
-
-EventChannel::shared_ptr EventChannel::create()
-{
-    return EventChannel::shared_ptr(new EpollEventChannel());
-}
-
-EpollEventChannel::EpollEventChannel()
-{
-    // TODO aconway 2006-11-13: How to choose size parameter?
-    static const size_t estimatedFdsForEpoll = 1000;
-    epollFd = epoll_create(estimatedFdsForEpoll);
-}
-
-EpollEventChannel::~EpollEventChannel() { }
-
-void 
-EpollEventChannel::post(ReadEvent& /*event*/)
-{
-}
-
-void
-EpollEventChannel::post(WriteEvent& /*event*/)
-{
-}
-
-void
-EpollEventChannel::post(AcceptEvent& /*event*/)
-{
-}
-
-void
-EpollEventChannel::post(NotifyEvent& /*event*/)
-{
-}
-
-inline void
-EpollEventChannel::post(Event& /*event*/)
-{
-}
-
-Event*
-EpollEventChannel::getEvent()
-{
-    return 0;
-}
-
-void
-EpollEventChannel::dispose(void* /*buffer*/, size_t)
-{
-}
-
-}}
diff --git a/cpp/src/qpid/sys/EventChannel.h b/cpp/src/qpid/sys/EventChannel.h
deleted file mode 100644
index dd857c02c7..0000000000
--- a/cpp/src/qpid/sys/EventChannel.h
+++ /dev/null
@@ -1,239 +0,0 @@
-#ifndef _sys_EventChannel_h
-#define _sys_EventChannel_h
-
-/*
- *
- * 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.
- *
- */
-
-#include <qpid/SharedObject.h>
-#include <qpid/Exception.h>
-#include <qpid/sys/Time.h>
-
-namespace qpid {
-namespace sys {
-
-class EventChannel;
-
-class Event;
-class ReadEvent;
-class WriteEvent;
-class AcceptEvent;
-class NotifyEvent;
-
-/**
-   Active event channel. Events represent async IO requests or
-   inter-task synchronization. Posting an Event registers interest in
-   the IO or sync event. When it occurs the posted Event is 
-   corresponding IO or sync event occurs they are returned to one
-   of the threads waiting on the channel. For more details see
-   the Event hierarchy.
-*/
-class EventChannel : public qpid::SharedObject<EventChannel>
-{
-  public:
-    static EventChannel::shared_ptr create();
-    
-    virtual ~EventChannel() {}
-
-    virtual void post(ReadEvent& event) = 0;
-    virtual void post(WriteEvent& event) = 0;
-    virtual void post(AcceptEvent& event) = 0;
-    virtual void post(NotifyEvent& event) = 0;
-
-    inline void post(Event& event);
-
-    /**
-     * Wait for the next completed event.
-     * @return An Event or 0 to indicate the calling thread should shut down.
-     */
-    virtual Event* getEvent() = 0;
-
-    /** Dispose of a system-allocated buffer. Called by ReadEvent */
-    virtual void dispose(void* buffer, size_t size) = 0;
-    
-  protected:
-    EventChannel() {}
-};
-
-
-/**
- * Base class for all events. There are two possible styles of use:
- *
- * Task style: the event is allocated as a local variable on the initiating
- * task, which blocks in wait(). Event::dispatch() resumes that task
- * with the event data available.
- *
- * Proactor style: Threads post events but do not
- * wait. Event::dispatch() processes the event in the dispatching
- * thread and then deletes itself.
- *
- * Tasks give less kernel context switching and blocking AND simpler
- * coding.  Tasks can call any number of pseudo-blocking opereations
- * that are actually event post/wait pairs. At each such point the
- * current thread can continue with the task or switch to another task
- * to minimise blocking.
- *
- * With Proactor style dispatch() is an atomic unit of work as far as
- * the EventChannel is concerned. To avoid such blocking the
- * application has to be written as a collection of non-blocking
- * dispatch() callbacks, which is more complex than tasks that can
- * call pseudo-blocking operations.
- */
-class Event : private boost::noncopyable 
-{
-  public:
-    virtual ~Event() {}
-
-    /** Post this event to the channel */
-    virtual void post(EventChannel& channel) = 0;
-
-    /**
-     * Block till the event is delivered.
-     * At  most one task can wait on an event.
-     */
-    virtual void wait() const = 0;
-
-    /**
-     * Dispatch the event. Runs some event-specific code, may switch
-     * context to resume a waiting task.
-     */
-    virtual void dispatch() = 0;
-};
-
-    
-/**
- * Base class for asynchronous request events, provides exception
- * handling.
- */
-class RequestEvent : public Event
-{
-  public:
-    /** True if the async request failed */
-    bool hasException() const { return ex.get(); }
-
-    const qpid::Exception& getException() const { return *ex; }
-    
-    void setException(std::auto_ptr<qpid::Exception>& e) { ex = e; }
-
-    /** If the event has an exception throw it, else do nothing */
-    void verify() const { if (ex.get()) throw *ex; }
-
-    void post(EventChannel& channel) { channel.post(*this); }
-
-  private:
-    qpid::HeapException ex;
-};
-
-
-/** An asynchronous read event. */
-class ReadEvent : public RequestEvent {
-  public:
-    /**
-     * Read data from fd.
-     */
-    ReadEvent(int fileDescriptor, void* buffer, size_t bytesToRead) :
-        fd(fileDescriptor), data(buffer), size(bytesToRead) {}
-
-    /** Number of bytes read. */
-    size_t getBytesRead() const { verify(); return size; }
-
-    /**
-     * If the system supports direct access to DMA buffers then
-     * it may provide a direct pointer to such a buffer to avoid
-     * a copy into the user buffer.
-     * @return true if getData() is returning a system-supplied buffer.
-     */
-    bool isSystemData() const { verify(); return channel != 0; }
-
-    /**
-     * Pointer to data read. Note if isSystemData() is true then this
-     * is NOT the same buffer that was supplied to the constructor.
-     * The user buffer is untouched. See dispose().
-     */
-    void* getData() const { verify(); return data; }
-
-    /** Called by the event channel on completion. */
-    void complete(EventChannel::shared_ptr ec, void* _data, size_t _size) {
-        if (data != _data) channel = ec; data = _data; size = _size;
-    }
-
-    /**
-     * Dispose of system-provided data buffer, if any.  This is
-     * automatically called by the destructor.
-     */
-    void dispose() { if(channel && data) channel->dispose(data,size); data=0; }
-
-    ~ReadEvent() { dispose(); }
-
-    void post(EventChannel& channel) { channel.post(*this); }
-
-  private:
-    int fd;
-    void* data;
-    size_t size;
-    EventChannel::shared_ptr channel;
-};
-
-/** Asynchronous write event */
-class WriteEvent : public RequestEvent {
-  public:
-    WriteEvent(int fileDescriptor, void* buffer, size_t bytesToWrite) :
-        fd(fileDescriptor), data(buffer), size(bytesToWrite) {}
-
-    /** Number of bytes written */
-    size_t getBytesWritten() const { verify(); return size; }
-
-    void post(EventChannel& channel) { channel.post(*this); }
-
-  private:
-    int fd;
-    void*  data;
-    size_t size;
-};
-
-/** Asynchronous socket accept event */
-class AcceptEvent : public RequestEvent {
-  public:
-    /** Accept a connection on listeningFd */
-    AcceptEvent(int listeningFd) : listen(listeningFd) {}
-
-    /** Get accepted file descriptor */
-    int getAcceptedFd() const { verify(); return accepted; }
-
-    void post(EventChannel& channel) { channel.post(*this); }
-
-  private:
-    int listen;
-    int accepted;
-};
-
-/**
- * NotifyEvent is delievered immediately to be dispatched by an
- * EventChannel thread.
- */
-class NotifyEvent : public RequestEvent {
-  public:
-    void post(EventChannel& channel) { channel.post(*this); }
-};
-
-
-inline void EventChannel::post(Event& event) { event.post(*this); }
-
-}}
-
-
-#endif  /*!_sys_EventChannel_h*/
diff --git a/cpp/src/qpid/sys/Monitor.h b/cpp/src/qpid/sys/Monitor.h
deleted file mode 100644
index 59e1e74b57..0000000000
--- a/cpp/src/qpid/sys/Monitor.h
+++ /dev/null
@@ -1,230 +0,0 @@
-#ifndef _sys_Monitor_h
-#define _sys_Monitor_h
-
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-#include <boost/noncopyable.hpp>
-
-#ifdef USE_APR
-#  include <apr_thread_mutex.h>
-#  include <apr_thread_cond.h>
-#  include <qpid/apr/APRBase.h>
-#  include <qpid/apr/APRPool.h>
-#else
-#  include <pthread.h>
-#  include <qpid/sys/Time.h>
-#  include <qpid/posix/check.h>
-#endif
-
-namespace qpid {
-namespace sys {
-
-template <class L>
-class ScopedLock
-{
-  public:
-    ScopedLock(L& l) : mutex(l) { l.lock(); }
-    ~ScopedLock() { mutex.unlock(); }
-  private:
-    L& mutex;
-};
-
-
-class Mutex : private boost::noncopyable
-{
-  public:
-    typedef ScopedLock<Mutex> ScopedLock;
-    
-    inline Mutex();
-    inline ~Mutex();
-    inline void lock();
-    inline void unlock();
-    inline void trylock();
-
-  protected:
-#ifdef USE_APR
-    apr_thread_mutex_t* mutex;
-#else
-    pthread_mutex_t mutex;
-#endif
-};
-
-/** A condition variable and a mutex */
-class Monitor : public Mutex
-{
-  public:
-    inline Monitor();
-    inline ~Monitor();
-    inline void wait();
-    inline bool wait(int64_t nsecs);
-    inline void notify();
-    inline void notifyAll();
-
-  private:
-#ifdef USE_APR
-    apr_thread_cond_t* condition;
-#else
-    pthread_cond_t condition;
-#endif
-};
-
-
-// APR ================================================================
-#ifdef USE_APR
-
-Mutex::Mutex() {
-    CHECK_APR_SUCCESS(apr_thread_mutex_create(&mutex, APR_THREAD_MUTEX_NESTED, APRPool::get()));
-}
-
-Mutex::~Mutex(){
-    CHECK_APR_SUCCESS(apr_thread_mutex_destroy(mutex));
-}
-
-void Mutex::lock() {
-    CHECK_APR_SUCCESS(apr_thread_mutex_lock(mutex));
-}
-void Mutex::unlock() {
-    CHECK_APR_SUCCESS(apr_thread_mutex_unlock(mutex));
-}
-
-void Mutex::trylock() {
-    CHECK_APR_SUCCESS(apr_thread_mutex_trylock(mutex));
-}
-
-Monitor::Monitor() {
-    CHECK_APR_SUCCESS(apr_thread_cond_create(&condition, APRPool::get()));
-}
-
-Monitor::~Monitor() {
-    CHECK_APR_SUCCESS(apr_thread_cond_destroy(condition));
-}
-
-void Monitor::wait() {
-    CHECK_APR_SUCCESS(apr_thread_cond_wait(condition, mutex));
-}
-
-bool Monitor::wait(int64_t nsecs){
-    // APR uses microseconds.
-    apr_status_t status = apr_thread_cond_timedwait(
-        condition, mutex, nsecs/1000);
-    if(status != APR_TIMEUP) CHECK_APR_SUCCESS(status);
-    return status == 0;
-}
-
-void Monitor::notify(){
-    CHECK_APR_SUCCESS(apr_thread_cond_signal(condition));
-}
-
-void Monitor::notifyAll(){
-    CHECK_APR_SUCCESS(apr_thread_cond_broadcast(condition));
-}
-
-
-}}
-
-
-// POSIX ================================================================
-#else
-/**
- * PODMutex is a POD, can be static-initialized with
- * PODMutex m = QPID_PODMUTEX_INITIALIZER
- */
-struct PODMutex 
-{
-    typedef ScopedLock<PODMutex> ScopedLock;
-
-    inline void lock();
-    inline void unlock();
-    inline void trylock();
-
-    // Must be public to be a POD:
-    pthread_mutex_t mutex;
-};
-
-#define QPID_MUTEX_INITIALIZER { PTHREAD_MUTEX_INITIALIZER }
-
-
-void PODMutex::lock() {
-    CHECK0(pthread_mutex_lock(&mutex));
-}
-void PODMutex::unlock() {
-    CHECK0(pthread_mutex_unlock(&mutex));
-}
-
-void PODMutex::trylock() {
-    CHECK0(pthread_mutex_trylock(&mutex));
-}
-
-
-Mutex::Mutex() {
-    CHECK0(pthread_mutex_init(&mutex, 0));
-}
-
-Mutex::~Mutex(){
-    CHECK0(pthread_mutex_destroy(&mutex));
-}
-
-void Mutex::lock() {
-    CHECK0(pthread_mutex_lock(&mutex));
-}
-void Mutex::unlock() {
-    CHECK0(pthread_mutex_unlock(&mutex));
-}
-
-void Mutex::trylock() {
-    CHECK0(pthread_mutex_trylock(&mutex));
-}
-
-Monitor::Monitor() {
-    CHECK0(pthread_cond_init(&condition, 0));
-}
-
-Monitor::~Monitor() {
-    CHECK0(pthread_cond_destroy(&condition));
-}
-
-void Monitor::wait() {
-    CHECK0(pthread_cond_wait(&condition, &mutex));
-}
-
-bool Monitor::wait(int64_t nsecs){
-    Time t(nsecs);
-    int status = pthread_cond_timedwait(&condition, &mutex, &t.getTimespec());
-    if(status != 0) {
-        if (errno == ETIMEDOUT) return false;
-        CHECK0(status);
-    }
-    return true;
-}
-
-void Monitor::notify(){
-    CHECK0(pthread_cond_signal(&condition));
-}
-
-void Monitor::notifyAll(){
-    CHECK0(pthread_cond_broadcast(&condition));
-}
-
-
-}}
-#endif  /*USE_APR*/
-#endif  /*!_sys_Monitor_h*/
diff --git a/cpp/src/qpid/sys/Time.h b/cpp/src/qpid/sys/Time.h
deleted file mode 100644
index a569c90780..0000000000
--- a/cpp/src/qpid/sys/Time.h
+++ /dev/null
@@ -1,76 +0,0 @@
-#ifndef _sys_Time_h
-#define _sys_Time_h
-
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-#include <stdint.h>
-
-#ifdef USE_APR
-#  include <apr_time.h>
-#else
-#  include <time.h>
-#endif
-
-namespace qpid {
-namespace sys {
-
-class Time
-{
-  public:
-    static Time now();
- 
-    enum {
-        NSEC_PER_SEC=1000*1000*1000,
-        NSEC_PER_MSEC=1000*1000,
-        NSEC_PER_USEC=1000
-    };
-
-    inline Time(int64_t ticks=0, long nsec_per_tick=1);
-
-    void set(int64_t ticks, long nsec_per_tick=1);
-        
-    inline int64_t msecs() const;
-    inline int64_t usecs() const;
-    int64_t nsecs() const;
-
-#ifndef USE_APR
-    const struct timespec& getTimespec() const { return time; }
-    struct timespec& getTimespec() { return time; }
-#endif
-    
-  private:
-#ifdef USE_APR
-    apr_time_t time;
-#else
-    struct timespec time;
-#endif
-};
-
-Time::Time(int64_t ticks, long nsec_per_tick) { set(ticks, nsec_per_tick); }
-
-int64_t Time::msecs() const { return nsecs() / NSEC_PER_MSEC; }
-
-int64_t Time::usecs() const { return nsecs() / NSEC_PER_USEC; }
-
-}}
-
-#endif  /*!_sys_Time_h*/
diff --git a/cpp/src/qpid/sys/doxygen_summary.h b/cpp/src/qpid/sys/doxygen_summary.h
deleted file mode 100644
index a4416995a6..0000000000
--- a/cpp/src/qpid/sys/doxygen_summary.h
+++ /dev/null
@@ -1,30 +0,0 @@
-#ifndef _doxygen_summary_
-#define _doxygen_summary_
-
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-// No code just a doxygen comment for the namespace
-
-/** \namspace qpid::sys
- * Portability wrappers for platform-specific details.
- */
-#endif  /*!_doxygen_summary_*/
diff --git a/cpp/src/qpidd.cpp b/cpp/src/qpidd.cpp
index cd50760f17..8285f1aefb 100644
--- a/cpp/src/qpidd.cpp
+++ b/cpp/src/qpidd.cpp
@@ -7,9 +7,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -18,11 +18,14 @@
  * under the License.
  *
  */
-#include <qpid/broker/Broker.h>
-#include <qpid/broker/Configuration.h>
-#include <qpid/sys/signal.h>
+#include <Broker.h>
+#include <Configuration.h>
+#include <signal.h>
 #include <iostream>
 #include <memory>
+#include <config.h>
+
+static char const* programName = "qpidd";
 
 using namespace qpid::broker;
 using namespace qpid::sys;
@@ -30,7 +33,7 @@ using namespace qpid::sys;
 Broker::shared_ptr broker;
 
 void handle_signal(int /*signal*/){
-    std::cout << "Shutting down..." << std::endl;
+    std::cerr << "Shutting down..." << std::endl;
     broker->shutdown();
 }
 
@@ -38,17 +41,20 @@ int main(int argc, char** argv)
 {
     Configuration config;
     try {
-        config.parse(argc, argv);
+        config.parse(programName, argc, argv);
         if(config.isHelp()){
             config.usage();
+        }else if(config.isVersion()){
+            std::cout << programName << " (" << PACKAGE_NAME << ") version "
+                      << PACKAGE_VERSION << std::endl;
         }else{
             broker = Broker::create(config);
-            qpid::sys::signal(SIGINT, handle_signal);
+            signal(SIGINT, handle_signal);
             broker->run();
         }
         return 0;
     } catch(const std::exception& e) {
-        std::cout << e.what() << std::endl;
+        std::cerr << e.what() << std::endl;
     }
     return 1;
 }
diff --git a/cpp/test/client/Makefile.cppclient.examples b/cpp/test/client/Makefile.cppclient.examples
deleted file mode 100644
index a0ebb89ac5..0000000000
--- a/cpp/test/client/Makefile.cppclient.examples
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-# This Makefile is intended to work in the RHEL3 release structure.
-# It is a simple example to get users up and running.
-#
-
-CXXFLAGS := -DNDEBUG -DUSE_APR -MMD -fpic
-
-#
-# Configure Boost.
-#
-BOOST_LOCATION := ../lib/boost-1.33.1
-BOOST_CFLAGS := -I$(BOOST_LOCATION)/include/boost-1_33_1
-
-CXXFLAGS := $(CXXFLAGS) $(BOOST_CFLAGS)
-
-#
-# Configure APR.
-#
-APR_LOCATION := ../lib/apr-1.2.7
-APR_CFLAGS := -I$(APR_LOCATION)/include/apr-1
-APR_LDFLAGS := $(shell $(APR_LOCATION)/bin/apr-1-config --libs) -L$(APR_LOCATION)/lib -lapr-1
-
-CXXFLAGS := $(CXXFLAGS) $(APR_CFLAGS)
-LDFLAGS := $(LDFLAGS) $(APR_LDFLAGS)
-
-#
-# Configure Qpid cpp client.
-#
-
-QPID_CLIENT_LDFLAGS := ../lib/libqpid_common.so.1.0 ../lib/libqpid_client.so.1.0
-QPID_CLIENT_CFLAGS := -I../include
-
-CXXFLAGS := $(CXXFLAGS) $(QPID_CLIENT_CFLAGS)
-LDFLAGS := $(LDFLAGS) $(QPID_CLIENT_LDFLAGS)
-
-CXX := g++
-
-#
-# Add rule to build examples.
-#
-.SUFFIX: .cpp
-%: %.cpp
-	$(CXX) $(CXXFLAGS) $(LDFLAGS) $< -o $@
-
-#
-# Define targets.
-#
-
-EXAMPLES := client_test topic_listener topic_publisher echo_service
-
-.PHONY:
-all: $(EXAMPLES)
-
-.PHONY:
-clean:
-	-rm $(EXAMPLES)
diff --git a/cpp/test/unit/qpid/broker/Makefile b/cpp/test/unit/qpid/broker/Makefile
deleted file mode 100644
index 1222883835..0000000000
--- a/cpp/test/unit/qpid/broker/Makefile
+++ /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.
-#
-
-QPID_HOME = ../../..
-LDLIBS=-lapr-1 -lcppunit $(COMMON_LIB) $(BROKER_LIB)
-include ${QPID_HOME}/cpp/test_plugins.mk
-
diff --git a/cpp/test/unit/qpid/framing/Makefile b/cpp/test/unit/qpid/framing/Makefile
deleted file mode 100644
index 9621d1ecb2..0000000000
--- a/cpp/test/unit/qpid/framing/Makefile
+++ /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.
-#
-
-QPID_HOME = ../../../..
-LDLIBS=-lapr-1 -lcppunit $(COMMON_LIB)
-INCLUDES=$(TEST_INCLUDES) -I ../generated
-include ${QPID_HOME}/cpp/test_plugins.mk
-
diff --git a/cpp/test/unit/qpid/apr/APRBaseTest.cpp b/cpp/tests/APRBaseTest.cpp
index eebe84bcbd..7d95c3bf52 100644
--- a/cpp/test/unit/qpid/apr/APRBaseTest.cpp
+++ b/cpp/tests/APRBaseTest.cpp
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-#include <qpid/apr/APRBase.h>
+#include <apr/APRBase.h>
 #include <qpid_test_plugin.h>
 #include <iostream>
 
diff --git a/cpp/test/unit/qpid/broker/AccumulatedAckTest.cpp b/cpp/tests/AccumulatedAckTest.cpp
index 6737bb43f2..bfd9358422 100644
--- a/cpp/test/unit/qpid/broker/AccumulatedAckTest.cpp
+++ b/cpp/tests/AccumulatedAckTest.cpp
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-#include <qpid/broker/AccumulatedAck.h>
+#include <AccumulatedAck.h>
 #include <qpid_test_plugin.h>
 #include <iostream>
 #include <list>
diff --git a/cpp/test/unit/qpid/framing/BodyHandlerTest.cpp b/cpp/tests/BodyHandlerTest.cpp
index 2758492050..5c3cba0f25 100644
--- a/cpp/test/unit/qpid/framing/BodyHandlerTest.cpp
+++ b/cpp/tests/BodyHandlerTest.cpp
@@ -19,7 +19,7 @@
  *
  */
 #include <iostream>
-#include <qpid/framing/amqp_framing.h>
+#include <amqp_framing.h>
 #include <qpid_test_plugin.h>
 using namespace qpid::framing;
 
diff --git a/cpp/test/unit/qpid/broker/ChannelTest.cpp b/cpp/tests/ChannelTest.cpp
index ff2ca60f32..6351b1555a 100644
--- a/cpp/test/unit/qpid/broker/ChannelTest.cpp
+++ b/cpp/tests/ChannelTest.cpp
@@ -18,8 +18,8 @@
  * under the License.
  *
  */
-#include <qpid/broker/Channel.h>
-#include <qpid/broker/Message.h>
+#include <BrokerChannel.h>
+#include <BrokerMessage.h>
 #include <qpid_test_plugin.h>
 #include <iostream>
 #include <memory>
diff --git a/cpp/test/unit/qpid/broker/ConfigurationTest.cpp b/cpp/tests/ConfigurationTest.cpp
index 33ee80a965..c2c8eb6f32 100644
--- a/cpp/test/unit/qpid/broker/ConfigurationTest.cpp
+++ b/cpp/tests/ConfigurationTest.cpp
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-#include <qpid/broker/Configuration.h>
+#include <Configuration.h>
 #include <qpid_test_plugin.h>
 #include <iostream>
 
@@ -41,7 +41,7 @@ class ConfigurationTest : public CppUnit::TestCase
     {
         Configuration conf;
         char* argv[] = {"ignore", "--help"};
-        conf.parse(2, argv);
+        conf.parse("ignore", 2, argv);
         CPPUNIT_ASSERT(conf.isHelp());
     }
 
@@ -49,7 +49,7 @@ class ConfigurationTest : public CppUnit::TestCase
     {
         Configuration conf;
         char* argv[] = {"ignore", "--port", "6789"};
-        conf.parse(3, argv);
+        conf.parse("ignore", 3, argv);
         CPPUNIT_ASSERT_EQUAL(6789, conf.getPort());
     }
 
@@ -57,7 +57,7 @@ class ConfigurationTest : public CppUnit::TestCase
     {
         Configuration conf;
         char* argv[] = {"ignore", "-p", "6789"};
-        conf.parse(3, argv);
+        conf.parse("ignore", 3, argv);
         CPPUNIT_ASSERT_EQUAL(6789, conf.getPort());
     }
 
@@ -65,7 +65,7 @@ class ConfigurationTest : public CppUnit::TestCase
     {
         Configuration conf;
         char* argv[] = {"ignore", "--store", "my-store-module.so"};
-        conf.parse(3, argv);
+        conf.parse("ignore", 3, argv);
         std::string expected("my-store-module.so");
         CPPUNIT_ASSERT_EQUAL(expected, conf.getStore());
     }
@@ -74,7 +74,7 @@ class ConfigurationTest : public CppUnit::TestCase
     {        
         Configuration conf;
         char* argv[] = {"ignore", "-t", "--worker-threads", "10"};
-        conf.parse(4, argv);
+        conf.parse("ignore", 4, argv);
         CPPUNIT_ASSERT_EQUAL(5672, conf.getPort());//default
         CPPUNIT_ASSERT_EQUAL(10, conf.getWorkerThreads());
         CPPUNIT_ASSERT(conf.isTrace());
diff --git a/cpp/tests/EventChannelTest.cpp b/cpp/tests/EventChannelTest.cpp
new file mode 100644
index 0000000000..8e5c724a15
--- /dev/null
+++ b/cpp/tests/EventChannelTest.cpp
@@ -0,0 +1,187 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+#include <posix/EventChannel.h>
+#include <posix/check.h>
+#include <sys/Runnable.h>
+#include <sys/Socket.h>
+#include <sys/Thread.h>
+#include <qpid_test_plugin.h>
+
+#include <sys/socket.h>
+#include <signal.h>
+#include <netinet/in.h>
+#include <netdb.h>
+#include <iostream>
+
+using namespace qpid::sys;
+
+
+const char hello[] = "hello";
+const size_t size = sizeof(hello);
+
+struct RunMe : public Runnable 
+{
+    bool ran;
+    RunMe() : ran(false) {}
+    void run() { ran = true; }
+};
+
+class EventChannelTest : public CppUnit::TestCase  
+{
+    CPPUNIT_TEST_SUITE(EventChannelTest);
+    CPPUNIT_TEST(testEvent);
+    CPPUNIT_TEST(testRead);
+    CPPUNIT_TEST(testFailedRead);
+    CPPUNIT_TEST(testWrite);
+    CPPUNIT_TEST(testFailedWrite);
+    CPPUNIT_TEST(testReadWrite);
+    CPPUNIT_TEST(testAccept);
+    CPPUNIT_TEST_SUITE_END();
+
+  private:
+    EventChannel::shared_ptr ec;
+    int pipe[2];
+    char readBuf[size];
+
+  public:
+
+    void setUp()
+    {
+        memset(readBuf, size, 0);
+        ec = EventChannel::create();
+        if (::pipe(pipe) != 0) throw QPID_POSIX_ERROR(errno);
+        // Ignore SIGPIPE, otherwise we will crash writing to broken pipe.
+        signal(SIGPIPE, SIG_IGN);
+    }
+
+    // Verify that calling getEvent returns event.
+    template <class T> bool isNextEvent(T& event)
+    {
+        return &event == dynamic_cast<T*>(ec->getEvent());
+    }
+
+    template <class T> bool isNextEventOk(T& event)
+    {
+        Event* next = ec->getEvent();
+        if (next) next->throwIfError();
+        return &event == next;
+    }
+        
+    void testEvent()
+    {
+        RunMe runMe;
+        CPPUNIT_ASSERT(!runMe.ran);
+        // Instances of Event just pass thru the channel immediately.
+        Event e(runMe.functor());
+        ec->postEvent(e);
+        CPPUNIT_ASSERT(isNextEventOk(e));
+        e.dispatch();
+        CPPUNIT_ASSERT(runMe.ran);
+    }
+
+    void testRead() {
+        ReadEvent re(pipe[0], readBuf, size);
+        ec->postEvent(re);
+        CPPUNIT_ASSERT_EQUAL(ssize_t(size), ::write(pipe[1], hello, size));
+        CPPUNIT_ASSERT(isNextEventOk(re));
+        CPPUNIT_ASSERT_EQUAL(size, re.getSize());
+        CPPUNIT_ASSERT_EQUAL(std::string(hello), std::string(readBuf));
+    }
+
+    void testFailedRead() 
+    {
+        ReadEvent re(pipe[0], readBuf, size);
+        ec->postEvent(re);
+
+        // EOF before all data read.
+        ::close(pipe[1]);
+        CPPUNIT_ASSERT(isNextEvent(re));
+        CPPUNIT_ASSERT(re.hasError());
+        try {
+            re.throwIfError();
+            CPPUNIT_FAIL("Expected QpidError.");
+        }
+        catch (const qpid::QpidError&) { }
+
+        //  Bad file descriptor. Note in this case we fail
+        //  in postEvent and throw immediately.
+        try {
+            ReadEvent bad;
+            ec->postEvent(bad);
+            CPPUNIT_FAIL("Expected QpidError.");
+        }
+        catch (const qpid::QpidError&) { }
+    }
+
+    void testWrite() {
+        WriteEvent wr(pipe[1], hello, size);
+        ec->postEvent(wr);
+        CPPUNIT_ASSERT(isNextEventOk(wr));
+        CPPUNIT_ASSERT_EQUAL(ssize_t(size), ::read(pipe[0], readBuf, size));;
+        CPPUNIT_ASSERT_EQUAL(std::string(hello), std::string(readBuf));
+    }
+
+    void testFailedWrite() {
+        WriteEvent wr(pipe[1], hello, size);
+        ::close(pipe[0]);
+        ec->postEvent(wr);
+        CPPUNIT_ASSERT(isNextEvent(wr));
+        CPPUNIT_ASSERT(wr.hasError());
+    }
+
+    void testReadWrite()
+    {
+        ReadEvent re(pipe[0], readBuf, size);
+        WriteEvent wr(pipe[1], hello, size);
+        ec->postEvent(re);
+        ec->postEvent(wr);
+        ec->getEvent();
+        ec->getEvent();
+        CPPUNIT_ASSERT_EQUAL(std::string(hello), std::string(readBuf));
+    }
+
+    void testAccept() {
+        Socket s = Socket::createTcp();
+        int port = s.listen(0, 10);
+        CPPUNIT_ASSERT(port != 0);
+
+        AcceptEvent ae(s.fd());
+        ec->postEvent(ae);
+        Socket client = Socket::createTcp();
+        client.connect("localhost", port);
+        CPPUNIT_ASSERT(isNextEvent(ae));
+        ae.dispatch();
+
+        // Verify client writes are read by the accepted descriptor.
+        char readBuf[size];
+        ReadEvent re(ae.getAcceptedDesscriptor(), readBuf, size);
+        ec->postEvent(re);
+        CPPUNIT_ASSERT_EQUAL(ssize_t(size), client.send(hello, sizeof(hello)));
+        CPPUNIT_ASSERT(isNextEvent(re));
+        re.dispatch();
+        CPPUNIT_ASSERT_EQUAL(std::string(hello), std::string(readBuf));
+    }
+};
+
+// Make this test suite a plugin.
+CPPUNIT_PLUGIN_IMPLEMENT();
+CPPUNIT_TEST_SUITE_REGISTRATION(EventChannelTest);
+
diff --git a/cpp/tests/EventChannelThreadsTest.cpp b/cpp/tests/EventChannelThreadsTest.cpp
new file mode 100644
index 0000000000..285ed29518
--- /dev/null
+++ b/cpp/tests/EventChannelThreadsTest.cpp
@@ -0,0 +1,247 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+#include <iostream>
+#include <boost/bind.hpp>
+
+#include <sys/Socket.h>
+#include <posix/EventChannelThreads.h>
+#include <qpid_test_plugin.h>
+
+
+using namespace std;
+
+using namespace qpid::sys;
+
+const int nConnections = 5;
+const int nMessages = 10; // Messages read/written per connection.
+
+
+// Accepts + reads + writes.
+const int totalEvents = nConnections+2*nConnections*nMessages;
+
+/**
+ * Messages are numbered 0..nMessages.
+ * We count the total number of events, and the
+ * number of reads and writes for each message number.
+ */
+class TestResults : public Monitor {
+  public:
+    TestResults() : isShutdown(false), nEventsRemaining(totalEvents) {}
+
+    void countEvent() {
+        if (--nEventsRemaining == 0)
+            shutdown();
+    }
+
+    void countRead(int messageNo) {
+        ++reads[messageNo];
+        countEvent();
+    }
+
+    void countWrite(int messageNo) {
+        ++writes[messageNo];
+        countEvent();
+    }
+
+    void shutdown(const std::string& exceptionMsg = std::string()) {
+        ScopedLock lock(*this);
+        exception = exceptionMsg;
+        isShutdown = true;
+        notifyAll();
+    }
+    
+    void wait() {
+        ScopedLock lock(*this);
+        Time deadline = now() + 10*TIME_SEC; 
+        while (!isShutdown) {
+            CPPUNIT_ASSERT(Monitor::wait(deadline));
+        }
+    }
+
+    bool isShutdown;
+    std::string exception;
+    AtomicCount reads[nMessages];
+    AtomicCount writes[nMessages];
+    AtomicCount nEventsRemaining;
+};
+
+TestResults results;
+
+EventChannelThreads::shared_ptr threads;
+
+// Functor to wrap callbacks in try/catch.
+class SafeCallback {
+  public:
+    SafeCallback(Runnable& r) : callback(r.functor()) {}
+    SafeCallback(Event::Callback cb) : callback(cb) {}
+    
+    void operator()() {
+        std::string exception;
+        try {
+            callback();
+            return;
+        }
+        catch (const std::exception& e) {
+            exception = e.what();
+        }
+        catch (...) {
+            exception = "Unknown exception.";
+        }
+        results.shutdown(exception);
+    }
+
+  private:
+    Event::Callback callback;
+};
+
+/** Repost an event N times. */
+class Repost {
+  public:
+    Repost(int n) : count (n) {}
+    virtual ~Repost() {}
+    
+    void repost(Event* event) {
+        if (--count==0) {
+            delete event;
+        } else {
+            threads->postEvent(event);
+        }
+    }
+  private:
+    int count;
+};
+    
+            
+
+/** Repeating read event. */
+class TestReadEvent : public ReadEvent, public Runnable, private Repost {
+  public:
+    explicit TestReadEvent(int fd=-1) :
+        ReadEvent(fd, &value, sizeof(value), SafeCallback(*this)),
+        Repost(nMessages)
+    {}
+    
+    void run() {
+        CPPUNIT_ASSERT_EQUAL(sizeof(value), getSize());
+        CPPUNIT_ASSERT(0 <= value);
+        CPPUNIT_ASSERT(value < nMessages);
+        results.countRead(value);
+        repost(this);
+    }
+    
+  private:
+    int value;
+    ReadEvent original;
+};
+
+
+/** Fire and forget write event */
+class TestWriteEvent : public WriteEvent, public Runnable, private Repost {
+  public:
+    TestWriteEvent(int fd=-1) :
+        WriteEvent(fd, &value, sizeof(value), SafeCallback(*this)),
+        Repost(nMessages),
+        value(0)
+    {}
+    
+    void run() {
+        CPPUNIT_ASSERT_EQUAL(sizeof(int), getSize());
+        results.countWrite(value++);
+        repost(this);
+    }
+
+  private:
+    int value;
+};
+
+/** Fire-and-forget Accept event, posts reads on the accepted connection. */
+class TestAcceptEvent : public AcceptEvent, public Runnable, private Repost {
+  public:
+    TestAcceptEvent(int fd=-1) :
+        AcceptEvent(fd, SafeCallback(*this)),
+        Repost(nConnections)
+    {}
+    
+    void run() {
+        threads->postEvent(new TestReadEvent(getAcceptedDesscriptor()));
+        results.countEvent();
+        repost(this);
+    }
+};
+
+class EventChannelThreadsTest : public CppUnit::TestCase
+{
+    CPPUNIT_TEST_SUITE(EventChannelThreadsTest);
+    CPPUNIT_TEST(testThreads);
+    CPPUNIT_TEST_SUITE_END();
+
+  public:
+
+    void setUp() {
+        threads = EventChannelThreads::create(EventChannel::create());
+    }
+
+    void tearDown() {
+        threads.reset();
+    }
+
+    void testThreads()
+    {
+        Socket listener = Socket::createTcp();
+        int port = listener.listen();
+
+        // Post looping accept events, will repost nConnections times.
+        // The accept event will automatically post read events.
+        threads->postEvent(new TestAcceptEvent(listener.fd()));
+
+        // Make connections.
+        Socket connections[nConnections];
+        for (int i = 0; i < nConnections; ++i) {
+            connections[i] = Socket::createTcp();
+            connections[i].connect("localhost", port);
+        }
+
+        // Post looping write events.
+        for (int i = 0; i < nConnections; ++i) {
+            threads->postEvent(new TestWriteEvent(connections[i].fd()));
+        }
+
+        // Wait for all events to be dispatched.
+        results.wait();
+
+        if (!results.exception.empty()) CPPUNIT_FAIL(results.exception);
+        CPPUNIT_ASSERT_EQUAL(0, int(results.nEventsRemaining));
+
+        // Expect a read and write for each messageNo from each connection.
+        for (int messageNo = 0; messageNo < nMessages; ++messageNo) {
+            CPPUNIT_ASSERT_EQUAL(nConnections, int(results.reads[messageNo]));
+            CPPUNIT_ASSERT_EQUAL(nConnections, int(results.writes[messageNo]));
+        }
+
+        threads->shutdown();
+        threads->join();
+    }
+};
+
+// Make this test suite a plugin.
+CPPUNIT_PLUGIN_IMPLEMENT();
+CPPUNIT_TEST_SUITE_REGISTRATION(EventChannelThreadsTest);
+
diff --git a/cpp/tests/ExceptionTest.cpp b/cpp/tests/ExceptionTest.cpp
new file mode 100644
index 0000000000..6cea863168
--- /dev/null
+++ b/cpp/tests/ExceptionTest.cpp
@@ -0,0 +1,61 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+#include <Exception.h>
+#include <qpid_test_plugin.h>
+
+using namespace qpid;
+
+struct CountDestroyedException : public Exception {
+    int& count;
+    static int staticCount;
+    CountDestroyedException() : count(staticCount) { }
+    CountDestroyedException(int& n) : count(n) {}
+    ~CountDestroyedException() throw() { count++; }
+    void throwSelf() const { throw *this; }
+};
+
+int CountDestroyedException::staticCount = 0;
+         
+        
+class ExceptionTest : public CppUnit::TestCase 
+{
+    CPPUNIT_TEST_SUITE(ExceptionTest);
+    CPPUNIT_TEST(testHeapException);
+    CPPUNIT_TEST_SUITE_END();
+  public:
+    // Verify proper memory management for heap-allocated exceptions.
+    void testHeapException() {
+        int count = 0;
+        try {
+            std::auto_ptr<Exception> p(
+                new CountDestroyedException(count));
+            p.release()->throwSelf();
+            CPPUNIT_FAIL("Expected CountDestroyedException.");
+        } catch (const CountDestroyedException& e) {
+            CPPUNIT_ASSERT(&e.count == &count);
+        }
+        CPPUNIT_ASSERT_EQUAL(1, count);
+    }
+};
+
+    
+// Make this test suite a plugin.
+CPPUNIT_PLUGIN_IMPLEMENT();
+CPPUNIT_TEST_SUITE_REGISTRATION(ExceptionTest);
+
diff --git a/cpp/test/unit/qpid/broker/ExchangeTest.cpp b/cpp/tests/ExchangeTest.cpp
index b6dd6ad592..8fef4ccaac 100644
--- a/cpp/test/unit/qpid/broker/ExchangeTest.cpp
+++ b/cpp/tests/ExchangeTest.cpp
@@ -19,11 +19,11 @@
  *
  */
 
-#include <qpid/broker/DeliverableMessage.h>
-#include <qpid/broker/DirectExchange.h>
-#include <qpid/broker/Exchange.h>
-#include <qpid/broker/Queue.h>
-#include <qpid/broker/TopicExchange.h>
+#include <DeliverableMessage.h>
+#include <DirectExchange.h>
+#include <BrokerExchange.h>
+#include <BrokerQueue.h>
+#include <TopicExchange.h>
 #include <qpid_test_plugin.h>
 #include <iostream>
 
diff --git a/cpp/test/unit/qpid/framing/FieldTableTest.cpp b/cpp/tests/FieldTableTest.cpp
index ec442bbc98..8d9285bf4b 100644
--- a/cpp/test/unit/qpid/framing/FieldTableTest.cpp
+++ b/cpp/tests/FieldTableTest.cpp
@@ -19,7 +19,7 @@
  *
  */
 #include <iostream>
-#include <qpid/framing/amqp_framing.h>
+#include <amqp_framing.h>
 #include <qpid_test_plugin.h>
 
 using namespace qpid::framing;
diff --git a/cpp/test/unit/qpid/framing/FramingTest.cpp b/cpp/tests/FramingTest.cpp
index aa8a9a10de..edc62b6187 100644
--- a/cpp/test/unit/qpid/framing/FramingTest.cpp
+++ b/cpp/tests/FramingTest.cpp
@@ -18,9 +18,9 @@
  * under the License.
  *
  */
-#include <qpid/framing/ConnectionRedirectBody.h>
-#include <qpid/framing/ProtocolVersion.h>
-#include <qpid/framing/amqp_framing.h>
+#include <ConnectionRedirectBody.h>
+#include <ProtocolVersion.h>
+#include <amqp_framing.h>
 #include <iostream>
 #include <qpid_test_plugin.h>
 #include <sstream>
diff --git a/cpp/test/unit/qpid/framing/HeaderTest.cpp b/cpp/tests/HeaderTest.cpp
index 065ec57800..01927c7190 100644
--- a/cpp/test/unit/qpid/framing/HeaderTest.cpp
+++ b/cpp/tests/HeaderTest.cpp
@@ -19,7 +19,7 @@
  *
  */
 #include <iostream>
-#include <qpid/framing/amqp_framing.h>
+#include <amqp_framing.h>
 #include <qpid_test_plugin.h>
 
 using namespace qpid::framing;
diff --git a/cpp/test/unit/qpid/broker/HeadersExchangeTest.cpp b/cpp/tests/HeadersExchangeTest.cpp
index cf142aa175..6cd51c55a9 100644
--- a/cpp/test/unit/qpid/broker/HeadersExchangeTest.cpp
+++ b/cpp/tests/HeadersExchangeTest.cpp
@@ -19,9 +19,9 @@
  *
  */
 
-#include <qpid/broker/HeadersExchange.h>
-#include <qpid/framing/FieldTable.h>
-#include <qpid/framing/Value.h>
+#include <HeadersExchange.h>
+#include <FieldTable.h>
+#include <Value.h>
 #include <qpid_test_plugin.h>
 
 using namespace qpid::broker;
diff --git a/cpp/test/unit/qpid/broker/InMemoryContentTest.cpp b/cpp/tests/InMemoryContentTest.cpp
index 175ef0cf27..64789ed836 100644
--- a/cpp/test/unit/qpid/broker/InMemoryContentTest.cpp
+++ b/cpp/tests/InMemoryContentTest.cpp
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-#include <qpid/broker/InMemoryContent.h>
+#include <InMemoryContent.h>
 #include <qpid_test_plugin.h>
 #include <iostream>
 #include <list>
diff --git a/cpp/test/unit/qpid/broker/LazyLoadedContentTest.cpp b/cpp/tests/LazyLoadedContentTest.cpp
index 4d267887ba..a8e7d61e0d 100644
--- a/cpp/test/unit/qpid/broker/LazyLoadedContentTest.cpp
+++ b/cpp/tests/LazyLoadedContentTest.cpp
@@ -18,8 +18,8 @@
  * under the License.
  *
  */
-#include <qpid/broker/LazyLoadedContent.h>
-#include <qpid/broker/NullMessageStore.h>
+#include <LazyLoadedContent.h>
+#include <NullMessageStore.h>
 #include <qpid_test_plugin.h>
 #include <iostream>
 #include <list>
@@ -55,7 +55,7 @@ class LazyLoadedContentTest : public CppUnit::TestCase
     public:
         TestMessageStore(const string& _content) : content(_content) {}
 
-        void loadContent(u_int64_t, string& data, u_int64_t offset, u_int32_t length)
+        void loadContent(Message* const, string& data, u_int64_t offset, u_int32_t length)
         {
             if (offset + length <= content.size()) {
                 data = content.substr(offset, length);
@@ -96,7 +96,7 @@ public:
     void load(string& in, size_t outCount, string* out, u_int32_t framesize)
     {
         TestMessageStore store(in);
-        LazyLoadedContent content(&store, 1, in.size());
+        LazyLoadedContent content(&store, 0, in.size());
         DummyHandler handler;
         u_int16_t channel = 3;
         content.send(&handler, channel, framesize);         
diff --git a/cpp/tests/Makefile.am b/cpp/tests/Makefile.am
new file mode 100644
index 0000000000..d5cd60a831
--- /dev/null
+++ b/cpp/tests/Makefile.am
@@ -0,0 +1,103 @@
+AM_CXXFLAGS = $(WARNING_CFLAGS) $(CPPUNIT_CXXFLAGS)
+INCLUDES =				\
+  -I$(top_srcdir)/gen			\
+  -I$(top_srcdir)/lib			\
+  -I$(top_srcdir)/lib/client		\
+  -I$(top_srcdir)/lib/broker		\
+  -I$(top_srcdir)/lib/common		\
+  -I$(top_srcdir)/lib/common/sys	\
+  -I$(top_srcdir)/lib/common/framing	\
+  $(APR_CXXFLAGS)
+
+# FIXME: have e.g., topicall, run as part of "make check"?
+EXTRA_DIST =		\
+  env			\
+  broker		\
+  topicall		\
+  topictest		\
+  qpid_test_plugin.h	\
+  APRBaseTest.cpp
+
+client_tests =		\
+  client_test		\
+  echo_service		\
+  topic_listener	\
+  topic_publisher
+
+broker_tests =		\
+  AccumulatedAckTest	\
+  ChannelTest		\
+  ConfigurationTest	\
+  ExchangeTest		\
+  HeadersExchangeTest	\
+  InMemoryContentTest	\
+  LazyLoadedContentTest	\
+  MessageBuilderTest	\
+  MessageTest		\
+  QueueRegistryTest	\
+  QueueTest		\
+  TopicExchangeTest	\
+  TxAckTest		\
+  TxBufferTest		\
+  TxPublishTest		\
+  ValueTest
+
+framing_tests =		\
+  BodyHandlerTest	\
+  FieldTableTest	\
+  FramingTest		\
+  HeaderTest
+
+misc_tests =		\
+  ExceptionTest
+
+posix_tests =		\
+  EventChannelTest	\
+  EventChannelThreadsTest
+
+unit_tests =		\
+  $(broker_tests)	\
+  $(framing_tests)	\
+  $(misc_tests)
+
+
+noinst_PROGRAMS = $(client_tests)
+
+check: run-unit-tests run-python-tests
+
+.PHONY: run-unit-tests
+run-unit-tests: $(check_LTLIBRARIES)
+	DllPlugInTester -c -b .libs/*.so
+
+# TODO aconway 2006-12-01: Should also check for qpidd.
+run-python-tests: $(check_LTLIBRARIES)
+	../src/qpidd > qpidd.log 2>&1 &
+	cd ../../python ; ./run-tests -v -I cpp_failing.txt
+
+
+include gen.mk
+
+abs_builddir = @abs_builddir@
+extra_libs = $(CPPUNIT_LIBS)
+lib_client = $(abs_builddir)/../lib/client/libclient.la
+lib_common = $(abs_builddir)/../lib/common/libcommon.la
+lib_broker = $(abs_builddir)/../lib/broker/libbroker.la
+
+gen.mk: Makefile.am
+	(					\
+	  for i in $(client_tests); do		\
+	    echo $${i}_SOURCES = $$i.cpp;	\
+	    echo $${i}_LDADD = '$$(lib_client) $$(lib_common) $$(extra_libs)'; \
+	  done;					\
+	  libs=;				\
+	  for i in $(unit_tests); do		\
+	    libs="$$libs $${i}.la";		\
+	    echo $${i}_la_SOURCES = $$i.cpp;	\
+	    echo $${i}_la_LIBADD = '$$(lib_common)';			\
+	    echo $${i}_la_LIBADD += '$$(lib_broker) $$(extra_libs)';	\
+	    echo $${i}_la_LDFLAGS = "-module -rpath `pwd`";	\
+	  done;					\
+	  echo "check_LTLIBRARIES =$$libs";	\
+	)					\
+	> $@-t
+	mv $@-t $@
diff --git a/cpp/test/unit/qpid/broker/MessageBuilderTest.cpp b/cpp/tests/MessageBuilderTest.cpp
index fa80f8f939..3f84142461 100644
--- a/cpp/test/unit/qpid/broker/MessageBuilderTest.cpp
+++ b/cpp/tests/MessageBuilderTest.cpp
@@ -18,11 +18,11 @@
  * under the License.
  *
  */
-#include <qpid/Exception.h>
-#include <qpid/broker/Message.h>
-#include <qpid/broker/MessageBuilder.h>
-#include <qpid/broker/NullMessageStore.h>
-#include <qpid/framing/Buffer.h>
+#include <Exception.h>
+#include <BrokerMessage.h>
+#include <MessageBuilder.h>
+#include <NullMessageStore.h>
+#include <Buffer.h>
 #include <qpid_test_plugin.h>
 #include <iostream>
 #include <memory>
@@ -62,9 +62,9 @@ class MessageBuilderTest : public CppUnit::TestCase
             }
         }
 
-        void appendContent(u_int64_t msgId, const string& data)
+        void appendContent(Message* msg, const string& data)
         {
-            if (msgId == 1) {
+            if (msg) {
                 content->putRawData(data);
             } else {
                 throw qpid::Exception("Invalid message id!");
diff --git a/cpp/test/unit/qpid/broker/MessageTest.cpp b/cpp/tests/MessageTest.cpp
index b497588c6c..3b3265476c 100644
--- a/cpp/test/unit/qpid/broker/MessageTest.cpp
+++ b/cpp/tests/MessageTest.cpp
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-#include <qpid/broker/Message.h>
+#include <BrokerMessage.h>
 #include <qpid_test_plugin.h>
 #include <iostream>
 
diff --git a/cpp/test/unit/qpid/broker/QueueRegistryTest.cpp b/cpp/tests/QueueRegistryTest.cpp
index 38a0cf2f76..3926d56292 100644
--- a/cpp/test/unit/qpid/broker/QueueRegistryTest.cpp
+++ b/cpp/tests/QueueRegistryTest.cpp
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-#include <qpid/broker/QueueRegistry.h>
+#include <QueueRegistry.h>
 #include <qpid_test_plugin.h>
 #include <string>
 
diff --git a/cpp/test/unit/qpid/broker/QueueTest.cpp b/cpp/tests/QueueTest.cpp
index 198c861056..9d655781c1 100644
--- a/cpp/test/unit/qpid/broker/QueueTest.cpp
+++ b/cpp/tests/QueueTest.cpp
@@ -18,8 +18,8 @@
  * under the License.
  *
  */
-#include <qpid/broker/Queue.h>
-#include <qpid/broker/QueueRegistry.h>
+#include <BrokerQueue.h>
+#include <QueueRegistry.h>
 #include <qpid_test_plugin.h>
 #include <iostream>
 
diff --git a/cpp/test/unit/qpid/broker/TopicExchangeTest.cpp b/cpp/tests/TopicExchangeTest.cpp
index 8ce80d8702..4ba9cdd6e5 100644
--- a/cpp/test/unit/qpid/broker/TopicExchangeTest.cpp
+++ b/cpp/tests/TopicExchangeTest.cpp
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-#include <qpid/broker/TopicExchange.h>
+#include <TopicExchange.h>
 #include <qpid_test_plugin.h>
 
 using namespace qpid::broker;
diff --git a/cpp/test/unit/qpid/broker/TxAckTest.cpp b/cpp/tests/TxAckTest.cpp
index 47693a7133..709d45c1ad 100644
--- a/cpp/test/unit/qpid/broker/TxAckTest.cpp
+++ b/cpp/tests/TxAckTest.cpp
@@ -18,9 +18,9 @@
  * under the License.
  *
  */
-#include <qpid/broker/NullMessageStore.h>
-#include <qpid/broker/RecoveryManager.h>
-#include <qpid/broker/TxAck.h>
+#include <NullMessageStore.h>
+#include <RecoveryManager.h>
+#include <TxAck.h>
 #include <qpid_test_plugin.h>
 #include <iostream>
 #include <list>
diff --git a/cpp/test/unit/qpid/broker/TxBufferTest.cpp b/cpp/tests/TxBufferTest.cpp
index 3789d340f8..0573ad15b0 100644
--- a/cpp/test/unit/qpid/broker/TxBufferTest.cpp
+++ b/cpp/tests/TxBufferTest.cpp
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-#include <qpid/broker/TxBuffer.h>
+#include <TxBuffer.h>
 #include <qpid_test_plugin.h>
 #include <iostream>
 #include <vector>
diff --git a/cpp/test/unit/qpid/broker/TxPublishTest.cpp b/cpp/tests/TxPublishTest.cpp
index b301405d22..6324e5fb01 100644
--- a/cpp/test/unit/qpid/broker/TxPublishTest.cpp
+++ b/cpp/tests/TxPublishTest.cpp
@@ -18,9 +18,9 @@
  * under the License.
  *
  */
-#include <qpid/broker/NullMessageStore.h>
-#include <qpid/broker/RecoveryManager.h>
-#include <qpid/broker/TxPublish.h>
+#include <NullMessageStore.h>
+#include <RecoveryManager.h>
+#include <TxPublish.h>
 #include <qpid_test_plugin.h>
 #include <iostream>
 #include <list>
diff --git a/cpp/test/unit/qpid/broker/ValueTest.cpp b/cpp/tests/ValueTest.cpp
index 41cd34d78c..a3f9ec2541 100644
--- a/cpp/test/unit/qpid/broker/ValueTest.cpp
+++ b/cpp/tests/ValueTest.cpp
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-#include <qpid/framing/Value.h>
+#include <Value.h>
 #include <qpid_test_plugin.h>
 
 using namespace qpid::framing;
diff --git a/cpp/test/bin/broker b/cpp/tests/broker
index c49e967466..c49e967466 100755
--- a/cpp/test/bin/broker
+++ b/cpp/tests/broker
diff --git a/cpp/test/client/client_test.cpp b/cpp/tests/client_test.cpp
index 18b162ec8a..5ee53e3fa8 100644
--- a/cpp/test/client/client_test.cpp
+++ b/cpp/tests/client_test.cpp
@@ -20,13 +20,13 @@
  */
 #include <iostream>
 
-#include <qpid/QpidError.h>
-#include <qpid/client/Channel.h>
-#include <qpid/client/Connection.h>
-#include <qpid/client/Message.h>
-#include <qpid/client/MessageListener.h>
-#include <qpid/sys/Monitor.h>
-#include <qpid/framing/FieldTable.h>
+#include <QpidError.h>
+#include <ClientChannel.h>
+#include <Connection.h>
+#include <ClientMessage.h>
+#include <MessageListener.h>
+#include <sys/Monitor.h>
+#include <FieldTable.h>
 
 using namespace qpid::client;
 using namespace qpid::sys;
@@ -90,7 +90,9 @@ int main(int argc, char**)
 	con.close();	
 	std::cout << "Closed connection." << std::endl;
     }catch(qpid::QpidError error){
-	std::cout << "Error [" << error.code << "] " << error.msg << " (" << error.file << ":" << error.line << ")" << std::endl;
+	std::cout << "Error [" << error.code << "] " << error.msg << " ("
+                  << error.location.file << ":" << error.location.line
+                  << ")" << std::endl;
 	return 1;
     }
     return 0;
diff --git a/cpp/test/client/echo_service.cpp b/cpp/tests/echo_service.cpp
index f0aa49fd4b..6159aafca0 100644
--- a/cpp/test/client/echo_service.cpp
+++ b/cpp/tests/echo_service.cpp
@@ -18,13 +18,13 @@
  * under the License.
  *
  */
-#include <qpid/QpidError.h>
-#include <qpid/client/Channel.h>
-#include <qpid/client/Connection.h>
-#include <qpid/client/Exchange.h>
-#include <qpid/client/MessageListener.h>
-#include <qpid/client/Queue.h>
-#include <qpid/sys/Time.h>
+#include <QpidError.h>
+#include <ClientChannel.h>
+#include <Connection.h>
+#include <ClientExchange.h>
+#include <MessageListener.h>
+#include <ClientQueue.h>
+#include <sys/Time.h>
 #include <iostream>
 #include <sstream>
 
@@ -107,7 +107,7 @@ int main(int argc, char** argv){
             
             connection.close();
         } catch(qpid::QpidError error) {
-            std::cout << "Error [" << error.code << "] " << error.msg << " (" << error.file << ":" << error.line << ")" << std::endl;
+            std::cout << error.what() << std::endl;
         }        
     } else {
         try {
@@ -133,7 +133,7 @@ int main(int argc, char** argv){
             
             connection.close();
         } catch(qpid::QpidError error) {
-            std::cout << "Error [" << error.code << "] " << error.msg << " (" << error.file << ":" << error.line << ")" << std::endl;
+            std::cout << error.what() << std::endl;
         }
     }
 }
diff --git a/cpp/test/bin/env b/cpp/tests/env
index 76797b1ef7..49201c01fd 100755
--- a/cpp/test/bin/env
+++ b/cpp/tests/env
@@ -13,9 +13,9 @@ pathmunge () {
 
 if [ -z QPID_ROOT ] ; then echo "You must set QPID_ROOT" ; fi
  
-pathmunge $QPID_ROOT/cpp/test/bin
-pathmunge $QPID_ROOT/cpp/build/*/bin
-pathmunge $QPID_ROOT/cpp/build/*/test
+pathmunge $QPID_ROOT/cpp/tests
+# pathmunge $QPID_ROOT/cpp/build/*/bin
+# pathmunge $QPID_ROOT/cpp/build/*/test
 
 export QPID_HOME=${QPID_HOME:-$QPID_ROOT/java/build}
 pathmunge $QPID_HOME/bin
diff --git a/cpp/test/include/qpid_test_plugin.h b/cpp/tests/qpid_test_plugin.h
index b2f4a8ffed..b2f4a8ffed 100644
--- a/cpp/test/include/qpid_test_plugin.h
+++ b/cpp/tests/qpid_test_plugin.h
diff --git a/cpp/test/client/topic_listener.cpp b/cpp/tests/topic_listener.cpp
index 413d482361..9e9b480df3 100644
--- a/cpp/test/client/topic_listener.cpp
+++ b/cpp/tests/topic_listener.cpp
@@ -18,13 +18,13 @@
  * under the License.
  *
  */
-#include <qpid/QpidError.h>
-#include <qpid/client/Channel.h>
-#include <qpid/client/Connection.h>
-#include <qpid/client/Exchange.h>
-#include <qpid/client/MessageListener.h>
-#include <qpid/client/Queue.h>
-#include <qpid/sys/Time.h>
+#include <QpidError.h>
+#include <ClientChannel.h>
+#include <Connection.h>
+#include <ClientExchange.h>
+#include <MessageListener.h>
+#include <ClientQueue.h>
+#include <sys/Time.h>
 #include <iostream>
 #include <sstream>
 
@@ -38,7 +38,7 @@ class Listener : public MessageListener{
     const bool transactional;
     bool init;
     int count;
-    int64_t start;
+    Time start;
     
     void shutdown();
     void report();
@@ -96,7 +96,7 @@ int main(int argc, char** argv){
             channel.run();
             connection.close();
         }catch(qpid::QpidError error){
-            std::cout << "Error [" << error.code << "] " << error.msg << " (" << error.file << ":" << error.line << ")" << std::endl;
+            std::cout << error.what() << std::endl;
         }
     }
 }
@@ -106,7 +106,7 @@ Listener::Listener(Channel* _channel, const std::string& _responseq, bool tx) :
 
 void Listener::received(Message& message){
     if(!init){        
-        start = Time::now().msecs();
+        start = now();
         count = 0;
         init = true;
     }
@@ -128,10 +128,11 @@ void Listener::shutdown(){
 }
 
 void Listener::report(){
-    int64_t finish = Time::now().msecs();
-    int64_t time = finish - start;
+    Time finish = now();
+    Time time = finish - start;
     std::stringstream reportstr;
-    reportstr << "Received " << count << " messages in " << time << " ms.";
+    reportstr << "Received " << count << " messages in "
+              << time/TIME_MSEC << " ms.";
     Message msg;
     msg.setData(reportstr.str());
     channel->publish(msg, string(), responseQueue);
diff --git a/cpp/test/client/topic_publisher.cpp b/cpp/tests/topic_publisher.cpp
index d9f271e2f0..cde3f6ee79 100644
--- a/cpp/test/client/topic_publisher.cpp
+++ b/cpp/tests/topic_publisher.cpp
@@ -18,15 +18,15 @@
  * under the License.
  *
  */
-#include <qpid/QpidError.h>
-#include <qpid/client/Channel.h>
-#include <qpid/client/Connection.h>
-#include <qpid/client/Exchange.h>
-#include <qpid/client/MessageListener.h>
-#include <qpid/client/Queue.h>
-#include <qpid/sys/Monitor.h>
+#include <QpidError.h>
+#include <ClientChannel.h>
+#include <Connection.h>
+#include <ClientExchange.h>
+#include <MessageListener.h>
+#include <ClientQueue.h>
+#include <sys/Monitor.h>
 #include "unistd.h"
-#include <qpid/sys/Time.h>
+#include <sys/Time.h>
 #include <cstdlib>
 #include <iostream>
 
@@ -114,11 +114,13 @@ int main(int argc, char** argv){
             int64_t sum(0);
             for(int i = 0; i < batchSize; i++){
                 if(i > 0 && args.getDelay()) sleep(args.getDelay());
-                int64_t time = publisher.publish(args.getMessages(), args.getSubscribers(), args.getSize());
+                Time time = publisher.publish(
+                    args.getMessages(), args.getSubscribers(), args.getSize());
                 if(!max || time > max) max = time;
                 if(!min || time < min) min = time;
                 sum += time;
-                std::cout << "Completed " << (i+1) << " of " << batchSize << " in " << time << "ms" << std::endl;
+                std::cout << "Completed " << (i+1) << " of " << batchSize
+                          << " in " << time/TIME_MSEC << "ms" << std::endl;
             }
             publisher.terminate();
             int64_t avg = sum / batchSize;
@@ -129,7 +131,7 @@ int main(int argc, char** argv){
             channel.close();
             connection.close();
         }catch(qpid::QpidError error){
-            std::cout << "Error [" << error.code << "] " << error.msg << " (" << error.file << ":" << error.line << ")" << std::endl;
+            std::cout << error.what() << std::endl;
         }
     }
 }
@@ -153,7 +155,7 @@ void Publisher::waitForCompletion(int msgs){
 int64_t Publisher::publish(int msgs, int listeners, int size){
     Message msg;
     msg.setData(generateData(size));
-    int64_t start = Time::now().msecs();
+    Time start = now();
     {
         Monitor::ScopedLock l(monitor);
         for(int i = 0; i < msgs; i++){
@@ -170,7 +172,7 @@ int64_t Publisher::publish(int msgs, int listeners, int size){
         waitForCompletion(listeners);
     }
 
-    int64_t finish(Time::now().msecs());
+    Time finish = now();
     return finish - start; 
 }
 
diff --git a/cpp/test/bin/topicall b/cpp/tests/topicall
index bde04a5b30..bde04a5b30 100755
--- a/cpp/test/bin/topicall
+++ b/cpp/tests/topicall
diff --git a/cpp/test/bin/topictest b/cpp/tests/topictest
index 44a279c363..792f063bea 100755
--- a/cpp/test/bin/topictest
+++ b/cpp/tests/topictest
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # Run the c++ or java topic test
 
 . `dirname $0`/env
diff --git a/cpp/tools/saxon8.jar b/cpp/tools/saxon8.jar
deleted file mode 100644
index 197ce75c5b..0000000000
--- a/cpp/tools/saxon8.jar
+++ /dev/null
diff --git a/dotnet/Qpid.Client.Tests/HeadersExchange/HeadersMatchingConsumer.cs b/dotnet/Qpid.Client.Tests/HeadersExchange/HeadersMatchingConsumer.cs
index cf26b42c6a..1b27f920b8 100644
--- a/dotnet/Qpid.Client.Tests/HeadersExchange/HeadersMatchingConsumer.cs
+++ b/dotnet/Qpid.Client.Tests/HeadersExchange/HeadersMatchingConsumer.cs
@@ -58,8 +58,9 @@ namespace Qpid.Client.Tests
             _channel.Bind(queueName, _serviceName, null, CreatePatternAsFieldTable());
 
             IMessageConsumer consumer = _channel.CreateConsumerBuilder(queueName)
-                .withPrefetch(100)
-                .withNoLocal(true)
+                .WithPrefetchLow(100)
+                .WithPrefetchHigh(500)
+                .WithNoLocal(true)
                 .Create();
 
             consumer.OnMessage = new MessageReceivedDelegate(OnMessage);
diff --git a/dotnet/Qpid.Client.Tests/HeadersExchange/HeadersMatchingProducer.cs b/dotnet/Qpid.Client.Tests/HeadersExchange/HeadersMatchingProducer.cs
index 35f6017f48..c748ef8840 100644
--- a/dotnet/Qpid.Client.Tests/HeadersExchange/HeadersMatchingProducer.cs
+++ b/dotnet/Qpid.Client.Tests/HeadersExchange/HeadersMatchingProducer.cs
@@ -43,8 +43,8 @@ namespace Qpid.Client.Tests
             try
             {
                 _publisher = _channel.CreatePublisherBuilder()
-                    .withExchangeName(_commandExchangeName)
-                    .withMandatory(true)
+                    .WithExchangeName(_commandExchangeName)
+                    .WithMandatory(true)
                     .Create();
 
                 // Disabling timestamps - a performance optimisation where timestamps and TTL/expiration 
diff --git a/dotnet/Qpid.Client.Tests/MultiConsumer/ProducerMultiConsumer.cs b/dotnet/Qpid.Client.Tests/MultiConsumer/ProducerMultiConsumer.cs
index 6b6fca20b2..687f08eeef 100644
--- a/dotnet/Qpid.Client.Tests/MultiConsumer/ProducerMultiConsumer.cs
+++ b/dotnet/Qpid.Client.Tests/MultiConsumer/ProducerMultiConsumer.cs
@@ -70,8 +70,8 @@ namespace Qpid.Client.Tests
         {
             base.Init();
             _publisher = _channel.CreatePublisherBuilder()
-                .withRoutingKey(_commandQueueName)
-                .withExchangeName(ExchangeNameDefaults.TOPIC)
+                .WithRoutingKey(_commandQueueName)
+                .WithExchangeName(ExchangeNameDefaults.TOPIC)
                 .Create();
 
             _publisher.DisableMessageTimestamp = true;
@@ -85,7 +85,7 @@ namespace Qpid.Client.Tests
                 _channel.Bind(queueName, ExchangeNameDefaults.TOPIC, _commandQueueName);
 
                 _consumers[i] = _channel.CreateConsumerBuilder(queueName)
-                    .withPrefetch(100).Create();
+                    .WithPrefetchLow(100).Create();
                 _consumers[i].OnMessage = new MessageReceivedDelegate(OnMessage);
             }
             _connection.Start();
diff --git a/dotnet/Qpid.Client.Tests/Qpid.Client.Tests.csproj b/dotnet/Qpid.Client.Tests/Qpid.Client.Tests.csproj
index c3e957ae09..00c3d54a82 100644
--- a/dotnet/Qpid.Client.Tests/Qpid.Client.Tests.csproj
+++ b/dotnet/Qpid.Client.Tests/Qpid.Client.Tests.csproj
@@ -55,6 +55,7 @@
     <Compile Include="requestreply1\ServiceProvidingClient.cs" />

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

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

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

   </ItemGroup>

   <ItemGroup>

     <ProjectReference Include="..\Qpid.Client.Transport.Socket.Blocking\Qpid.Client.Transport.Socket.Blocking.csproj">

diff --git a/dotnet/Qpid.Client.Tests/connection/ConnectionTest.cs b/dotnet/Qpid.Client.Tests/connection/ConnectionTest.cs
index d6d7639c21..5aa6773e53 100644
--- a/dotnet/Qpid.Client.Tests/connection/ConnectionTest.cs
+++ b/dotnet/Qpid.Client.Tests/connection/ConnectionTest.cs
@@ -43,7 +43,7 @@ namespace Qpid.Client.Tests.connection
         public void passwordFailureConnection()
         {
             ConnectionInfo connectionInfo = new QpidConnectionInfo();
-            connectionInfo.setPassword("rubbish");
+            connectionInfo.SetPassword("rubbish");
             connectionInfo.AddBrokerInfo(new AmqBrokerInfo());
             try
             {
diff --git a/dotnet/Qpid.Client.Tests/failover/FailoverTest.cs b/dotnet/Qpid.Client.Tests/failover/FailoverTest.cs
index 952cc2a58e..52ef76c559 100644
--- a/dotnet/Qpid.Client.Tests/failover/FailoverTest.cs
+++ b/dotnet/Qpid.Client.Tests/failover/FailoverTest.cs
@@ -78,8 +78,8 @@ namespace Qpid.Client.Tests.failover
 
 //            _publisher = _channel.CreatePublisher(exchangeName, exchangeClass, routingKey);
             _publisher = _channel.CreatePublisherBuilder()
-                .withRoutingKey(routingKey)
-                .withExchangeName(exchangeName)
+                .WithRoutingKey(routingKey)
+                .WithExchangeName(exchangeName)
                 .Create();
             _publisher.Send(msg);
         }
@@ -206,8 +206,8 @@ namespace Qpid.Client.Tests.failover
 
                 //return _channel.CreatePublisher(exchangeName, exchangeClass, routingKey);
                 return _session.CreatePublisherBuilder()
-                    .withExchangeName(exchangeName)
-                    .withRoutingKey(routingKey)
+                    .WithExchangeName(exchangeName)
+                    .WithRoutingKey(routingKey)
                     .Create();
             }
         }
diff --git a/dotnet/Qpid.Client.Tests/failover/FailoverTxTest.cs b/dotnet/Qpid.Client.Tests/failover/FailoverTxTest.cs
index 79a04e79eb..923d8c4049 100644
--- a/dotnet/Qpid.Client.Tests/failover/FailoverTxTest.cs
+++ b/dotnet/Qpid.Client.Tests/failover/FailoverTxTest.cs
@@ -36,8 +36,11 @@ namespace Qpid.Client.Tests.failover
         const int NUM_ITERATIONS = 10;
         const int NUM_COMMITED_MESSAGES = 10;
         const int NUM_ROLLEDBACK_MESSAGES = 3;
-        const int SLEEP_MILLIS = 500;
+        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)
@@ -45,6 +48,11 @@ namespace Qpid.Client.Tests.failover
             try
             {
                 _log.Info("Received: " + ((ITextMessage) message).Text);
+                if (_acknowledgeMode == AcknowledgeMode.ClientAcknowledge)
+                {
+                    _log.Info("client acknowledging");
+                    message.Acknowledge();
+                }
             }
             catch (QpidException e)
             {
@@ -56,11 +64,13 @@ namespace Qpid.Client.Tests.failover
         {
             FailoverTxTest _failoverTxTest;
             IMessageConsumer _consumer;
+            private bool _noWait;
 
-            internal NoWaitConsumer(FailoverTxTest failoverTxTest, IMessageConsumer channel)
+            internal NoWaitConsumer(FailoverTxTest failoverTxTest, IMessageConsumer channel, bool noWait)
             {
                 _failoverTxTest = failoverTxTest;
                 _consumer = channel;
+                _noWait = noWait;
             }
 
             internal void Run()
@@ -68,7 +78,9 @@ namespace Qpid.Client.Tests.failover
                 int messages = 0;
                 while (messages < NUM_COMMITED_MESSAGES)
                 {
-                    IMessage msg = _consumer.ReceiveNoWait();
+                    IMessage msg;
+                    if (_noWait) msg = _consumer.ReceiveNoWait();
+                    else msg = _consumer.Receive();
                     if (msg != null)
                     {
                         _log.Info("NoWait received message");
@@ -91,9 +103,10 @@ namespace Qpid.Client.Tests.failover
             _connection.ConnectionListener = this;
             _log.Info("connection = " + _connection);
             _log.Info("connectionInfo = " + connectionInfo);
-            _log.Info("connection.asUrl = " + _connection.toURL());
+            _log.Info("connection.AsUrl = " + _connection.toURL());
 
-            IChannel receivingChannel = _connection.CreateChannel(false, AcknowledgeMode.AutoAcknowledge);
+            _log.Info("AcknowledgeMode is " + _acknowledgeMode);
+            IChannel receivingChannel = _connection.CreateChannel(false, _acknowledgeMode);
 
             string queueName = receivingChannel.GenerateUniqueName();
 
@@ -103,17 +116,17 @@ namespace Qpid.Client.Tests.failover
             // No need to call Queue.Bind as automatically bound to default direct exchange.
             receivingChannel.Bind(queueName, "amq.direct", queueName);
 
-
-            IMessageConsumer consumer = receivingChannel.CreateConsumerBuilder(queueName).Create();
-            bool useThread = true;
+            IMessageConsumer consumer = receivingChannel.CreateConsumerBuilder(queueName)
+                .WithPrefetchLow(30)
+                .WithPrefetchHigh(60).Create();
+            bool useThread = false;
             if (useThread)
             {
-                NoWaitConsumer noWaitConsumer = new NoWaitConsumer(this, consumer);
-                new Thread(noWaitConsumer.Run).Start();
+                NoWaitConsumer noWaitConsumer = new NoWaitConsumer(this, consumer, _noWait);
+                new Thread(new ThreadStart(noWaitConsumer.Run)).Start();
             }
             else
             {
-                //receivingChannel.CreateConsumerBuilder(queueName).Create().OnMessage = new MessageReceivedDelegate(onMessage);
                 consumer.OnMessage = new MessageReceivedDelegate(OnMessage);
             }
 
@@ -133,7 +146,7 @@ namespace Qpid.Client.Tests.failover
             bool transacted = true;
             IChannel publishingChannel = _connection.CreateChannel(transacted, AcknowledgeMode.NoAcknowledge);
             IMessagePublisher publisher = publishingChannel.CreatePublisherBuilder()
-                .withRoutingKey(routingKey)
+                .WithRoutingKey(routingKey)
                 .Create();
 
             for (int i = 1; i <= NUM_ITERATIONS; ++i)
diff --git a/dotnet/Qpid.Client.Tests/requestreply1/ServiceProvidingClient.cs b/dotnet/Qpid.Client.Tests/requestreply1/ServiceProvidingClient.cs
index bb5758c18c..a52b4e2c50 100644
--- a/dotnet/Qpid.Client.Tests/requestreply1/ServiceProvidingClient.cs
+++ b/dotnet/Qpid.Client.Tests/requestreply1/ServiceProvidingClient.cs
@@ -60,8 +60,9 @@ namespace Qpid.Client.Tests
             _channel.DeclareQueue(_serviceName, false, false, false);
 
             IMessageConsumer consumer = _channel.CreateConsumerBuilder(_serviceName)
-                .withPrefetch(100)
-                .withNoLocal(true)
+                .WithPrefetchLow(100)
+                .WithPrefetchHigh(500)
+                .WithNoLocal(true)
                 .Create();
             consumer.OnMessage = new MessageReceivedDelegate(OnMessage);
         }
@@ -100,8 +101,8 @@ namespace Qpid.Client.Tests
 //                Console.WriteLine("ReplyTo.RoutingKey = " + _replyToRoutingKey);
 
                 _destinationPublisher = _channel.CreatePublisherBuilder()
-                    .withExchangeName(_replyToExchangeName)
-                    .withRoutingKey(_replyToRoutingKey)
+                    .WithExchangeName(_replyToExchangeName)
+                    .WithRoutingKey(_replyToRoutingKey)
                     .Create();
                 _destinationPublisher.DisableMessageTimestamp = true;
                 _destinationPublisher.DeliveryMode = DeliveryMode.NonPersistent;
diff --git a/dotnet/Qpid.Client.Tests/requestreply1/ServiceRequestingClient.cs b/dotnet/Qpid.Client.Tests/requestreply1/ServiceRequestingClient.cs
index 582f022719..e437b670bf 100644
--- a/dotnet/Qpid.Client.Tests/requestreply1/ServiceRequestingClient.cs
+++ b/dotnet/Qpid.Client.Tests/requestreply1/ServiceRequestingClient.cs
@@ -53,7 +53,7 @@ namespace Qpid.Client.Tests
             try
             {
                 _publisher = _channel.CreatePublisherBuilder()
-                    .withRoutingKey(_commandQueueName)
+                    .WithRoutingKey(_commandQueueName)
                     .Create();
                 _publisher.DisableMessageTimestamp = true; // XXX: need a "with" for this in builder?
                 _publisher.DeliveryMode = DeliveryMode.NonPersistent;  // XXX: need a "with" for this in builder?
@@ -74,9 +74,10 @@ namespace Qpid.Client.Tests
             _channel.DeclareQueue(replyQueueName, false, true, true);
 
             IMessageConsumer messageConsumer = _channel.CreateConsumerBuilder(replyQueueName)
-                .withPrefetch(100)
-                .withNoLocal(true)
-                .withExclusive(true).Create();
+                .WithPrefetchLow(100)
+                .WithPrefetchHigh(200)
+                .WithNoLocal(true)
+                .WithExclusive(true).Create();
  
             _startTime = DateTime.Now.Ticks;
 
diff --git a/dotnet/Qpid.Client.Tests/undeliverable/UndeliverableTest.cs b/dotnet/Qpid.Client.Tests/undeliverable/UndeliverableTest.cs
index 63c936d667..84ae2c92c1 100644
--- a/dotnet/Qpid.Client.Tests/undeliverable/UndeliverableTest.cs
+++ b/dotnet/Qpid.Client.Tests/undeliverable/UndeliverableTest.cs
@@ -81,11 +81,11 @@ namespace Qpid.Client.Tests
 
             // Send a test message to a non-existant queue on the default exchange. See if message is returned!
             MessagePublisherBuilder builder = _channel.CreatePublisherBuilder()
-                .withRoutingKey("Non-existant route key!")
-                .withMandatory(true);
+                .WithRoutingKey("Non-existant route key!")
+                .WithMandatory(true);
             if (exchangeName != null)
             {
-                builder.withExchangeName(exchangeName);
+                builder.WithExchangeName(exchangeName);
             }
             IMessagePublisher publisher = builder.Create();
             publisher.Send(_channel.CreateTextMessage("Hiya!"));
diff --git a/dotnet/Qpid.Client.Tests/url/ConnectionUrlTest.cs b/dotnet/Qpid.Client.Tests/url/ConnectionUrlTest.cs
new file mode 100644
index 0000000000..dccfffd780
--- /dev/null
+++ b/dotnet/Qpid.Client.Tests/url/ConnectionUrlTest.cs
@@ -0,0 +1,408 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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 Qpid.Client.qms;
+
+namespace 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'";
+
+            ConnectionInfo connectionurl = QpidConnectionInfo.FromUrl(url);
+
+            Assert.AreEqual("roundrobin", connectionurl.GetFailoverMethod());
+            Assert.IsTrue(connectionurl.GetUsername().Equals("ritchiem"));
+            Assert.IsTrue(connectionurl.GetPassword().Equals("bob"));
+            Assert.IsTrue(connectionurl.GetVirtualHost().Equals("/temp"));
+
+            Assert.IsTrue(connectionurl.GetBrokerCount() == 2);
+
+            BrokerInfo service = connectionurl.GetBrokerInfo(0);
+
+            Assert.IsTrue(service.getTransport().Equals("tcp"));
+            Assert.IsTrue(service.getHost().Equals("localhost"));
+            Assert.IsTrue(service.getPort() == 5672);
+
+            service = connectionurl.GetBrokerInfo(1);
+
+            Assert.IsTrue(service.getTransport().Equals("tcp"));
+            Assert.IsTrue(service.getHost().Equals("fancyserver"));
+            Assert.IsTrue(service.getPort() == 3000);
+
+        }
+
+        [Test]
+        public void SingleTransportUsernamePasswordURL()
+        {
+            String url = "amqp://ritchiem:bob@default/temp?brokerlist='tcp://localhost:5672'";
+
+            ConnectionInfo connectionurl = QpidConnectionInfo.FromUrl(url);
+
+            Assert.IsTrue(connectionurl.GetFailoverMethod() == null);
+            Assert.IsTrue(connectionurl.GetUsername().Equals("ritchiem"));
+            Assert.IsTrue(connectionurl.GetPassword().Equals("bob"));
+            Assert.IsTrue(connectionurl.GetVirtualHost().Equals("/temp"));
+
+            Assert.IsTrue(connectionurl.GetBrokerCount() == 1);
+
+            BrokerInfo service = connectionurl.GetBrokerInfo(0);
+
+            Assert.IsTrue(service.getTransport().Equals("tcp"));
+            Assert.IsTrue(service.getHost().Equals("localhost"));
+            Assert.IsTrue(service.getPort() == 5672);
+        }
+
+        [Test]
+        public void SingleTransportUsernameBlankPasswordURL()
+        {
+            String url = "amqp://ritchiem:@default/temp?brokerlist='tcp://localhost:5672'";
+
+            ConnectionInfo connectionurl = QpidConnectionInfo.FromUrl(url);
+
+            Assert.IsTrue(connectionurl.GetFailoverMethod() == null);
+            Assert.IsTrue(connectionurl.GetUsername().Equals("ritchiem"));
+            Assert.IsTrue(connectionurl.GetPassword().Equals(""));
+            Assert.IsTrue(connectionurl.GetVirtualHost().Equals("/temp"));
+
+            Assert.IsTrue(connectionurl.GetBrokerCount() == 1);
+
+            BrokerInfo service = connectionurl.GetBrokerInfo(0);
+
+            Assert.IsTrue(service.getTransport().Equals("tcp"));
+            Assert.IsTrue(service.getHost().Equals("localhost"));
+            Assert.IsTrue(service.getPort() == 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'";
+
+            ConnectionInfo connectionurl = QpidConnectionInfo.FromUrl(url);
+
+
+            Assert.IsTrue(connectionurl.GetFailoverMethod() == null);
+            Assert.IsTrue(connectionurl.GetUsername().Equals("guest"));
+            Assert.IsTrue(connectionurl.GetPassword().Equals("guest"));
+            Assert.IsTrue(connectionurl.GetVirtualHost().Equals("/test"));
+
+
+            Assert.IsTrue(connectionurl.GetBrokerCount() == 1);
+
+
+            BrokerInfo service = connectionurl.GetBrokerInfo(0);
+
+            Assert.IsTrue(service.getTransport().Equals("tcp"));
+            Assert.IsTrue(service.getHost().Equals("localhost"));
+            Assert.IsTrue(service.getPort() == 5672);
+        }
+
+        [Test]
+        public void SingleTransportWithClientURLURL()
+        {
+            String url = "amqp://guest:guest@clientname/temp?brokerlist='tcp://localhost:5672'";
+
+            ConnectionInfo connectionurl = QpidConnectionInfo.FromUrl(url);
+
+
+            Assert.IsTrue(connectionurl.GetFailoverMethod() == null);
+            Assert.IsTrue(connectionurl.GetUsername().Equals("guest"));
+            Assert.IsTrue(connectionurl.GetPassword().Equals("guest"));
+            Assert.IsTrue(connectionurl.GetVirtualHost().Equals("/temp"));
+            Assert.IsTrue(connectionurl.GetClientName().Equals("clientname"));
+
+
+            Assert.IsTrue(connectionurl.GetBrokerCount() == 1);
+
+
+            BrokerInfo service = connectionurl.GetBrokerInfo(0);
+
+            Assert.IsTrue(service.getTransport().Equals("tcp"));
+            Assert.IsTrue(service.getHost().Equals("localhost"));
+            Assert.IsTrue(service.getPort() == 5672);
+        }
+
+        [Test]
+        public void SingleTransport1OptionURL()
+        {
+            String url = "amqp://guest:guest@default/temp?brokerlist='tcp://localhost:5672',routingkey='jim'";
+
+            ConnectionInfo connectionurl = QpidConnectionInfo.FromUrl(url);
+
+            Assert.IsTrue(connectionurl.GetFailoverMethod() == null);
+            Assert.IsTrue(connectionurl.GetUsername().Equals("guest"));
+            Assert.IsTrue(connectionurl.GetPassword().Equals("guest"));
+            Assert.IsTrue(connectionurl.GetVirtualHost().Equals("/temp"));
+
+
+            Assert.IsTrue(connectionurl.GetBrokerCount() == 1);
+
+            BrokerInfo service = connectionurl.GetBrokerInfo(0);
+
+            Assert.IsTrue(service.getTransport().Equals("tcp"));
+
+            Assert.IsTrue(service.getHost().Equals("localhost"));
+            Assert.IsTrue(service.getPort() == 5672);
+            Assert.IsTrue(connectionurl.GetOption("routingkey").Equals("jim"));
+        }
+
+        [Test]
+        public void SingleTransportDefaultedBroker()
+        {
+            String url = "amqp://guest:guest@default/temp?brokerlist='localhost:'";
+
+            ConnectionInfo connectionurl = QpidConnectionInfo.FromUrl(url);
+
+            Assert.IsTrue(connectionurl.GetFailoverMethod() == null);
+            Assert.IsTrue(connectionurl.GetUsername().Equals("guest"));
+            Assert.IsTrue(connectionurl.GetPassword().Equals("guest"));
+            Assert.IsTrue(connectionurl.GetVirtualHost().Equals("/temp"));
+
+
+            Assert.IsTrue(connectionurl.GetBrokerCount() == 1);
+
+            BrokerInfo service = connectionurl.GetBrokerInfo(0);
+
+            Assert.IsTrue(service.getTransport().Equals("tcp"));
+
+            Assert.IsTrue(service.getHost().Equals("localhost"));
+            Assert.IsTrue(service.getPort() == 5672);
+        }
+
+        [Test]
+        public void SingleTransportMultiOptionURL()
+        {
+            String url = "amqp://guest:guest@default/temp?brokerlist='tcp://localhost:5672',routingkey='jim',timeout='200',immediatedelivery='true'";
+
+            ConnectionInfo connectionurl = QpidConnectionInfo.FromUrl(url);
+
+            Assert.IsTrue(connectionurl.GetFailoverMethod() == null);
+            Assert.IsTrue(connectionurl.GetUsername().Equals("guest"));
+            Assert.IsTrue(connectionurl.GetPassword().Equals("guest"));
+            Assert.IsTrue(connectionurl.GetVirtualHost().Equals("/temp"));
+
+            Assert.IsTrue(connectionurl.GetBrokerCount() == 1);
+
+            BrokerInfo service = connectionurl.GetBrokerInfo(0);
+
+            Assert.IsTrue(service.getTransport().Equals("tcp"));
+
+            Assert.IsTrue(service.getHost().Equals("localhost"));
+            Assert.IsTrue(service.getPort() == 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'";
+
+            ConnectionInfo connectionurl = QpidConnectionInfo.FromUrl(url);
+
+            Assert.IsTrue(connectionurl.GetFailoverMethod() == null);
+            Assert.IsTrue(connectionurl.GetUsername().Equals("guest"));
+            Assert.IsTrue(connectionurl.GetPassword().Equals("guest"));
+            Assert.IsTrue(connectionurl.GetVirtualHost().Equals("/messages"));
+
+            Assert.IsTrue(connectionurl.GetBrokerCount() == 1);
+
+            BrokerInfo service = connectionurl.GetBrokerInfo(0);
+
+            Assert.IsTrue(service.getTransport().Equals("vm"));
+            Assert.AreEqual("localhost", service.getHost());
+            Assert.AreEqual(2, service.getPort());
+        }
+
+        [Test]
+        public void FailoverVMURL()
+        {
+            String url = "amqp://ritchiem:bob@default/temp?brokerlist='vm://default:2;vm://default:3',failover='roundrobin'";
+
+            ConnectionInfo connectionurl = QpidConnectionInfo.FromUrl(url);
+
+            Assert.IsTrue(connectionurl.GetFailoverMethod().Equals("roundrobin"));
+            Assert.IsTrue(connectionurl.GetUsername().Equals("ritchiem"));
+            Assert.IsTrue(connectionurl.GetPassword().Equals("bob"));
+            Assert.IsTrue(connectionurl.GetVirtualHost().Equals("/temp"));
+
+            Assert.AreEqual(2, connectionurl.GetBrokerCount());
+
+            BrokerInfo service = connectionurl.GetBrokerInfo(0);
+
+            Assert.IsTrue(service.getTransport().Equals("vm"));
+            Assert.AreEqual("localhost", service.getHost());
+            Assert.IsTrue(service.getPort() == 2);
+
+            service = connectionurl.GetBrokerInfo(1);
+            Assert.IsTrue(service.getTransport().Equals("vm"));
+            Assert.AreEqual("localhost", service.getHost());
+            Assert.IsTrue(service.getPort() == 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 e)
+            {
+                // This should occur.
+            }
+        }
+
+        [Test]
+        public void NoClientID()
+        {
+            String url = "amqp://user:@default/test?brokerlist='tcp://localhost:5672'";
+
+            ConnectionInfo connectionurl = QpidConnectionInfo.FromUrl(url);
+
+            Assert.IsTrue(connectionurl.GetUsername().Equals("user"));
+            Assert.IsTrue(connectionurl.GetPassword().Equals(""));
+            Assert.IsTrue(connectionurl.GetVirtualHost().Equals("/test"));
+            Assert.IsTrue(connectionurl.GetClientName().StartsWith(Dns.GetHostName()));
+
+            Assert.IsTrue(connectionurl.GetBrokerCount() == 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'";
+
+            ConnectionInfo connection = QpidConnectionInfo.FromUrl(url);
+            Assert.IsTrue(connection.GetVirtualHost().Equals("/t.-_+!=:"));
+        }
+
+        [Test]
+        public void CheckDefaultPort()
+        {
+            String url = "amqp://guest:guest@default/test=:?brokerlist='tcp://localhost'";
+
+            ConnectionInfo connection = QpidConnectionInfo.FromUrl(url);
+
+            BrokerInfo broker = connection.GetBrokerInfo(0);
+            Assert.IsTrue(broker.getPort() == 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);
+            }
+        }
+    }
+}
diff --git a/dotnet/Qpid.Client/Client/AMQConnection.cs b/dotnet/Qpid.Client/Client/AMQConnection.cs
index 5c0537429e..1bfa3b4c26 100644
--- a/dotnet/Qpid.Client/Client/AMQConnection.cs
+++ b/dotnet/Qpid.Client/Client/AMQConnection.cs
@@ -128,7 +128,7 @@ namespace Qpid.Client
             }
             _log.Info("ConnectionInfo: " + connectionInfo);
             _connectionInfo = connectionInfo;
-            _log.Info("password = " + _connectionInfo.getPassword());
+            _log.Info("password = " + _connectionInfo.GetPassword());
             _failoverPolicy = new FailoverPolicy(connectionInfo);
 
             // We are not currently connected.
@@ -503,7 +503,7 @@ namespace Qpid.Client
         {
             get
             {
-                return _connectionInfo.getUsername();
+                return _connectionInfo.GetUsername();
             }
         }
 
@@ -511,7 +511,7 @@ namespace Qpid.Client
         {
             get
             {
-                return _connectionInfo.getPassword();
+                return _connectionInfo.GetPassword();
             }
         }
 
@@ -519,7 +519,7 @@ namespace Qpid.Client
         {
             get
             {
-                return _connectionInfo.getVirtualHost();
+                return _connectionInfo.GetVirtualHost();
             }
         }
 
@@ -796,7 +796,7 @@ namespace Qpid.Client
 
         public String toURL()
         {
-            return _connectionInfo.asUrl();
+            return _connectionInfo.AsUrl();
         }
 
         class HeartBeatThread
diff --git a/dotnet/Qpid.Client/Client/AMQDestination.cs b/dotnet/Qpid.Client/Client/AMQDestination.cs
index 7ea6db4ee8..e2c4778a28 100644
--- a/dotnet/Qpid.Client/Client/AMQDestination.cs
+++ b/dotnet/Qpid.Client/Client/AMQDestination.cs
@@ -33,6 +33,7 @@ namespace Qpid.Client
 
         public bool IsDurable
         {
+           
             get { return _isDurable; }
         }
 
diff --git a/dotnet/Qpid.Client/Client/AmqBrokerInfo.cs b/dotnet/Qpid.Client/Client/AmqBrokerInfo.cs
index 88569b4fc0..36dd93d3d3 100644
--- a/dotnet/Qpid.Client/Client/AmqBrokerInfo.cs
+++ b/dotnet/Qpid.Client/Client/AmqBrokerInfo.cs
@@ -28,7 +28,7 @@ namespace Qpid.Client
     public class AmqBrokerInfo : BrokerInfo
     {
         public readonly string URL_FORMAT_EXAMPLE =
-            "<transport>://<hostname>[:<port Default=\""+BrokerDetailsConstants.DEFAULT_PORT+"\">][?<option>='<value>'[,<option>='<value>']]";
+            "<transport>://<hostname>[:<port Default=\""+BrokerInfoConstants.DEFAULT_PORT+"\">][?<option>='<value>'[,<option>='<value>']]";
 
         public const long DEFAULT_CONNECT_TIMEOUT = 30000L;
 
@@ -41,106 +41,133 @@ namespace Qpid.Client
         {
         }
 
-        // TODO: port URL parsing.
         public AmqBrokerInfo(string url)
         {
-            throw new NotImplementedException();
-//            this();
-//            // URL should be of format tcp://host:port?option='value',option='value'
-//            try
-//            {
-//                URI connection = new URI(url);
-//
-//                string transport = connection.getScheme();
-//
-//                // Handles some defaults to minimise changes to existing broker URLS e.g. localhost
-//                if (transport != null)
-//                {
-//                    //todo this list of valid transports should be enumerated somewhere
-//                    if ((!(transport.equalsIgnoreCase("vm") ||
-//                            transport.equalsIgnoreCase("tcp"))))
-//                    {
-//                        if (transport.equalsIgnoreCase("localhost"))
-//                        {
-//                            connection = new URI(DEFAULT_TRANSPORT + "://" + url);
-//                            transport = connection.getScheme();
-//                        }
-//                        else
-//                        {
-//                            if (url.charAt(transport.length()) == ':' && url.charAt(transport.length()+1) != '/' )
-//                            {
-//                                //Then most likely we have a host:port value
-//                                connection = new URI(DEFAULT_TRANSPORT + "://" + url);
-//                                transport = connection.getScheme();
-//                            }
-//                            else
-//                            {
-//                                URLHelper.parseError(0, transport.length(), "Unknown transport", url);
-//                            }
-//                        }
-//                    }
-//                }
-//                else
-//                {
-//                    //Default the transport
-//                    connection = new URI(DEFAULT_TRANSPORT + "://" + url);
-//                    transport = connection.getScheme();
-//                }
-//
-//                if (transport == null)
-//                {
-//                    URLHelper.parseError(-1, "Unknown transport:'" + transport + "'" +
-//                            " In broker URL:'" + url + "' Format: " + URL_FORMAT_EXAMPLE, "");
-//                }
-//
-//                setTransport(transport);
-//
-//                string host = connection.getHost();
-//
-//                // Fix for Java 1.5
-//                if (host == null)
-//                {
-//                    host = "";
-//                }
-//
-//                setHost(host);
-//
-//                int port = connection.getPort();
-//
-//                if (port == -1)
-//                {
-//                    // Another fix for Java 1.5 URI handling
-//                    string auth = connection.getAuthority();
-//
-//                    if (auth != null && auth.startsWith(":"))
-//                    {
-//                        setPort(Integer.parseInt(auth.substring(1)));
-//                    }
-//                    else
-//                    {
-//                        setPort(DEFAULT_PORT);
-//                    }
-//                }
-//                else
-//                {
-//                    setPort(port);
-//                }
-//
-//                string querystring = connection.getQuery();
-//
-//                URLHelper.parseOptions(_options, querystring);
-//
-//                //Fragment is #string (not used)
-//            }
-//            catch (URISyntaxException uris)
-//            {
-//                if (uris instanceof URLSyntaxException)
+            // 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, "");
+                }
+
+                setTransport(transport);
+
+                String host = connection.Host;
+                if (!host.Equals("default")) setHost(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 (Exception nfe) // XXX: should catch only "NumberFormatException" here
+                            {
+                                looking = false;
+                            }
+
+                        }
+                        if (found)
+                        {
+                            setPort(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
+                    {
+                        setPort(BrokerInfoConstants.DEFAULT_PORT);
+                    }
+                }
+                else
+                {
+                    setPort(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 (URLSyntaxException) uris;
+//                    throw uris;
 //                }
 //
 //                URLHelper.parseError(uris.getIndex(), uris.getReason(), uris.getInput());
-//            }
+            }
         }
 
         public AmqBrokerInfo(string transport, string host, int port, bool useSSL) : this()
@@ -151,7 +178,7 @@ namespace Qpid.Client
 
             if (useSSL)
             {
-                setOption(BrokerDetailsConstants.OPTIONS_SSL, "true");
+                setOption(BrokerInfoConstants.OPTIONS_SSL, "true");
             }
         }
 
@@ -197,11 +224,11 @@ namespace Qpid.Client
 
         public long getTimeout()
         {
-            if (_options.ContainsKey(BrokerDetailsConstants.OPTIONS_CONNECT_TIMEOUT))
+            if (_options.ContainsKey(BrokerInfoConstants.OPTIONS_CONNECT_TIMEOUT))
             {
                 try
                 {
-                    return long.Parse((string)_options[BrokerDetailsConstants.OPTIONS_CONNECT_TIMEOUT]);
+                    return long.Parse((string)_options[BrokerInfoConstants.OPTIONS_CONNECT_TIMEOUT]);
                 }
                 catch (FormatException)
                 {
@@ -209,12 +236,12 @@ namespace Qpid.Client
                 }
             }
 
-            return BrokerDetailsConstants.DEFAULT_CONNECT_TIMEOUT;
+            return BrokerInfoConstants.DEFAULT_CONNECT_TIMEOUT;
         }
 
         public void setTimeout(long timeout)
         {
-            setOption(BrokerDetailsConstants.OPTIONS_CONNECT_TIMEOUT, timeout.ToString());
+            setOption(BrokerInfoConstants.OPTIONS_CONNECT_TIMEOUT, timeout.ToString());
         }
 
         public override string ToString()
@@ -247,8 +274,9 @@ namespace Qpid.Client
 	
 	        BrokerInfo bd = (BrokerInfo) obj;
 	        return StringEqualsIgnoreCase(_host, bd.getHost()) &&
-	        	_port == bd.getPort();
-		}
+	        	_port == bd.getPort() &&
+                _transport == bd.getTransport();
+        }
     	
 		public override int GetHashCode()
 		{
@@ -296,9 +324,9 @@ namespace Qpid.Client
             // 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(BrokerDetailsConstants.OPTIONS_SSL))
+            if (_options.ContainsKey(BrokerInfoConstants.OPTIONS_SSL))
             {
-                return StringEqualsIgnoreCase((string)_options[BrokerDetailsConstants.OPTIONS_SSL], "true");
+                return StringEqualsIgnoreCase((string)_options[BrokerInfoConstants.OPTIONS_SSL], "true");
             }
 
             return false;
@@ -306,7 +334,7 @@ namespace Qpid.Client
 
         public void useSSL(bool ssl)
         {
-            setOption(BrokerDetailsConstants.OPTIONS_SSL, ssl.ToString());
+            setOption(BrokerInfoConstants.OPTIONS_SSL, ssl.ToString());
         }
     }
 }
diff --git a/dotnet/Qpid.Client/Client/AmqChannel.cs b/dotnet/Qpid.Client/Client/AmqChannel.cs
index 0ab3fd3411..2ffd6505c6 100644
--- a/dotnet/Qpid.Client/Client/AmqChannel.cs
+++ b/dotnet/Qpid.Client/Client/AmqChannel.cs
@@ -43,7 +43,7 @@ namespace Qpid.Client
         // 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;
 
-        internal const int DEFAULT_PREFETCH = 5000;
+        internal const int DEFAULT_PREFETCH = MessageConsumerBuilder.DEFAULT_PREFETCH_HIGH;
 
         private AMQConnection _connection;
 
@@ -273,6 +273,7 @@ namespace Qpid.Client
 
         public void Commit()
         {
+            // FIXME: Fail over safety. Needs FailoverSupport?
             CheckNotClosed();
             CheckTransacted(); // throws IllegalOperationException if not a transacted session
 
@@ -297,6 +298,7 @@ namespace Qpid.Client
 
         public void Rollback()
         {
+            // FIXME: Fail over safety. Needs FailoverSupport?
             CheckNotClosed();
             CheckTransacted(); // throws IllegalOperationException if not a transacted session
 
@@ -489,25 +491,26 @@ namespace Qpid.Client
         }
 
         public IMessageConsumer CreateConsumer(string queueName,
-                                               int prefetch,
+                                               int prefetchLow,
+                                               int prefetchHigh,
                                                bool noLocal,
                                                bool exclusive,
                                                bool durable,
                                                string subscriptionName)
         {
-            _logger.Debug(String.Format("CreateConsumer queueName={0} prefetch={1} noLocal={2} exclusive={3} durable={4} subscriptionName={5}",
-                                  queueName, prefetch, noLocal, exclusive, durable, subscriptionName));
-            return CreateConsumerImpl(queueName, prefetch, noLocal, exclusive, durable, 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 prefetch,
-                                                      bool noLocal,
-                                                      bool exclusive,
-                                                      bool durable,
-                                                      string subscriptionName)
+                                                    int prefetchLow,
+                                                    int prefetchHigh,
+                                                    bool noLocal,
+                                                    bool exclusive,
+                                                    bool durable,
+                                                    string subscriptionName)
         {
-
             if (durable || subscriptionName != null)
             {
                 throw new NotImplementedException(); // TODO: durable subscriptions.
@@ -518,7 +521,8 @@ namespace Qpid.Client
                 CheckNotClosed();
                
                 BasicMessageConsumer consumer = new BasicMessageConsumer(_channelId, queueName, noLocal,
-                                                                         _messageFactoryRegistry, this);
+                                                                         _messageFactoryRegistry, this,
+                                                                         prefetchHigh, prefetchLow, exclusive);
                 try
                 {
                     RegisterConsumer(consumer);
@@ -710,9 +714,8 @@ namespace Qpid.Client
         /// <param name="consumer"></param>
         void RegisterConsumer(BasicMessageConsumer consumer)
         {
-            String consumerTag = ConsumeFromQueue(consumer.QueueName, consumer.Prefetch, consumer.NoLocal,
+            String consumerTag = ConsumeFromQueue(consumer.QueueName, consumer.NoLocal,
                                            consumer.Exclusive, consumer.AcknowledgeMode);
-
             consumer.ConsumerTag = consumerTag;
             _consumers.Add(consumerTag, consumer);
         }
@@ -744,8 +747,7 @@ namespace Qpid.Client
             }
         }
 
-        private String ConsumeFromQueue(String queueName, int prefetch,
-                                    bool noLocal, bool exclusive, AcknowledgeMode acknowledgeMode)
+        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++);
@@ -973,7 +975,6 @@ namespace Qpid.Client
         public void AcknowledgeMessage(ulong deliveryTag, bool multiple)
         {
             AMQFrame ackFrame = BasicAckBody.CreateAMQFrame(_channelId, deliveryTag, multiple);
-            _logger.Info("XXX sending ack: " + ackFrame);
             if (_logger.IsDebugEnabled)
             {
                 _logger.Debug("Sending ack for delivery tag " + deliveryTag + " on channel " + _channelId);
diff --git a/dotnet/Qpid.Client/Client/BasicMessageConsumer.cs b/dotnet/Qpid.Client/Client/BasicMessageConsumer.cs
index 611a4e5351..133707c609 100644
--- a/dotnet/Qpid.Client/Client/BasicMessageConsumer.cs
+++ b/dotnet/Qpid.Client/Client/BasicMessageConsumer.cs
@@ -82,10 +82,15 @@ namespace Qpid.Client
         /// </summary>
         private readonly object _syncLock = new object();
 
-        /**
-         * We store the prefetch field in order to be able to reuse it when resubscribing in the event of failover
-         */
-        private int _prefetch;
+        /// <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
@@ -108,8 +113,20 @@ namespace Qpid.Client
         /// </summary>
         private long _lastDeliveryTag;
 
-        public BasicMessageConsumer(ushort channelId, string queueName, bool noLocal,
-                                    MessageFactoryRegistry messageFactory, AmqChannel channel)
+        /// <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;
@@ -117,6 +134,9 @@ namespace Qpid.Client
             _messageFactory = messageFactory;
             _channel = channel;
             _acknowledgeMode = _channel.AcknowledgeMode;
+            _prefetchHigh = prefetchHigh;
+            _prefetchLow = prefetchLow;
+            _exclusive = exclusive;
         }
 
         #region IMessageConsumer Members
@@ -302,65 +322,6 @@ namespace Qpid.Client
             }
         }
 
-//        /// <summary>
-//        /// Called from the AmqChannel when a message has arrived for this consumer. This methods handles both the case
-//        /// of a message listener or a synchronous receive() caller.
-//        /// </summary>
-//        /// <param name="messageFrame">the raw unprocessed mesage</param>
-//        /// <param name="acknowledgeMode">the acknowledge mode requested for this message</param>
-//        /// <param name="channelId">channel on which this message was sent</param>       
-//        internal void NotifyMessage(UnprocessedMessage messageFrame, AcknowledgeMode acknowledgeMode, ushort channelId)
-//        {
-//            _logger.Info("XXX notifyMessage called with message number " + messageFrame.DeliverBody.DeliveryTag);
-//            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);
-
-//                /*if (acknowledgeMode == AcknowledgeMode.PreAcknowledge)
-//                {
-//                    _channel.sendAcknowledgement(messageFrame.deliverBody.deliveryTag);
-//                }*/
-//                if (acknowledgeMode == 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
-//                    jmsMessage.Channel = _channel;
-//                }
-
-//                lock (_syncLock)
-//                {
-//                    if (_messageListener != null)
-//                    {
-//#if __MonoCS__
-//                        _messageListener(jmsMessage);
-//#else
-//                        _messageListener.Invoke(jmsMessage);
-//#endif
-//                    }
-//                    else
-//                    {
-//                        _synchronousQueue.Enqueue(jmsMessage);
-//                    }
-//                }
-//                if (acknowledgeMode == AcknowledgeMode.AutoAcknowledge)
-//                {
-//                    _channel.SendAcknowledgement(messageFrame.DeliverBody.DeliveryTag);
-//                }
-//            }
-//            catch (Exception e)
-//            {
-//                _logger.Error("Caught exception (dump follows) - ignoring...", e);
-//            }
-//        }
-
-
         /**
          * 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.
@@ -465,11 +426,6 @@ namespace Qpid.Client
             DeregisterConsumer();
         }
 
-        public int Prefetch
-        {
-            get { return _prefetch; }
-        }
-
         public string QueueName
         {
             get { return _queueName; }
@@ -509,7 +465,6 @@ namespace Qpid.Client
             AbstractQmsMessage msg = (AbstractQmsMessage) m;
             switch (AcknowledgeMode)
             {
-/* TODO
                 case AcknowledgeMode.DupsOkAcknowledge:
                     if (++_outstanding >= _prefetchHigh)
                     {
@@ -519,16 +474,16 @@ namespace Qpid.Client
                     {
                         _dups_ok_acknowledge_send = false;
                     }
-
                     if (_dups_ok_acknowledge_send)
                     {
-                        _channel.AcknowledgeMessage(msg.getDeliveryTag(), true);
+                        _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/dotnet/Qpid.Client/Client/QpidConnectionInfo.cs b/dotnet/Qpid.Client/Client/QpidConnectionInfo.cs
index f0c4c91db8..6c49a6c7ff 100644
--- a/dotnet/Qpid.Client/Client/QpidConnectionInfo.cs
+++ b/dotnet/Qpid.Client/Client/QpidConnectionInfo.cs
@@ -21,11 +21,341 @@
 using System;
 using System.Collections;
 using System.Net;
+using System.Text;
+using System.Text.RegularExpressions;
 using log4net;
 using Qpid.Client.qms;
 
 namespace 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.Append(key);
+
+                    sb.Append("='");
+
+                    sb.Append(options[key]);
+
+                    sb.Append("'");
+                    sb.Append(DEFAULT_OPTION_SEPERATOR);
+                }
+
+                sb.Remove(sb.Length - 1, 1);
+                //                sb.deleteCharAt(sb.length() - 1);
+
+                return sb.ToString();
+            }
+        }
+
+    }
+
+    public class QpidConnectionUrl
+    {
+        internal static ConnectionInfo FromUrl(string fullURL)
+        {
+            //_url = fullURL;
+            ConnectionInfo 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.SetClientName(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.Equals("")))
+                {
+                    connectionInfo.SetVirtualHost(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, ConnectionInfo 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.setUsername(userinfo.Substring(0, colonIndex));
+                connectionInfo.SetPassword(userinfo.Substring(colonIndex + 1));
+            }
+        }
+
+        private static void processOptions(ConnectionInfo 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.SetFailoverMethod(failover.Substring(0, methodIndex));
+                    QpidConnectionInfo qpidConnectionInfo = (QpidConnectionInfo)connectionInfo;
+                    URLHelper.parseOptions(qpidConnectionInfo.GetFailoverOptions(),
+                        failover.Substring(methodIndex + 1));
+                }
+                else
+                {
+                    connectionInfo.SetFailoverMethod(failover);
+                }
+
+                connectionInfo.SetOption(ConnectionUrlConstants.OPTIONS_FAILOVER, null);
+                //                _options.remove(OPTIONS_FAILOVER);
+            }
+        }
+
+        internal static ConnectionInfo FromUri(Uri uri)
+        {
+            return null; // FIXME
+
+        }
+    }
+
     public class QpidConnectionInfo : ConnectionInfo
     {
         private static readonly ILog _logger = LogManager.GetLogger(typeof(QpidConnectionInfo));
@@ -40,7 +370,22 @@ namespace Qpid.Client
         IList _brokerInfos = new ArrayList(); // List<BrokerInfo>
         string _clientName = String.Format("{0}{1:G}", Dns.GetHostName(), DateTime.Now.Ticks);
 
-        public string asUrl()
+        public IDictionary GetFailoverOptions()
+        {
+            return _failoverOptions;
+        }
+
+        public IDictionary GetOptions()
+        {
+            return _options;
+        }
+
+        public static ConnectionInfo FromUrl(String url)
+        {
+            return QpidConnectionUrl.FromUrl(url);
+        }
+
+        public string AsUrl()
         {
             string result = "amqp://";
             foreach (BrokerInfo info in _brokerInfos)
@@ -48,25 +393,30 @@ namespace Qpid.Client
                 result += info.ToString();
             }
             return result;
-            
+
         }
 
-        public string getFailoverMethod()
+        public string GetFailoverMethod()
         {
             return _failoverMethod;
         }
 
-        public string getFailoverOption(string key)
+        public void SetFailoverMethod(string failoverMethod)
+        {
+            _failoverMethod = failoverMethod;
+        }
+
+        public string GetFailoverOption(string key)
         {
-            return (string) _failoverOptions[key];
+            return (string)_failoverOptions[key];
         }
 
-        public int getBrokerCount()
+        public int GetBrokerCount()
         {
             return _brokerInfos.Count;
         }
 
-        public BrokerInfo GetBrokerDetails(int index)
+        public BrokerInfo GetBrokerInfo(int index)
         {
             return (BrokerInfo)_brokerInfos[index];
         }
@@ -94,7 +444,7 @@ namespace Qpid.Client
             _clientName = clientName;
         }
 
-        public string getUsername()
+        public string GetUsername()
         {
             return _username;
         }
@@ -104,39 +454,39 @@ namespace Qpid.Client
             _username = username;
         }
 
-        public string getPassword()
+        public string GetPassword()
         {
             return _password;
         }
 
-        public void setPassword(string password)
+        public void SetPassword(string password)
         {
             _password = password;
         }
 
-        public string getVirtualHost()
+        public string GetVirtualHost()
         {
             return _virtualHost;
         }
 
-        public void setVirtualHost(string virtualHost)
+        public void SetVirtualHost(string virtualHost)
         {
             _virtualHost = virtualHost;
         }
 
-        public string getOption(string key)
+        public string GetOption(string key)
         {
-            return (string) _options[key];
+            return (string)_options[key];
         }
 
-        public void setOption(string key, string value)
+        public void SetOption(string key, string value)
         {
             _options[key] = value;
         }
-        
+
         public override string ToString()
         {
-            return asUrl();
+            return AsUrl();
         }
     }
 }
diff --git a/dotnet/Qpid.Client/Qpid.Client.csproj b/dotnet/Qpid.Client/Qpid.Client.csproj
index eb84402e1f..b3a17a7a6d 100644
--- a/dotnet/Qpid.Client/Qpid.Client.csproj
+++ b/dotnet/Qpid.Client/Qpid.Client.csproj
@@ -103,6 +103,7 @@
     <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.Codec\Qpid.Codec.csproj">

diff --git a/dotnet/Qpid.Client/qms/BrokerInfo.cs b/dotnet/Qpid.Client/qms/BrokerInfo.cs
index dd0504968e..6fe02403b7 100644
--- a/dotnet/Qpid.Client/qms/BrokerInfo.cs
+++ b/dotnet/Qpid.Client/qms/BrokerInfo.cs
@@ -26,7 +26,7 @@ namespace Qpid.Client.qms
     /// Know URL option names.
     /// <seealso cref="ConnectionInfo"/>
     /// </summary>
-    public class BrokerDetailsConstants
+    public class BrokerInfoConstants
     {
         public const String OPTIONS_RETRY = "retries";
         public const String OPTIONS_SSL = ConnectionUrlConstants.OPTIONS_SSL;
diff --git a/dotnet/Qpid.Client/qms/ConnectionInfo.cs b/dotnet/Qpid.Client/qms/ConnectionInfo.cs
index 1d099daa3e..8ac11ec1ab 100644
--- a/dotnet/Qpid.Client/qms/ConnectionInfo.cs
+++ b/dotnet/Qpid.Client/qms/ConnectionInfo.cs
@@ -39,15 +39,16 @@ namespace Qpid.Client.qms
       */
     public interface ConnectionInfo
     {
-        string asUrl();
+        string AsUrl();
 
-        string getFailoverMethod();
+        string GetFailoverMethod();
+        void SetFailoverMethod(string failoverMethod);
 
-        string getFailoverOption(string key);
+        string GetFailoverOption(string key);
 
-        int getBrokerCount();
+        int GetBrokerCount();
 
-        BrokerInfo GetBrokerDetails(int index);
+        BrokerInfo GetBrokerInfo(int index);
 
         void AddBrokerInfo(BrokerInfo broker);
 
@@ -57,20 +58,20 @@ namespace Qpid.Client.qms
 
         void SetClientName(string clientName);
 
-        string getUsername();
+        string GetUsername();
 
         void setUsername(string username);
 
-        string getPassword();
+        string GetPassword();
 
-        void setPassword(string password);
+        void SetPassword(string password);
 
-        string getVirtualHost();
+        string GetVirtualHost();
 
-        void setVirtualHost(string virtualHost);
+        void SetVirtualHost(string virtualHost);
 
-        string getOption(string key);
+        string GetOption(string key);
 
-        void setOption(string key, string value);
+        void SetOption(string key, string value);
     }
 }
diff --git a/dotnet/Qpid.Client/qms/FailoverPolicy.cs b/dotnet/Qpid.Client/qms/FailoverPolicy.cs
index 15d52491df..5d3eceb58e 100644
--- a/dotnet/Qpid.Client/qms/FailoverPolicy.cs
+++ b/dotnet/Qpid.Client/qms/FailoverPolicy.cs
@@ -56,9 +56,9 @@ namespace Qpid.Client.qms
 
             _methodsRetries = 0;
 
-            if (connectionInfo.getFailoverMethod() == null)
+            if (connectionInfo.GetFailoverMethod() == null)
             {
-                if (connectionInfo.getBrokerCount() > 1)
+                if (connectionInfo.GetBrokerCount() > 1)
                 {
                     method = new FailoverRoundRobin(connectionInfo);
                 }
@@ -69,7 +69,7 @@ namespace Qpid.Client.qms
             }
             else
             {
-                string failoverMethod = connectionInfo.getFailoverMethod();
+                string failoverMethod = connectionInfo.GetFailoverMethod();
 
     /*
                 if (failoverMethod.equals(FailoverMethod.RANDOM))
diff --git a/dotnet/Qpid.Client/qms/UrlSyntaxException.cs b/dotnet/Qpid.Client/qms/UrlSyntaxException.cs
new file mode 100644
index 0000000000..f7aaf56085
--- /dev/null
+++ b/dotnet/Qpid.Client/qms/UrlSyntaxException.cs
@@ -0,0 +1,116 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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 Qpid.Client.qms
+{
+    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;
+        }
+
+        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/dotnet/Qpid.Client/qms/failover/FailoverRoundRobin.cs b/dotnet/Qpid.Client/qms/failover/FailoverRoundRobin.cs
index c0e832ce21..aac16a40fa 100644
--- a/dotnet/Qpid.Client/qms/failover/FailoverRoundRobin.cs
+++ b/dotnet/Qpid.Client/qms/failover/FailoverRoundRobin.cs
@@ -65,7 +65,7 @@ namespace Qpid.Client.qms.failover
 
         public FailoverRoundRobin(ConnectionInfo connectionDetails)
         {
-            if (!(connectionDetails.getBrokerCount() > 0))
+            if (!(connectionDetails.GetBrokerCount() > 0))
             {
                 throw new ArgumentException("At least one broker details must be specified.");
             }
@@ -75,7 +75,7 @@ namespace Qpid.Client.qms.failover
             //There is no current broker at startup so set it to -1.
             _currentBrokerIndex = -1;
 
-            String cycleRetries = _connectionDetails.getFailoverOption(ConnectionUrlConstants.OPTIONS_FAILOVER_CYCLE);
+            String cycleRetries = _connectionDetails.GetFailoverOption(ConnectionUrlConstants.OPTIONS_FAILOVER_CYCLE);
 
             if (cycleRetries != null)
             {
@@ -106,7 +106,7 @@ namespace Qpid.Client.qms.failover
         {
             return ((_currentCycleRetries < _cycleRetries)
                    || (_currentServerRetry < _serverRetries)
-                   || (_currentBrokerIndex < (_connectionDetails.getBrokerCount() - 1)));
+                   || (_currentBrokerIndex < (_connectionDetails.GetBrokerCount() - 1)));
         }
 
         public void attainedConnection()
@@ -122,12 +122,12 @@ namespace Qpid.Client.qms.failover
                 return null;
             }
 
-            return _connectionDetails.GetBrokerDetails(_currentBrokerIndex);
+            return _connectionDetails.GetBrokerInfo(_currentBrokerIndex);
         }
 
         public BrokerInfo getNextBrokerDetails()
         {
-            if (_currentBrokerIndex == (_connectionDetails.getBrokerCount() - 1))
+            if (_currentBrokerIndex == (_connectionDetails.GetBrokerCount() - 1))
             {
                 if (_currentServerRetry < _serverRetries)
                 {
@@ -135,13 +135,13 @@ namespace Qpid.Client.qms.failover
                     {
                         _currentBrokerIndex = 0;
 
-                        setBroker(_connectionDetails.GetBrokerDetails(_currentBrokerIndex ));
+                        setBroker(_connectionDetails.GetBrokerInfo(_currentBrokerIndex ));
 
-                        _logger.Info("First Run using " + _connectionDetails.GetBrokerDetails(_currentBrokerIndex));
+                        _logger.Info("First Run using " + _connectionDetails.GetBrokerInfo(_currentBrokerIndex));
                     }
                     else
                     {
-                        _logger.Info("Retrying " + _connectionDetails.GetBrokerDetails(_currentBrokerIndex));
+                        _logger.Info("Retrying " + _connectionDetails.GetBrokerInfo(_currentBrokerIndex));
                     }
 
                     _currentServerRetry++;
@@ -152,7 +152,7 @@ namespace Qpid.Client.qms.failover
                     //failed to connect to first broker
                     _currentBrokerIndex = 0;
 
-                    setBroker(_connectionDetails.GetBrokerDetails(_currentBrokerIndex ));
+                    setBroker(_connectionDetails.GetBrokerInfo(_currentBrokerIndex ));
 
                     // This is zero rather than -1 as we are already retrieving the details.
                     _currentServerRetry = 0;
@@ -167,13 +167,13 @@ namespace Qpid.Client.qms.failover
                     {
                         _currentBrokerIndex = 0;
 
-                        setBroker(_connectionDetails.GetBrokerDetails(_currentBrokerIndex ));
+                        setBroker(_connectionDetails.GetBrokerInfo(_currentBrokerIndex ));
 
-                        _logger.Info("First Run using " + _connectionDetails.GetBrokerDetails(_currentBrokerIndex));
+                        _logger.Info("First Run using " + _connectionDetails.GetBrokerInfo(_currentBrokerIndex));
                     }
                     else
                     {
-                        _logger.Info("Retrying " + _connectionDetails.GetBrokerDetails(_currentBrokerIndex));
+                        _logger.Info("Retrying " + _connectionDetails.GetBrokerInfo(_currentBrokerIndex));
                     }
                     _currentServerRetry++;
                 }
@@ -181,13 +181,13 @@ namespace Qpid.Client.qms.failover
                 {
                     _currentBrokerIndex++;
 
-                     setBroker(_connectionDetails.GetBrokerDetails(_currentBrokerIndex ));
+                     setBroker(_connectionDetails.GetBrokerInfo(_currentBrokerIndex ));
                     // This is zero rather than -1 as we are already retrieving the details.
                     _currentServerRetry = 0;
                 }
             }
 
-            return _connectionDetails.GetBrokerDetails(_currentBrokerIndex);
+            return _connectionDetails.GetBrokerInfo(_currentBrokerIndex);
         }
 
         public void setBroker(BrokerInfo broker)
@@ -196,7 +196,7 @@ namespace Qpid.Client.qms.failover
 
             int index = _connectionDetails.GetAllBrokerInfos().IndexOf(broker);
 
-            String serverRetries = broker.getOption(BrokerDetailsConstants.OPTIONS_RETRY);
+            String serverRetries = broker.getOption(BrokerInfoConstants.OPTIONS_RETRY);
 
             if (serverRetries != null)
             {
@@ -230,7 +230,7 @@ namespace Qpid.Client.qms.failover
 
             sb.Append(GetType().Name).Append("\n");
 
-            sb.Append("Broker count: ").Append(_connectionDetails.getBrokerCount());
+            sb.Append("Broker count: ").Append(_connectionDetails.GetBrokerCount());
             sb.Append("\ncurrent broker index: ").Append(_currentBrokerIndex);
 
             sb.Append("\nCycle Retries: ").Append(_cycleRetries);
@@ -239,13 +239,13 @@ namespace Qpid.Client.qms.failover
             sb.Append("\nCurrent Retry:").Append(_currentServerRetry);
             sb.Append("\n");
 
-            for(int i=0; i < _connectionDetails.getBrokerCount() ; i++)
+            for(int i=0; i < _connectionDetails.GetBrokerCount() ; i++)
             {
                 if (i == _currentBrokerIndex)
                 {
                     sb.Append(">");
                 }
-                sb.Append(_connectionDetails.GetBrokerDetails(i));
+                sb.Append(_connectionDetails.GetBrokerInfo(i));
                 sb.Append("\n");
             }
 
diff --git a/dotnet/Qpid.Client/qms/failover/FailoverSingleServer.cs b/dotnet/Qpid.Client/qms/failover/FailoverSingleServer.cs
index 60e4c24987..be29429035 100644
--- a/dotnet/Qpid.Client/qms/failover/FailoverSingleServer.cs
+++ b/dotnet/Qpid.Client/qms/failover/FailoverSingleServer.cs
@@ -45,9 +45,9 @@ namespace Qpid.Client.qms.failover
 
         public FailoverSingleServer(ConnectionInfo connectionDetails)
         {
-            if (connectionDetails.getBrokerCount() > 0)
+            if (connectionDetails.GetBrokerCount() > 0)
             {
-                setBroker(connectionDetails.GetBrokerDetails(0));
+                setBroker(connectionDetails.GetBrokerInfo(0));
             }
             else
             {
@@ -105,7 +105,7 @@ namespace Qpid.Client.qms.failover
             }
             _brokerDetail = broker;
 
-            String retries = broker.getOption(BrokerDetailsConstants.OPTIONS_RETRY);
+            String retries = broker.getOption(BrokerInfoConstants.OPTIONS_RETRY);
             if (retries != null)
             {
                 try
diff --git a/dotnet/Qpid.Common/Collections/BlockingQueue.cs b/dotnet/Qpid.Common/Collections/BlockingQueue.cs
index 7adf6c3af2..71fc9bf518 100644
--- a/dotnet/Qpid.Common/Collections/BlockingQueue.cs
+++ b/dotnet/Qpid.Common/Collections/BlockingQueue.cs
@@ -24,7 +24,7 @@ using System.Collections;
 namespace 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
diff --git a/dotnet/Qpid.Common/Collections/SynchronousQueue.cs b/dotnet/Qpid.Common/Collections/SynchronousQueue.cs
index d210ea3b42..a678a6c5fc 100644
--- a/dotnet/Qpid.Common/Collections/SynchronousQueue.cs
+++ b/dotnet/Qpid.Common/Collections/SynchronousQueue.cs
@@ -373,4 +373,3 @@ namespace Qpid.Collections
         }
     }
 }
-
diff --git a/dotnet/Qpid.Messaging/IChannel.cs b/dotnet/Qpid.Messaging/IChannel.cs
index 247d164ae7..7fceb1a532 100644
--- a/dotnet/Qpid.Messaging/IChannel.cs
+++ b/dotnet/Qpid.Messaging/IChannel.cs
@@ -60,7 +60,8 @@ namespace Qpid.Messaging
         MessageConsumerBuilder CreateConsumerBuilder(string queueName);
 
         IMessageConsumer CreateConsumer(string queueName,
-                                        int prefetch,
+                                        int prefetchLow, 
+                                        int prefetchHigh,
                                         bool noLocal,
                                         bool exclusive,
                                         bool durable,
diff --git a/dotnet/Qpid.Messaging/MessageConsumerBuilder.cs b/dotnet/Qpid.Messaging/MessageConsumerBuilder.cs
index 6699d63a79..4166dd0137 100644
--- a/dotnet/Qpid.Messaging/MessageConsumerBuilder.cs
+++ b/dotnet/Qpid.Messaging/MessageConsumerBuilder.cs
@@ -22,13 +22,16 @@ namespace Qpid.Messaging
 {
     public class MessageConsumerBuilder
     {
-        private int _prefetch = 0;
+        public const int DEFAULT_PREFETCH_HIGH = 5000;
+
         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 = 2500;
+        private int _prefetchHigh = DEFAULT_PREFETCH_HIGH;
 
         public MessageConsumerBuilder(IChannel channel, string queueName)
         {
@@ -36,31 +39,37 @@ namespace Qpid.Messaging
             _queueName = queueName;
         }
 
-        public MessageConsumerBuilder withPrefetch(int prefetch)
+        public MessageConsumerBuilder WithPrefetchLow(int prefetchLow)
+        {
+            _prefetchLow = prefetchLow;
+            return this;
+        }
+
+        public MessageConsumerBuilder WithPrefetchHigh(int prefetchHigh)
         {
-            _prefetch = prefetch;
+            _prefetchHigh = prefetchHigh;
             return this;
         }
 
-        public MessageConsumerBuilder withNoLocal(bool noLocal)
+        public MessageConsumerBuilder WithNoLocal(bool noLocal)
         {
             _noLocal = noLocal;
             return this;
         }
 
-        public MessageConsumerBuilder withExclusive(bool exclusive)
+        public MessageConsumerBuilder WithExclusive(bool exclusive)
         {
             _exclusive = exclusive;
             return this;
         }
 
-        public MessageConsumerBuilder withDurable(bool durable)
+        public MessageConsumerBuilder WithDurable(bool durable)
         {
             _durable = durable;
             return this;
         }
 
-        public MessageConsumerBuilder withSubscriptionName(string subscriptionName)
+        public MessageConsumerBuilder WithSubscriptionName(string subscriptionName)
         {
             _subscriptionName = subscriptionName;
             return this;
@@ -68,7 +77,7 @@ namespace Qpid.Messaging
 
         public IMessageConsumer Create()
         {
-            return _channel.CreateConsumer(_queueName, _prefetch, _noLocal, _exclusive, _durable, _subscriptionName);
+            return _channel.CreateConsumer(_queueName, _prefetchLow, _prefetchHigh, _noLocal, _exclusive, _durable, _subscriptionName);
         }
     }
 }
diff --git a/dotnet/Qpid.Messaging/MessagePublisherBuilder.cs b/dotnet/Qpid.Messaging/MessagePublisherBuilder.cs
index ecee1b5c57..ba843049ef 100644
--- a/dotnet/Qpid.Messaging/MessagePublisherBuilder.cs
+++ b/dotnet/Qpid.Messaging/MessagePublisherBuilder.cs
@@ -47,37 +47,37 @@ namespace Qpid.Messaging
             _channel = channel;
         }
 
-        public MessagePublisherBuilder withRoutingKey(string routingKey)
+        public MessagePublisherBuilder WithRoutingKey(string routingKey)
         {
             _routingKey = routingKey;
             return this;
         }
 
-        public MessagePublisherBuilder withExchangeName(string exchangeName)
+        public MessagePublisherBuilder WithExchangeName(string exchangeName)
         {
             _exchangeName = exchangeName;
             return this;
         }
 
-        public MessagePublisherBuilder withDeliveryMode(DeliveryMode deliveryMode)
+        public MessagePublisherBuilder WithDeliveryMode(DeliveryMode deliveryMode)
         {
             _deliveryMode = deliveryMode;
             return this;
         }
 
-        public MessagePublisherBuilder withTimeToLive(long timeToLive)
+        public MessagePublisherBuilder WithTimeToLive(long timeToLive)
         {
             _timeToLive = timeToLive;
             return this;
         }
 
-        public MessagePublisherBuilder withImmediate(bool immediate)
+        public MessagePublisherBuilder WithImmediate(bool immediate)
         {
             _immediate = immediate;
             return this;
         }
 
-        public MessagePublisherBuilder withMandatory(bool mandatory)
+        public MessagePublisherBuilder WithMandatory(bool mandatory)
         {
             _mandatory = mandatory;
             return this;
diff --git a/dotnet/Qpid.NET.FxCop b/dotnet/Qpid.NET.FxCop
new file mode 100644
index 0000000000..cfc5445e40
--- /dev/null
+++ b/dotnet/Qpid.NET.FxCop
@@ -0,0 +1,16755 @@
+<?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/dotnet/TODO.txt b/dotnet/TODO.txt
index 93f359dacf..90628d662d 100644
--- a/dotnet/TODO.txt
+++ b/dotnet/TODO.txt
@@ -1,22 +1,9 @@
 
-https://issues.apache.org/jira/browse/QPID-136
-* createSession with prefetch (warning: prefetch partly added)
-  * Do the BasicQos message after opening channel (sets up prefetch).
-
-https://issues.apache.org/jira/browse/QPID-137
-* .NET currently only supports no-ack mode. Allow acknowledgement support.
-  * Implement the PreAcknowledge ack mode. Add preDeliver/postDeliver methods in AmqSession like the Java client.
-  * Implement Recover() with Basic.Recover.
-
-* Port Connection URL support.
-
 * Implement durable subscriptions.
 
 * SSL. SSLStream composed over NetworkStream.
 
-* Implement a Async IO socket transport.
-  Compare against blocking socket transport and configure default appropriately.
-
 * support multiple versions of AMQP from the same client.
 
-* Blocking receive i.e. Basic.Get
+* Implement a Async IO socket transport.
+  Compare against blocking socket transport and configure default appropriately.
diff --git a/gentools/src/org/apache/qpid/gentools/CppGenerator.java b/gentools/src/org/apache/qpid/gentools/CppGenerator.java
index f6dea0f669..cf97e01877 100644
--- a/gentools/src/org/apache/qpid/gentools/CppGenerator.java
+++ b/gentools/src/org/apache/qpid/gentools/CppGenerator.java
@@ -176,9 +176,16 @@ public class CppGenerator extends Generator
 	{
 		String domainType = getDomainType(domainName, version);
 		if (domainType == null)
+        {
 			throw new AmqpTypeMappingException("Domain type \"" + domainName +
 				"\" not found in C++ typemap.");
-		return typeMap.get(domainType).type;
+        }
+        DomainInfo info = typeMap.get(domainType);
+        if (info == null)
+        {
+            throw new AmqpTypeMappingException("Unknown domain: \"" + domainType + "\"");
+        }
+        return info.type;
 	}
 	
 	// === Abstract methods from class Generator - C++-specific implementation ===
@@ -1125,7 +1132,7 @@ public class CppGenerator extends Generator
         while (mItr.hasNext())
         {
             AmqpMethod method = thisClass.methodMap.get(mItr.next());
-            sb.append(indent + "#include <qpid/framing/" + thisClass.name +
+            sb.append(indent + "#include <" + thisClass.name +
                 Utils.firstUpper(method.name) + "Body.h>" + cr);
         }
         return sb.toString();       
diff --git a/gentools/src/org/apache/qpid/gentools/JavaGenerator.java b/gentools/src/org/apache/qpid/gentools/JavaGenerator.java
index 4c168cd036..c465677bff 100644
--- a/gentools/src/org/apache/qpid/gentools/JavaGenerator.java
+++ b/gentools/src/org/apache/qpid/gentools/JavaGenerator.java
@@ -355,8 +355,16 @@ public class JavaGenerator extends Generator
 	{
 		String domainType = globalDomainMap.getDomainType(domainName, version);
 		if (domainType == null)
-			throw new AmqpTypeMappingException("Domain type \"" + domainName + "\" not found in Java typemap.");
-		return typeMap.get(domainType).type;
+        {
+			throw new AmqpTypeMappingException("Domain type \"" + domainName +
+                "\" not found in Java typemap.");
+        }
+        DomainInfo info = typeMap.get(domainType);
+        if (info == null)
+        {
+            throw new AmqpTypeMappingException("Unknown domain: \"" + domainType + "\"");
+        }
+		return info.type;
 	}
 
 	
diff --git a/gentools/templ.cpp/AMQP_ClientOperations.h.tmpl b/gentools/templ.cpp/AMQP_ClientOperations.h.tmpl
index 4a92c9c422..64471e4d61 100644
--- a/gentools/templ.cpp/AMQP_ClientOperations.h.tmpl
+++ b/gentools/templ.cpp/AMQP_ClientOperations.h.tmpl
@@ -31,9 +31,9 @@
 #ifndef _AMQP_ClientOperations_
 #define _AMQP_ClientOperations_
 
-#include <qpid/framing/FieldTable.h>
-#include <qpid/framing/ProtocolVersion.h>
-#include <qpid/framing/ProtocolVersionException.h>
+#include <FieldTable.h>
+#include <ProtocolVersion.h>
+#include <ProtocolVersionException.h>
 
 namespace qpid {
 namespace framing {
@@ -62,7 +62,7 @@ public:
     }
 
 	// Include framing constant declarations
-	#include <qpid/framing/AMQP_Constants.h>
+	#include <AMQP_Constants.h>
 	
     // Inner classes
 
diff --git a/gentools/templ.cpp/AMQP_ClientProxy.cpp.tmpl b/gentools/templ.cpp/AMQP_ClientProxy.cpp.tmpl
index fe9e3b0ff1..b9d8263cea 100644
--- a/gentools/templ.cpp/AMQP_ClientProxy.cpp.tmpl
+++ b/gentools/templ.cpp/AMQP_ClientProxy.cpp.tmpl
@@ -28,8 +28,8 @@
 
 #include <sstream>
 
-#include <qpid/framing/AMQP_ClientProxy.h>
-#include <qpid/framing/AMQFrame.h>
+#include <AMQP_ClientProxy.h>
+#include <AMQFrame.h>
 %{MLIST} ${cpc_method_body_include}
 
 namespace qpid {
diff --git a/gentools/templ.cpp/AMQP_ClientProxy.h.tmpl b/gentools/templ.cpp/AMQP_ClientProxy.h.tmpl
index 48e2468674..62df7baf18 100644
--- a/gentools/templ.cpp/AMQP_ClientProxy.h.tmpl
+++ b/gentools/templ.cpp/AMQP_ClientProxy.h.tmpl
@@ -29,9 +29,9 @@
 #ifndef _AMQP_ClientProxy_
 #define _AMQP_ClientProxy_
 
-#include <qpid/framing/AMQP_ClientOperations.h>
-#include <qpid/framing/FieldTable.h>
-#include <qpid/framing/OutputHandler.h>
+#include <AMQP_ClientOperations.h>
+#include <FieldTable.h>
+#include <OutputHandler.h>
 
 namespace qpid {
 namespace framing {
diff --git a/gentools/templ.cpp/AMQP_MethodVersionMap.cpp.tmpl b/gentools/templ.cpp/AMQP_MethodVersionMap.cpp.tmpl
index 4741fed638..6ab7812499 100644
--- a/gentools/templ.cpp/AMQP_MethodVersionMap.cpp.tmpl
+++ b/gentools/templ.cpp/AMQP_MethodVersionMap.cpp.tmpl
@@ -28,7 +28,7 @@
 
 #include <sstream>
 
-#include <qpid/framing/AMQP_MethodVersionMap.h>
+#include <AMQP_MethodVersionMap.h>
 
 namespace qpid
 {
diff --git a/gentools/templ.cpp/AMQP_MethodVersionMap.h.tmpl b/gentools/templ.cpp/AMQP_MethodVersionMap.h.tmpl
index 6b1418def5..d3ad37a8e0 100644
--- a/gentools/templ.cpp/AMQP_MethodVersionMap.h.tmpl
+++ b/gentools/templ.cpp/AMQP_MethodVersionMap.h.tmpl
@@ -30,7 +30,7 @@
 #define _METHOD_VERSION_MAP_H_
 
 #include <map>
-#include <qpid/framing/AMQMethodBody.h>
+#include <AMQMethodBody.h>
 
 %{MLIST} ${mc_method_body_include}
 
diff --git a/gentools/templ.cpp/AMQP_ServerOperations.h.tmpl b/gentools/templ.cpp/AMQP_ServerOperations.h.tmpl
index 7953e5be21..5728a4ce31 100644
--- a/gentools/templ.cpp/AMQP_ServerOperations.h.tmpl
+++ b/gentools/templ.cpp/AMQP_ServerOperations.h.tmpl
@@ -31,9 +31,9 @@
 
 #include <sstream>
 
-#include <qpid/framing/FieldTable.h>
-#include <qpid/framing/ProtocolVersion.h>
-#include <qpid/framing/ProtocolVersionException.h>
+#include <FieldTable.h>
+#include <ProtocolVersion.h>
+#include <ProtocolVersionException.h>
 
 namespace qpid {
 namespace framing {
@@ -62,7 +62,7 @@ public:
     }
     
 	// Include framing constant declarations
-	#include <qpid/framing/AMQP_Constants.h>
+	#include <AMQP_Constants.h>
 
     // Inner classes
 
diff --git a/gentools/templ.cpp/AMQP_ServerProxy.cpp.tmpl b/gentools/templ.cpp/AMQP_ServerProxy.cpp.tmpl
index 3bf043c51d..cce369f98b 100644
--- a/gentools/templ.cpp/AMQP_ServerProxy.cpp.tmpl
+++ b/gentools/templ.cpp/AMQP_ServerProxy.cpp.tmpl
@@ -28,8 +28,8 @@
 
 #include <sstream>
 
-#include <qpid/framing/AMQP_ServerProxy.h>
-#include <qpid/framing/AMQFrame.h>
+#include <AMQP_ServerProxy.h>
+#include <AMQFrame.h>
 %{MLIST} ${spc_method_body_include}
 
 namespace qpid {
diff --git a/gentools/templ.cpp/AMQP_ServerProxy.h.tmpl b/gentools/templ.cpp/AMQP_ServerProxy.h.tmpl
index 33773116e3..9275c64590 100644
--- a/gentools/templ.cpp/AMQP_ServerProxy.h.tmpl
+++ b/gentools/templ.cpp/AMQP_ServerProxy.h.tmpl
@@ -29,9 +29,9 @@
 #ifndef _AMQP_ServerProxy_
 #define _AMQP_ServerProxy_
 
-#include <qpid/framing/AMQP_ServerOperations.h>
-#include <qpid/framing/FieldTable.h>
-#include <qpid/framing/OutputHandler.h>
+#include <AMQP_ServerOperations.h>
+#include <FieldTable.h>
+#include <OutputHandler.h>
 
 namespace qpid {
 namespace framing {
diff --git a/gentools/templ.cpp/MethodBodyClass.h.tmpl b/gentools/templ.cpp/MethodBodyClass.h.tmpl
index 2a562cadcf..be9fb82e31 100644
--- a/gentools/templ.cpp/MethodBodyClass.h.tmpl
+++ b/gentools/templ.cpp/MethodBodyClass.h.tmpl
@@ -29,10 +29,10 @@
 #include <string>
 #include <sstream>
 
-#include <qpid/framing/amqp_types.h>
-#include <qpid/framing/AMQMethodBody.h>
-#include <qpid/framing/Buffer.h>
-#include <qpid/framing/FieldTable.h>
+#include <amqp_types.h>
+#include <AMQMethodBody.h>
+#include <Buffer.h>
+#include <FieldTable.h>
 
 #ifndef _${CLASS}${METHOD}Body_
 #define _${CLASS}${METHOD}Body_
diff --git a/java/broker/pom.xml b/java/broker/pom.xml
index f6dd171214..5a2c699cc1 100644
--- a/java/broker/pom.xml
+++ b/java/broker/pom.xml
@@ -53,10 +53,6 @@
             <groupId>commons-lang</groupId>
             <artifactId>commons-lang</artifactId>
         </dependency>
-          <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jms_1.1_spec</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.apache.mina</groupId>
             <artifactId>mina-filter-ssl</artifactId>
@@ -85,26 +81,6 @@
 
     <build>
         <plugins>
-
-            <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</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>
diff --git a/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java b/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java
index 4fe71c117c..a6cb4523cf 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java
@@ -26,7 +26,6 @@ import org.apache.qpid.framing.AMQDataBlock;
 import org.apache.qpid.framing.BasicPublishBody;
 import org.apache.qpid.framing.ContentBody;
 import org.apache.qpid.framing.ContentHeaderBody;
-import org.apache.qpid.framing.FieldTable;
 import org.apache.qpid.server.ack.TxAck;
 import org.apache.qpid.server.ack.UnacknowledgedMessage;
 import org.apache.qpid.server.ack.UnacknowledgedMessageMap;
@@ -291,7 +290,7 @@ public class AMQChannel
      * @throws ConsumerTagNotUniqueException if the tag is not unique
      * @throws AMQException                  if something goes wrong
      */
-    public String subscribeToQueue(String tag, AMQQueue queue, AMQProtocolSession session, boolean acks, FieldTable fitler) throws AMQException, ConsumerTagNotUniqueException
+    public String subscribeToQueue(String tag, AMQQueue queue, AMQProtocolSession session, boolean acks) throws AMQException, ConsumerTagNotUniqueException
     {
         if (tag == null)
         {
@@ -302,8 +301,7 @@ public class AMQChannel
             throw new ConsumerTagNotUniqueException();
         }
 
-
-        queue.registerProtocolSession(session, _channelId, tag, acks,fitler);
+        queue.registerProtocolSession(session, _channelId, tag, acks);
         _consumerTag2QueueMap.put(tag, queue);
         return tag;
     }
diff --git a/java/broker/src/main/java/org/apache/qpid/server/handler/BasicConsumeMethodHandler.java b/java/broker/src/main/java/org/apache/qpid/server/handler/BasicConsumeMethodHandler.java
index c4c995540d..d4c94061a0 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/handler/BasicConsumeMethodHandler.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/handler/BasicConsumeMethodHandler.java
@@ -74,7 +74,7 @@ public class BasicConsumeMethodHandler implements StateAwareMethodListener<Basic
             }
             try
             {
-                String consumerTag = channel.subscribeToQueue(body.consumerTag, queue,  session, !body.noAck, body.filter);
+                String consumerTag = channel.subscribeToQueue(body.consumerTag, queue,  session, !body.noAck);
                 if(!body.nowait)
                 {
                     session.writeFrame(BasicConsumeOkBody.createAMQFrame(channelId, consumerTag));
diff --git a/java/broker/src/main/java/org/apache/qpid/server/queue/AMQMessage.java b/java/broker/src/main/java/org/apache/qpid/server/queue/AMQMessage.java
index 69b03c9cd2..8b6db5b53f 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/queue/AMQMessage.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/queue/AMQMessage.java
@@ -25,8 +25,6 @@ import org.apache.qpid.framing.*;
 import org.apache.qpid.server.protocol.AMQProtocolSession;
 import org.apache.qpid.server.store.MessageStore;
 import org.apache.qpid.server.txn.TxnBuffer;
-import org.apache.qpid.server.message.MessageDecorator;
-import org.apache.qpid.server.message.jms.JMSMessage;
 import org.apache.qpid.AMQException;
 
 import java.util.ArrayList;
@@ -35,20 +33,17 @@ import java.util.LinkedList;
 import java.util.Set;
 import java.util.HashSet;
 import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.ConcurrentHashMap;
 
 /**
  * Combines the information that make up a deliverable message into a more manageable form.
  */
 public class AMQMessage
 {
-    public static final String JMS_MESSAGE = "jms.message";
-
     private final Set<Object> _tokens = new HashSet<Object>();
 
     private AMQProtocolSession _publisher;
 
-    private final BasicPublishBody _publishBody;
+    private final BasicPublishBody  _publishBody;
 
     private ContentHeaderBody _contentHeaderBody;
 
@@ -88,7 +83,6 @@ public class AMQMessage
      * messages published with the 'immediate' flag.
      */
     private boolean _deliveredToConsumer;
-    private ConcurrentHashMap<String, MessageDecorator> _decodedMessages;
 
 
     public AMQMessage(MessageStore messageStore, BasicPublishBody publishBody)
@@ -102,19 +96,17 @@ public class AMQMessage
         _publishBody = publishBody;
         _store = messageStore;
         _contentBodies = new LinkedList<ContentBody>();
-        _decodedMessages = new ConcurrentHashMap<String, MessageDecorator>();
         _storeWhenComplete = storeWhenComplete;
     }
 
     public AMQMessage(MessageStore store, long messageId, BasicPublishBody publishBody,
                       ContentHeaderBody contentHeaderBody, List<ContentBody> contentBodies)
             throws AMQException
-
+    
     {
         _publishBody = publishBody;
         _contentHeaderBody = contentHeaderBody;
         _contentBodies = contentBodies;
-        _decodedMessages = new ConcurrentHashMap<String, MessageDecorator>();
         _messageId = messageId;
         _store = store;
         storeMessage();
@@ -124,7 +116,7 @@ public class AMQMessage
                       ContentHeaderBody contentHeaderBody, List<ContentBody> contentBodies)
             throws AMQException
     {
-        this(store, store.getNewMessageId(), publishBody, contentHeaderBody, contentBodies);
+        this(store, store.getNewMessageId(), publishBody, contentHeaderBody, contentBodies);        
     }
 
     protected AMQMessage(AMQMessage msg) throws AMQException
@@ -278,7 +270,7 @@ public class AMQMessage
             {
                 _store.removeMessage(_messageId);
             }
-            catch (AMQException e)
+            catch(AMQException e)
             {
                 //to maintain consistency, we revert the count
                 incrementReference();
@@ -299,7 +291,7 @@ public class AMQMessage
 
     public boolean checkToken(Object token)
     {
-        if (_tokens.contains(token))
+        if(_tokens.contains(token))
         {
             return true;
         }
@@ -315,7 +307,7 @@ public class AMQMessage
         //if the message is not persistent or the queue is not durable
         //we will not need to recover the association and so do not
         //need to record it
-        if (isPersistent() && queue.isDurable())
+        if(isPersistent() && queue.isDurable())
         {
             _store.enqueueMessage(queue.getName(), _messageId);
         }
@@ -325,7 +317,7 @@ public class AMQMessage
     {
         //only record associations where both queue and message will survive
         //a restart, so only need to remove association if this is the case
-        if (isPersistent() && queue.isDurable())
+        if(isPersistent() && queue.isDurable())
         {
             _store.dequeueMessage(queue.getName(), _messageId);
         }
@@ -333,14 +325,14 @@ public class AMQMessage
 
     public boolean isPersistent() throws AMQException
     {
-        if (_contentHeaderBody == null)
+        if(_contentHeaderBody == null)
         {
             throw new AMQException("Cannot determine delivery mode of message. Content header not found.");
         }
 
         //todo remove literal values to a constant file such as AMQConstants in common
         return _contentHeaderBody.properties instanceof BasicContentHeaderProperties
-               && ((BasicContentHeaderProperties) _contentHeaderBody.properties).getDeliveryMode() == 2;
+                &&((BasicContentHeaderProperties) _contentHeaderBody.properties).getDeliveryMode() == 2;
     }
 
     public void setTxnBuffer(TxnBuffer buffer)
@@ -354,15 +346,13 @@ public class AMQMessage
     }
 
     /**
-     * Called to enforce the 'immediate' flag.
-     *
+     * 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
+     * immediate delivery but has not been marked as delivered to a
+     * consumer
      */
-    public void checkDeliveredToConsumer() throws NoConsumersException
-    {
-        if (isImmediate() && !_deliveredToConsumer)
+    public void checkDeliveredToConsumer() throws NoConsumersException{
+        if(isImmediate() && !_deliveredToConsumer)
         {
             throw new NoConsumersException(_publishBody, _contentHeaderBody, _contentBodies);
         }
@@ -372,43 +362,7 @@ public class AMQMessage
      * Called when this message is delivered to a consumer. (used to
      * implement the 'immediate' flag functionality).
      */
-    public void setDeliveredToConsumer()
-    {
+    public void setDeliveredToConsumer(){
         _deliveredToConsumer = true;
     }
-
-
-    public MessageDecorator getDecodedMessage(String type)
-    {
-        MessageDecorator msgtype = null;
-
-        if (_decodedMessages != null)
-        {
-            msgtype = _decodedMessages.get(type);
-
-            if (msgtype == null)
-            {
-                msgtype = decorateMessage(type);
-            }
-        }
-
-        return msgtype;
-    }
-
-    private MessageDecorator decorateMessage(String type)
-    {
-        MessageDecorator msgdec = null;
-
-        if (type.equals(JMS_MESSAGE))
-        {
-            msgdec = new JMSMessage(this);
-        }
-
-        if (msgdec != null)
-        {
-            _decodedMessages.put(type, msgdec);
-        }
-
-        return msgdec;
-    }
 }
diff --git a/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueue.java b/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueue.java
index f734edcc7b..353a2007c0 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueue.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueue.java
@@ -26,7 +26,6 @@ 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.FieldTable;
 import org.apache.qpid.server.exchange.Exchange;
 import org.apache.qpid.server.management.AMQManagedObject;
 import org.apache.qpid.server.management.MBeanConstructor;
@@ -142,8 +141,8 @@ public class AMQQueue implements Managable, Comparable
 
         // OpenMBean data types for viewMessageContent method
         private CompositeType _msgContentType = null;
-        private String[] _msgContentAttributes = {"Message Id", "MimeType", "Encoding", "Content"};
-        private OpenType[] _msgContentAttributeTypes = new OpenType[4];
+        private String[]      _msgContentAttributes = {"Message Id", "MimeType", "Encoding", "Content"};
+        private OpenType[]    _msgContentAttributeTypes = new OpenType[4];
 
         @MBeanConstructor("Creates an MBean exposing an AMQQueue")
         public AMQQueueMBean() throws JMException
@@ -163,14 +162,14 @@ public class AMQQueue implements Managable, Comparable
             _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);
+                                                 _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);
+            _messageDataType = new CompositeType("Message","AMQ Message", _msgAttributeNames, _msgAttributeNames, _msgAttributeTypes);
             _messagelistDataType = new TabularType("Messages", "List of messages", _messageDataType, _msgAttributeIndex);
         }
 
@@ -266,7 +265,7 @@ public class AMQQueue implements Managable, Comparable
             {
                 queueDepth = queueDepth + getMessageSize(message);
             }
-            return (long) Math.round(queueDepth / 1000);
+            return (long)Math.round(queueDepth / 1000);
         }
 
         /**
@@ -315,7 +314,7 @@ public class AMQQueue implements Managable, Comparable
         private void notifyClients(String notificationMsg)
         {
             Notification n = new Notification(MonitorNotification.THRESHOLD_VALUE_EXCEEDED, this,
-                                              ++_notificationSequenceNumber, System.currentTimeMillis(), notificationMsg);
+                                 ++_notificationSequenceNumber, System.currentTimeMillis(), notificationMsg);
 
             _broadcaster.sendNotification(n);
         }
@@ -362,7 +361,7 @@ public class AMQQueue implements Managable, Comparable
 
             if (msg == null)
             {
-                throw new JMException("AMQMessage with message id = " + msgId + " is not in the " + _queueName);
+                throw new JMException("AMQMessage with message id = " + msgId + " is not in the " + _queueName );
             }
             // get message content
             List<ContentBody> cBodies = msg.getContentBodies();
@@ -380,7 +379,7 @@ public class AMQQueue implements Managable, Comparable
             }
 
             // Create header attributes list
-            BasicContentHeaderProperties headerProperties = (BasicContentHeaderProperties) msg.getContentHeaderBody().properties;
+            BasicContentHeaderProperties headerProperties = (BasicContentHeaderProperties)msg.getContentHeaderBody().properties;
             String mimeType = headerProperties.getContentType();
             String encoding = headerProperties.getEncoding() == null ? "" : headerProperties.getEncoding();
             Object[] itemValues = {msgId, mimeType, encoding, msgContent.toArray(new Byte[0])};
@@ -403,12 +402,12 @@ public class AMQQueue implements Managable, Comparable
             TabularDataSupport _messageList = new TabularDataSupport(_messagelistDataType);
 
             // Create the tabular list of message header contents
-            for (int i = beginIndex; i <= endIndex && i <= list.size(); i++)
+            for (int i = beginIndex; i <= endIndex && i <=  list.size(); i++)
             {
                 AMQMessage msg = list.get(i - 1);
-                ContentHeaderBody headerBody = msg.getContentHeaderBody();
+                ContentHeaderBody headerBody =  msg.getContentHeaderBody();
                 // Create header attributes list
-                BasicContentHeaderProperties headerProperties = (BasicContentHeaderProperties) headerBody.properties;
+                BasicContentHeaderProperties headerProperties = (BasicContentHeaderProperties)headerBody.properties;
                 List<String> headerAttribsList = new ArrayList<String>();
                 headerAttribsList.add("App Id=" + headerProperties.getAppId());
                 headerAttribsList.add("MimeType=" + headerProperties.getContentType());
@@ -431,7 +430,7 @@ public class AMQQueue implements Managable, Comparable
         @Override
         public MBeanNotificationInfo[] getNotificationInfo()
         {
-            String[] notificationTypes = new String[]{MonitorNotification.THRESHOLD_VALUE_EXCEEDED};
+            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);
@@ -582,12 +581,12 @@ public class AMQQueue implements Managable, Comparable
         _bindings.addBinding(routingKey, exchange);
     }
 
-    public void registerProtocolSession(AMQProtocolSession ps, int channel, String consumerTag, boolean acks, FieldTable filters)
+    public void registerProtocolSession(AMQProtocolSession ps, int channel, String consumerTag, boolean acks)
             throws AMQException
     {
         debug("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);
+        Subscription subscription = _subscriptionFactory.createSubscription(channel, ps, consumerTag, acks);
         _subscribers.addSubscriber(subscription);
     }
 
diff --git a/java/broker/src/main/java/org/apache/qpid/server/queue/Subscription.java b/java/broker/src/main/java/org/apache/qpid/server/queue/Subscription.java
index 35ac9a13ac..dfc16a7c71 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/queue/Subscription.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/queue/Subscription.java
@@ -21,7 +21,6 @@
 package org.apache.qpid.server.queue;
 
 import org.apache.qpid.AMQException;
-import org.apache.qpid.server.filter.MessageFilter;
 
 public interface Subscription
 {
@@ -30,8 +29,4 @@ public interface Subscription
     boolean isSuspended();
 
     void queueDeleted(AMQQueue queue);
-
-    boolean hasFilters();
-
-    boolean hasInterest(AMQMessage msg);
 }
diff --git a/java/broker/src/main/java/org/apache/qpid/server/queue/SubscriptionFactory.java b/java/broker/src/main/java/org/apache/qpid/server/queue/SubscriptionFactory.java
index f464384562..0fd44e4fbc 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/queue/SubscriptionFactory.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/queue/SubscriptionFactory.java
@@ -22,7 +22,6 @@ package org.apache.qpid.server.queue;
 
 import org.apache.qpid.server.protocol.AMQProtocolSession;
 import org.apache.qpid.AMQException;
-import org.apache.qpid.framing.FieldTable;
 
 /**
  * Allows the customisation of the creation of a subscription. This is typically done within an AMQQueue. This
@@ -33,9 +32,6 @@ import org.apache.qpid.framing.FieldTable;
  */
 public interface SubscriptionFactory
 {
-    Subscription createSubscription(int channel, AMQProtocolSession protocolSession, String consumerTag, boolean acks, FieldTable filters)
-        throws AMQException;
-
     Subscription createSubscription(int channel, AMQProtocolSession protocolSession, String consumerTag, boolean acks)
         throws AMQException;
 
diff --git a/java/broker/src/main/java/org/apache/qpid/server/queue/SubscriptionImpl.java b/java/broker/src/main/java/org/apache/qpid/server/queue/SubscriptionImpl.java
index a0d86deb19..5cad28b80d 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/queue/SubscriptionImpl.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/queue/SubscriptionImpl.java
@@ -26,10 +26,7 @@ import org.apache.qpid.AMQException;
 import org.apache.qpid.framing.AMQDataBlock;
 import org.apache.qpid.framing.AMQFrame;
 import org.apache.qpid.framing.BasicDeliverBody;
-import org.apache.qpid.framing.FieldTable;
 import org.apache.qpid.server.AMQChannel;
-import org.apache.qpid.server.filter.FilterManager;
-import org.apache.qpid.server.filter.FilterManagerFactory;
 import org.apache.qpid.server.protocol.AMQProtocolSession;
 
 /**
@@ -55,25 +52,19 @@ public class SubscriptionImpl implements Subscription
      * True if messages need to be acknowledged
      */
     private final boolean _acks;
-    private FilterManager _filters;
 
     public static class Factory implements SubscriptionFactory
     {
-        public Subscription createSubscription(int channel, AMQProtocolSession protocolSession, String consumerTag, boolean acks, FieldTable filters) throws AMQException
-        {
-            return new SubscriptionImpl(channel, protocolSession, consumerTag, acks, filters);
-        }
-
         public SubscriptionImpl createSubscription(int channel, AMQProtocolSession protocolSession, String consumerTag, boolean acks)
                 throws AMQException
         {
-            return new SubscriptionImpl(channel, protocolSession, consumerTag, acks, null);
+            return new SubscriptionImpl(channel, protocolSession, consumerTag, acks);
         }
 
         public SubscriptionImpl createSubscription(int channel, AMQProtocolSession protocolSession, String consumerTag)
                 throws AMQException
         {
-            return new SubscriptionImpl(channel, protocolSession, consumerTag, false, null);
+            return new SubscriptionImpl(channel, protocolSession, consumerTag);
         }
     }
 
@@ -81,13 +72,6 @@ public class SubscriptionImpl implements Subscription
                             String consumerTag, boolean acks)
             throws AMQException
     {
-        this(channelId, protocolSession, consumerTag, acks, null);
-    }
-
-    public SubscriptionImpl(int channelId, AMQProtocolSession protocolSession,
-                            String consumerTag, boolean acks, FieldTable filters)
-            throws AMQException
-    {
         AMQChannel channel = protocolSession.getChannel(channelId);
         if (channel == null)
         {
@@ -99,9 +83,14 @@ public class SubscriptionImpl implements Subscription
         this.consumerTag = consumerTag;
         sessionKey = protocolSession.getKey();
         _acks = acks;
-        _filters = FilterManagerFactory.createManager(filters);
     }
 
+    public SubscriptionImpl(int channel, AMQProtocolSession protocolSession,
+                            String consumerTag)
+            throws AMQException
+    {
+        this(channel, protocolSession, consumerTag, false);
+    }
 
     public boolean equals(Object o)
     {
@@ -142,7 +131,7 @@ public class SubscriptionImpl implements Subscription
         {
             // 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.
@@ -189,16 +178,6 @@ public class SubscriptionImpl implements Subscription
         channel.queueDeleted(queue);
     }
 
-    public boolean hasFilters()
-    {
-        return _filters != null;
-    }
-
-    public boolean hasInterest(AMQMessage msg)
-    {
-        return _filters.allAllow(msg);
-    }
-
     private ByteBuffer createEncodedDeliverFrame(long deliveryTag, String routingKey, String exchange)
     {
         AMQFrame deliverFrame = BasicDeliverBody.createAMQFrame(channel.getChannelId(), consumerTag,
diff --git a/java/broker/src/main/java/org/apache/qpid/server/queue/SubscriptionSet.java b/java/broker/src/main/java/org/apache/qpid/server/queue/SubscriptionSet.java
index a8f778244e..7cc3f5f719 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/queue/SubscriptionSet.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/queue/SubscriptionSet.java
@@ -7,9 +7,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- *
+ * 
  *   http://www.apache.org/licenses/LICENSE-2.0
- *
+ * 
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -21,8 +21,6 @@
 package org.apache.qpid.server.queue;
 
 import org.apache.log4j.Logger;
-import org.apache.qpid.AMQException;
-
 import java.util.List;
 import java.util.ListIterator;
 import java.util.concurrent.CopyOnWriteArrayList;
@@ -60,7 +58,6 @@ class SubscriptionSet implements WeightedSubscriptionManager
 
     /**
      * Remove the subscription, returning it if it was found
-     *
      * @param subscription
      * @return null if no match was found
      */
@@ -93,7 +90,7 @@ class SubscriptionSet implements WeightedSubscriptionManager
 
     /**
      * 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
@@ -108,59 +105,29 @@ class SubscriptionSet implements WeightedSubscriptionManager
             return null;
         }
 
-        try
-        {
-            final Subscription result = nextSubscriberImpl(msg);
-            if (result == null)
-            {
+        try {
+            final Subscription result = nextSubscriber();
+            if (result == null) {
                 _currentSubscriber = 0;
-                return nextSubscriberImpl(msg);
-            }
-            else
-            {
+                return nextSubscriber();
+            } else {
                 return result;
             }
-        }
-        catch (IndexOutOfBoundsException e)
-        {
+        } catch (IndexOutOfBoundsException e) {
             _currentSubscriber = 0;
-            return nextSubscriber(msg);
+            return nextSubscriber();
         }
     }
 
-    private Subscription nextSubscriberImpl(AMQMessage msg)
+    private Subscription nextSubscriber()
     {
         final ListIterator<Subscription> iterator = _subscriptions.listIterator(_currentSubscriber);
-        while (iterator.hasNext())
-        {
+        while (iterator.hasNext()) {
             Subscription subscription = iterator.next();
             ++_currentSubscriber;
             subscriberScanned();
-
-            if (!subscription.isSuspended())
-            {
-
-                if ((!subscription.hasFilters()) || (subscription.hasFilters() && subscription.hasInterest(msg)))
-                {
-                    return subscription;
-                }
-                // 2006-12-04 : It is fairer to simply skip the person who isn't interested.
-                // Although it does need to be looked at again.
-
-//                else
-//                {
-//                    //Don't take penalise a subscriber for not wanting this message.
-//                    // This would introduce unfairness sticking with the current subscriber
-//                    // will allow the next message to match.. although could lead to unfairness if:
-//                    // subscribers: a(bin) b(text) c(text)
-//                    // msgs : 1(text) 2(text) 3(bin)
-//                    // subscriber c won't get any messages. as the first two text msgs will go to b and then a will get
-//                    // the bin msg.
-//                    // Never said this was fair round-robin-ing.
-//                    //FIXME - Make a fair round robin.
-//
-//                    --_currentSubscriber;
-//                }
+            if (!subscription.isSuspended()) {
+                return subscription;
             }
         }
         return null;
@@ -182,10 +149,7 @@ class SubscriptionSet implements WeightedSubscriptionManager
     {
         for (Subscription s : _subscriptions)
         {
-            if (!s.isSuspended())
-            {
-                return true;
-            }
+            if (!s.isSuspended()) return true;
         }
         return false;
     }
@@ -195,10 +159,7 @@ class SubscriptionSet implements WeightedSubscriptionManager
         int count = 0;
         for (Subscription s : _subscriptions)
         {
-            if (!s.isSuspended())
-            {
-                count++;
-            }
+            if (!s.isSuspended()) count++;
         }
         return count;
     }
@@ -206,10 +167,9 @@ class SubscriptionSet implements WeightedSubscriptionManager
     /**
      * 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
+    public void queueDeleted(AMQQueue queue)
     {
         for (Subscription s : _subscriptions)
         {
@@ -217,8 +177,7 @@ class SubscriptionSet implements WeightedSubscriptionManager
         }
     }
 
-    int size()
-    {
+    int size() {
         return _subscriptions.size();
     }
 }
diff --git a/java/client/pom.xml b/java/client/pom.xml
index 6beb5146d4..25372772af 100644
--- a/java/client/pom.xml
+++ b/java/client/pom.xml
@@ -122,9 +122,7 @@
                     </includes>
                     <excludes>
                         <exclude>**/JNDIReferenceableTest.java</exclude>
-			<exclude>**/DurableSubscriptionTest.java</exclude>
                     </excludes>
-	
                 </configuration>
             </plugin>
         </plugins>
diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQSession.java b/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
index 885f7647bc..bfd294f09e 100644
--- a/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
+++ b/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
@@ -829,16 +829,14 @@ public class AMQSession extends Closeable implements Session, QueueSession, Topi
                 AMQDestination amqd = (AMQDestination) destination;
 
                 final AMQProtocolHandler protocolHandler = _connection.getProtocolHandler();
-
+                // TODO: construct the rawSelector from the selector string if rawSelector == null
                 final FieldTable ft = FieldTableFactory.newFieldTable();
-
-                // Add headers for headers exchange
+                //if (rawSelector != null)
+                //    ft.put("headers", rawSelector.getDataAsBytes());
                 if (rawSelector != null)
                 {
                     ft.putAll(rawSelector);
                 }
-
-
                 BasicMessageConsumer consumer = new BasicMessageConsumer(_channelId, _connection, amqd, selector, noLocal,
                                                                          _messageFactoryRegistry, AMQSession.this,
                                                                          protocolHandler, ft, prefetchHigh, prefetchLow, exclusive,
@@ -917,18 +915,6 @@ public class AMQSession extends Closeable implements Session, QueueSession, Topi
         protocolHandler.writeFrame(queueBind);
     }
 
-//    /**
-//     * Register to consume from the queue.
-//     *
-//     * @param queueName
-//     * @return the consumer tag generated by the broker
-//     */
-//    private String consumeFromQueue(String queueName, AMQProtocolHandler protocolHandler, int prefetchHigh, int prefetchLow,
-//                                    boolean noLocal, boolean exclusive, int acknowledgeMode) throws AMQException
-//    {
-//        return consumeFromQueue(queueName, protocolHandler, prefetchHigh, prefetchLow, noLocal, exclusive, acknowledgeMode, null);
-//    }
-
     /**
      * Register to consume from the queue.
      *
@@ -936,25 +922,16 @@ public class AMQSession extends Closeable implements Session, QueueSession, Topi
      * @return the consumer tag generated by the broker
      */
     private String consumeFromQueue(String queueName, AMQProtocolHandler protocolHandler, int prefetchHigh, int prefetchLow,
-                                    boolean noLocal, boolean exclusive, int acknowledgeMode, String messageSelector) throws AMQException
+                                    boolean noLocal, boolean exclusive, int acknowledgeMode) throws AMQException
     {
         //fixme prefetch values are not used here. Do we need to have them as parametsrs?
         //need to generate a consumer tag on the client so we can exploit the nowait flag
         String tag = Integer.toString(_nextTag++);
 
-        FieldTable ft = new FieldTable();
-
-        if (messageSelector != null)
-        {
-            //fixme move literal value to a common class.
-            ft.put("x-filter-jms-selector", messageSelector);
-        }
-
         AMQFrame jmsConsume = BasicConsumeBody.createAMQFrame(_channelId, 0,
                                                               queueName, tag, noLocal,
                                                               acknowledgeMode == Session.NO_ACKNOWLEDGE,
-                                                              exclusive, true, ft);
-
+                                                              exclusive, true);
 
         protocolHandler.writeFrame(jmsConsume);
         return tag;
@@ -1241,22 +1218,11 @@ public class AMQSession extends Closeable implements Session, QueueSession, Topi
 
         bindQueue(amqd, queueName, protocolHandler, consumer.getRawSelectorFieldTable());
 
-        String consumerTag = null;
-        try
-        {
-            consumerTag = consumeFromQueue(queueName, protocolHandler, consumer.getPrefetchHigh(), consumer.getPrefetchLow(),
-                                           consumer.isNoLocal(), consumer.isExclusive(), consumer.getAcknowledgeMode(),
-                                           consumer.getMessageSelector());
-
-            consumer.setConsumerTag(consumerTag);
-            _consumers.put(consumerTag, consumer);
-        }
-        catch (JMSException e)
-        {
-            // getMessageSelector throws JMSEx but it is simply a string return so won't happen.
-        }
-
+        String consumerTag = consumeFromQueue(queueName, protocolHandler, consumer.getPrefetchHigh(), consumer.getPrefetchLow(),
+                                              consumer.isNoLocal(), consumer.isExclusive(), consumer.getAcknowledgeMode());
 
+        consumer.setConsumerTag(consumerTag);
+        _consumers.put(consumerTag, consumer);
     }
 
     /**
diff --git a/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessage.java b/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessage.java
index aaf0320afb..fbb55ae289 100644
--- a/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessage.java
+++ b/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessage.java
@@ -58,8 +58,7 @@ public abstract class AbstractJMSMessage extends AMQMessage implements javax.jms
         {
             _data.acquire();
         }
-        // ContentHeaderProperties are just created and so are empty
-        //_readableProperties = (_contentHeaderProperties != null);
+        _readableProperties = false;
         _readableMessage = (data != null);
     }
 
@@ -425,15 +424,7 @@ public abstract class AbstractJMSMessage extends AMQMessage implements javax.jms
             buf.append("\nJMS priority: ").append(getJMSPriority());
             buf.append("\nJMS delivery mode: ").append(getJMSDeliveryMode());
             buf.append("\nJMS reply to: ").append(String.valueOf(getJMSReplyTo()));
-            buf.append("\nJMS Type: ").append(String.valueOf(getJMSType()));
-            buf.append("\nJMS CorrelationID: ").append(String.valueOf(getJMSCorrelationID()));
-            buf.append("\nJMS Destination: NOT IMPLEMENTED");//.append(String.valueOf(getJMSDestination()));
-            buf.append("\nJMS MessageID: ").append(String.valueOf(getJMSMessageID()));
-            buf.append("\nJMS Redelivered: ").append(String.valueOf(getJMSRedelivered()));
-            buf.append("\nProperty Names: ").append(String.valueOf(getPropertyNames()));
-
             buf.append("\nAMQ message number: ").append(_deliveryTag);
-
             buf.append("\nProperties:");
             if (getJmsContentHeaderProperties().getHeaders().isEmpty())
             {
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/basic/SessionStartTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/basic/SessionStartTest.java
index 387238cbf1..6fa8ab95bf 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/basic/SessionStartTest.java
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/basic/SessionStartTest.java
@@ -24,6 +24,8 @@ import org.apache.qpid.client.AMQConnection;
 import org.apache.qpid.client.AMQDestination;
 import org.apache.qpid.client.AMQQueue;
 import org.apache.qpid.client.AMQSession;
+import org.apache.qpid.client.transport.TransportConnection;
+import org.apache.qpid.client.vmbroker.AMQVMBrokerCreationException;
 import org.apache.qpid.test.VMBrokerSetup;
 
 import javax.jms.JMSException;
@@ -102,7 +104,7 @@ public class SessionStartTest extends TestCase implements MessageListener
 
     public static void main(String[] argv) throws Exception
     {
-        SelectorTest test = new SelectorTest();
+        SessionStartTest test = new SessionStartTest();
         test._connectionString = argv.length == 0 ? "localhost:5672" : argv[0];
         test.setUp();
         test.test();
@@ -110,6 +112,6 @@ public class SessionStartTest extends TestCase implements MessageListener
 
     public static junit.framework.Test suite()
     {
-        return new VMBrokerSetup(new junit.framework.TestSuite(SelectorTest.class));
+        return new VMBrokerSetup(new junit.framework.TestSuite(SessionStartTest.class));
     }
 }
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/basic/TextMessageTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/basic/TextMessageTest.java
index d46463dbb2..cd3954fbcb 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/basic/TextMessageTest.java
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/basic/TextMessageTest.java
@@ -21,8 +21,11 @@
 package org.apache.qpid.test.unit.basic;
 
 import org.apache.qpid.client.AMQConnection;
+import org.apache.qpid.client.AMQDestination;
 import org.apache.qpid.client.AMQQueue;
 import org.apache.qpid.client.AMQSession;
+import org.apache.qpid.client.vmbroker.AMQVMBrokerCreationException;
+import org.apache.qpid.client.transport.TransportConnection;
 import org.apache.qpid.client.message.JMSTextMessage;
 import org.apache.qpid.test.VMBrokerSetup;
 import org.apache.log4j.Logger;
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/client/AMQSessionTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/client/AMQSessionTest.java
index bdfe7d4df0..af4673856e 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/client/AMQSessionTest.java
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/client/AMQSessionTest.java
@@ -50,7 +50,6 @@ public class AMQSessionTest extends TestCase
     protected void setUp() throws Exception
     {
         super.setUp();
-        TransportConnection.createVMBroker(1);
         _connection = new AMQConnection("vm://:1", "guest", "guest", "fred", "/test");
         _topic = new AMQTopic("mytopic");
         _queue = new AMQQueue("myqueue");
diff --git a/java/client/src/test/java/org/apache/qpid/topic/Listener.java b/java/client/src/test/java/org/apache/qpid/topic/Listener.java
index d6d2be7298..47c608cfe4 100644
--- a/java/client/src/test/java/org/apache/qpid/topic/Listener.java
+++ b/java/client/src/test/java/org/apache/qpid/topic/Listener.java
@@ -45,10 +45,10 @@ public class Listener implements MessageListener
     {
         _connection = connection;
         _session = connection.createSession(false, ackMode);
-        _factory = new MessageFactory(_session, "topictest.messages.#", 256);
+        _factory = new MessageFactory(_session);
 
         //register for events
-        if (name == null)
+        if(name == null)
         {
             _factory.createTopicConsumer().setMessageListener(this);
         }
@@ -61,10 +61,9 @@ public class Listener implements MessageListener
 
         _controller = _factory.createControlPublisher();
         System.out.println("Waiting for messages " +
-                           Config.getAckModeDescription(ackMode)
-                           + (name == null ? "" : " (subscribed with name " + name + " and client id " + connection.getClientID() + ")")
-                           + " with Messages on Topic: " + _factory.getTopic()                           
-                           + "...");
+                Config.getAckModeDescription(ackMode)
+                + (name == null ? "" : " (subscribed with name " + name + " and client id " + connection.getClientID() + ")")
+                + "...");
 
     }
 
@@ -76,7 +75,7 @@ public class Listener implements MessageListener
             _connection.stop();
             _connection.close();
         }
-        catch (Exception e)
+        catch(Exception e)
         {
             e.printStackTrace(System.out);
         }
@@ -90,7 +89,7 @@ public class Listener implements MessageListener
             _controller.send(_factory.createReportResponseMessage(msg));
             System.out.println("Sent report: " + msg);
         }
-        catch (Exception e)
+        catch(Exception e)
         {
             e.printStackTrace(System.out);
         }
@@ -104,18 +103,18 @@ public class Listener implements MessageListener
 
     public void onMessage(Message message)
     {
-        if (!init)
+        if(!init)
         {
             start = System.currentTimeMillis();
             count = 0;
             init = true;
         }
 
-        if (_factory.isShutdown(message))
+        if(_factory.isShutdown(message))
         {
             shutdown();
         }
-        else if (_factory.isReport(message))
+        else if(_factory.isReport(message))
         {
             //send a report:
             report();
@@ -133,7 +132,7 @@ public class Listener implements MessageListener
         config.setOptions(argv);
 
         Connection con = config.createConnection();
-        if (config.getClientId() != null)
+        if(config.getClientId() != null)
         {
             con.setClientID(config.getClientId());
         }
diff --git a/java/client/src/test/java/org/apache/qpid/topic/MessageFactory.java b/java/client/src/test/java/org/apache/qpid/topic/MessageFactory.java
index 7b5b451424..1520f18408 100644
--- a/java/client/src/test/java/org/apache/qpid/topic/MessageFactory.java
+++ b/java/client/src/test/java/org/apache/qpid/topic/MessageFactory.java
@@ -23,7 +23,6 @@ package org.apache.qpid.topic;
 import org.apache.qpid.client.AMQSession;
 import org.apache.qpid.client.AMQTopic;
 
-
 import javax.jms.*;
 
 /**
@@ -43,28 +42,22 @@ class MessageFactory
         this(session, 256);
     }
 
-    public MessageFactory(Session session, int size) throws JMSException
-    {
-        this(session, "topictest.messages", size);
-    }
-
-
-    MessageFactory(Session session, String topicMessages, int size) throws JMSException
+    MessageFactory(Session session, int size) throws JMSException
     {
         _session = session;
-        if (session instanceof AMQSession)
+        if(session instanceof AMQSession)
         {
-            _topic = new AMQTopic(topicMessages);
+            _topic = new AMQTopic("topictest.messages");
             _control = new AMQTopic("topictest.control");
         }
         else
         {
-            _topic = session.createTopic(topicMessages);
+            _topic = session.createTopic("topictest.messages");
             _control = session.createTopic("topictest.control");
         }
         _payload = new byte[size];
 
-        for (int i = 0; i < size; i++)
+        for(int i = 0; i < size; i++)
         {
             _payload[i] = (byte) DATA[i % DATA.length];
         }
diff --git a/java/client/src/test/java/org/apache/qpid/topic/Publisher.java b/java/client/src/test/java/org/apache/qpid/topic/Publisher.java
index 6899215a09..d788029ee9 100644
--- a/java/client/src/test/java/org/apache/qpid/topic/Publisher.java
+++ b/java/client/src/test/java/org/apache/qpid/topic/Publisher.java
@@ -51,7 +51,7 @@ public class Publisher implements MessageListener
         _factory.createControlConsumer().setMessageListener(this);
         _connection.start();
 
-        if (warmup > 0)
+        if(warmup > 0)
         {
             System.out.println("Runing warmup (" + warmup + " msgs)");
             long time = batch(warmup, consumerCount);
@@ -59,14 +59,11 @@ public class Publisher implements MessageListener
         }
 
         long[] times = new long[batches];
-        for (int i = 0; i < batches; i++)
+        for(int i = 0; i < batches; i++)
         {
-            if (i > 0)
-            {
-                Thread.sleep(delay * 1000);
-            }
+            if(i > 0) Thread.sleep(delay*1000);
             times[i] = batch(msgCount, consumerCount);
-            System.out.println("Batch " + (i + 1) + " of " + batches + " completed in " + times[i] + " ms.");
+            System.out.println("Batch " + (i+1) + " of " + batches + " completed in " + times[i] + " ms.");
         }
 
         long min = min(times);
@@ -109,7 +106,7 @@ public class Publisher implements MessageListener
     private void waitForCompletion(int consumers) throws Exception
     {
         System.out.println("Waiting for completion...");
-        synchronized(_lock)
+        synchronized (_lock)
         {
             while (_count > 0)
             {
@@ -124,7 +121,7 @@ public class Publisher implements MessageListener
         System.out.println("Received report " + _factory.getReport(message) + " " + --_count + " remaining");
         if (_count == 0)
         {
-            synchronized(_lock)
+            synchronized (_lock)
             {
                 _lock.notify();
             }
@@ -134,7 +131,7 @@ public class Publisher implements MessageListener
     static long min(long[] times)
     {
         long min = times.length > 0 ? times[0] : 0;
-        for (int i = 0; i < times.length; i++)
+        for(int i = 0; i < times.length; i++)
         {
             min = Math.min(min, times[i]);
         }
@@ -144,7 +141,7 @@ public class Publisher implements MessageListener
     static long max(long[] times)
     {
         long max = times.length > 0 ? times[0] : 0;
-        for (int i = 0; i < times.length; i++)
+        for(int i = 0; i < times.length; i++)
         {
             max = Math.max(max, times[i]);
         }
@@ -154,25 +151,14 @@ public class Publisher implements MessageListener
     static long avg(long[] times, long min, long max)
     {
         long sum = 0;
-        for (int i = 0; i < times.length; i++)
+        for(int i = 0; i < times.length; i++)
         {
             sum += times[i];
         }
+        sum -= min;
+        sum -= max;
 
-        int divisor = times.length;
-        //remove max and min from averages
-        if (times.length > 2)
-        {
-            sum -= min;
-            sum -= max;
-            divisor -= 2;
-        }
-        else
-        {
-            System.out.println("More batches are required to generate a meaninful average.");
-        }
-
-        return (sum / divisor);
+        return (sum / (times.length - 2));
     }
 
     public static void main(String[] argv) throws Exception
diff --git a/java/cluster/src/main/java/org/apache/qpid/server/queue/RemoteSubscriptionImpl.java b/java/cluster/src/main/java/org/apache/qpid/server/queue/RemoteSubscriptionImpl.java
index 1394e7e20b..0268ff2171 100644
--- a/java/cluster/src/main/java/org/apache/qpid/server/queue/RemoteSubscriptionImpl.java
+++ b/java/cluster/src/main/java/org/apache/qpid/server/queue/RemoteSubscriptionImpl.java
@@ -88,19 +88,9 @@ class RemoteSubscriptionImpl implements Subscription, WeightedSubscriptionManage
 
     public void queueDeleted(AMQQueue queue)
     {
-        if (queue instanceof ClusteredQueue)
+        if(queue instanceof ClusteredQueue)
         {
             ((ClusteredQueue) queue).removeAllRemoteSubscriber(_peer);
         }
     }
-
-    public boolean hasFilters()
-    {
-        return false;
-    }
-
-    public boolean hasInterest(AMQMessage msg)
-    {
-        return true;
-    }
 }
diff --git a/java/common/pom.xml b/java/common/pom.xml
index 0d48a24646..e655054453 100644
--- a/java/common/pom.xml
+++ b/java/common/pom.xml
@@ -46,7 +46,7 @@
     </properties>
 
     <build>
-        <plugins>
+        <plugins>          
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-antrun-plugin</artifactId>
@@ -77,19 +77,6 @@
         </plugins>
     </build>
 
-    <repositories>
-     <repository>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-            <id>java.net repository</id>
-            <name>Maven 1.x Repository</name>
-            <url>httsp://maven-repository.dev.java.net/nonav/repository/</url>
-            <layout>legacy</layout>
-        </repository>
-
-
-    </repositories>
     <dependencies>
         <dependency>
             <groupId>log4j</groupId>
@@ -99,16 +86,7 @@
             <groupId>org.apache.mina</groupId>
             <artifactId>mina-core</artifactId>
         </dependency>
-        <!-- dependency>
-            <groupId>grizzly</groupId>
-            <artifactId>grizzly</artifactId>
-            <version>1.0.4</version>
-        </dependency -->
          <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jms_1.1_spec</artifactId>
-        </dependency>
-        <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
         </dependency>
diff --git a/java/common/src/main/java/org/apache/qpid/url/URLHelper.java b/java/common/src/main/java/org/apache/qpid/url/URLHelper.java
index f8c621e413..2121346c02 100644
--- a/java/common/src/main/java/org/apache/qpid/url/URLHelper.java
+++ b/java/common/src/main/java/org/apache/qpid/url/URLHelper.java
@@ -64,9 +64,9 @@ public class URLHelper
                 if (valueIndex + 1 < options.length())
                 {
                     if (options.charAt(valueIndex + 1) == DEFAULT_OPTION_SEPERATOR ||
-                        options.charAt(valueIndex + 1) == ALTERNATIVE_OPTION_SEPARATOR ||
-                        options.charAt(valueIndex + 1) == BROKER_SEPARATOR ||
-                        options.charAt(valueIndex + 1) == '\'')
+                            options.charAt(valueIndex + 1) == ALTERNATIVE_OPTION_SEPARATOR ||
+                            options.charAt(valueIndex + 1) == BROKER_SEPARATOR ||
+                            options.charAt(valueIndex + 1) == '\'')
                     {
                         nestedQuotes--;
 //                        System.out.println(
@@ -119,7 +119,7 @@ public class URLHelper
             else
             {
                 parseError(sepIndex, "Unterminated option. Possible illegal option separator:'" +
-                                     options.charAt(sepIndex) + "'", options);
+                        options.charAt(sepIndex) + "'", options);
             }
         }
 
diff --git a/java/common/src/main/java/org/apache/qpid/url/URLSyntaxException.java b/java/common/src/main/java/org/apache/qpid/url/URLSyntaxException.java
index 5cac2505a8..3ff7195794 100644
--- a/java/common/src/main/java/org/apache/qpid/url/URLSyntaxException.java
+++ b/java/common/src/main/java/org/apache/qpid/url/URLSyntaxException.java
@@ -62,12 +62,12 @@ public class URLSyntaxException extends URISyntaxException
 
         if (getIndex() > -1)
         {
-            if (_length > 1)
+            if (_length != -1)
             {
                 sb.append(" between indicies ");
                 sb.append(getIndex());
                 sb.append(" and ");
-                sb.append(getIndex() + _length);
+                sb.append(_length);
             }
             else
             {
diff --git a/java/common/src/main/xsl/java.xsl b/java/common/src/main/xsl/java.xsl
index e98370fd7b..685a9a27ed 100644
--- a/java/common/src/main/xsl/java.xsl
+++ b/java/common/src/main/xsl/java.xsl
@@ -69,7 +69,7 @@ import org.apache.qpid.framing.EncodableAMQDataBlock;
 import org.apache.qpid.framing.EncodingUtils;
 import org.apache.qpid.framing.FieldTable;
 
-    /**
+/**
  * 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
diff --git a/java/pom.xml b/java/pom.xml
index e2158ef118..5703ded592 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -433,8 +433,6 @@
           </snapshots>
         </repository>
         -->
-
-
     </repositories>
 
     <pluginRepositories>
diff --git a/java/systests/src/test/java/org/apache/qpid/server/queue/SendPerfTest.java b/java/systests/src/test/java/org/apache/qpid/server/queue/SendPerfTest.java
index 44cedf5d7d..6490b9f270 100644
--- a/java/systests/src/test/java/org/apache/qpid/server/queue/SendPerfTest.java
+++ b/java/systests/src/test/java/org/apache/qpid/server/queue/SendPerfTest.java
@@ -90,8 +90,7 @@ public class SendPerfTest extends TimedRun
 
     /**
      * Delivers messages to a number of queues.
-     *
-     * @param count  the number of messages to deliver
+     * @param count the number of messages to deliver
      * @param queues the list of queues
      * @throws NoConsumersException
      */
@@ -122,7 +121,7 @@ public class SendPerfTest extends TimedRun
             q.bind("routingKey", exchange);
             try
             {
-                q.registerProtocolSession(createSession(), 1, "1", false, null);
+                q.registerProtocolSession(createSession(), 1, "1", false);
             }
             catch (Exception e)
             {
@@ -136,7 +135,7 @@ public class SendPerfTest extends TimedRun
     static AMQQueue createQueue(String name) throws AMQException
     {
         return new AMQQueue(name, false, null, false, ApplicationRegistry.getInstance().getQueueRegistry(),
-                            new OnCurrentThreadExecutor());
+                new OnCurrentThreadExecutor());
     }
 
     static AMQProtocolSession createSession() throws Exception
diff --git a/java/systests/src/test/java/org/apache/qpid/server/queue/TestSubscription.java b/java/systests/src/test/java/org/apache/qpid/server/queue/TestSubscription.java
index 2de1a0fe69..de6df4bc03 100644
--- a/java/systests/src/test/java/org/apache/qpid/server/queue/TestSubscription.java
+++ b/java/systests/src/test/java/org/apache/qpid/server/queue/TestSubscription.java
@@ -70,16 +70,6 @@ public class TestSubscription implements Subscription
     {
     }
 
-    public boolean hasFilters()
-    {
-        return false;
-    }
-
-    public boolean hasInterest(AMQMessage msg)
-    {
-        return true;
-    }
-
     public int hashCode()
     {
         return key.hashCode();
diff --git a/python/LICENSE.txt b/python/LICENSE.txt
new file mode 100755
index 0000000000..6b0b1270ff
--- /dev/null
+++ b/python/LICENSE.txt
@@ -0,0 +1,203 @@
+
+                                 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/python/NOTICE.txt b/python/NOTICE.txt
new file mode 100644
index 0000000000..32ccdb70c4
--- /dev/null
+++ b/python/NOTICE.txt
@@ -0,0 +1,20 @@
+=========================================================================
+==  NOTICE file corresponding to the section 4 d of                    ==
+==  the Apache License, Version 2.0,                                   ==
+==  in this case for the Apache Qpid distribution.                     ==
+=========================================================================
+
+This product includes software developed by the Apache Software Foundation
+(http://www.apache.org/).
+
+Please read the LICENSE.txt file present in the root directory of this
+distribution.
+
+
+Aside from contributions to the Apache Qpid project, this software also 
+includes (binary only):
+
+	- None at this time
+
+             
+
diff --git a/ruby/LICENSE.txt b/ruby/LICENSE.txt
new file mode 100755
index 0000000000..6b0b1270ff
--- /dev/null
+++ b/ruby/LICENSE.txt
@@ -0,0 +1,203 @@
+
+                                 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/ruby/NOTICE.txt b/ruby/NOTICE.txt
new file mode 100644
index 0000000000..fff2bca45c
--- /dev/null
+++ b/ruby/NOTICE.txt
@@ -0,0 +1,19 @@
+=========================================================================
+==  NOTICE file corresponding to the section 4 d of                    ==
+==  the Apache License, Version 2.0,                                   ==
+==  in this case for the Apache Qpid distribution.                     ==
+=========================================================================
+
+This product includes software developed by the Apache Software Foundation
+(http://www.apache.org/).
+
+Please read the LICENSE.txt file present in the root directory of this
+distribution.
+
+
+Aside from contributions to the Apache Qpid project, this software also 
+includes (binary only):
+
+	- None at this time.
+             
+
diff --git a/specs/amqp-8.0.xml b/specs/amqp-8.0.xml
index 6a91263a99..6b3a438f08 100644
--- a/specs/amqp-8.0.xml
+++ b/specs/amqp-8.0.xml
@@ -2085,13 +2085,6 @@ localised reply text
     method it will raise a channel or connection exception.
     </doc>
   </field>
-
-    <field name="filter" type="table" label="arguments for consuming">
-        <doc>
-            A set of filters for the consume. The syntax and semantics
-            of these filters depends on the providers implementation.
-        </doc>
-    </field>
 </method>
 
 <method name = "consume-ok" synchronous = "1" index = "21">
@@ -2453,9 +2446,9 @@ localised reply text
     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>
+  </doc>      
   <chassis name = "server" implement = "MUST" />
-
+    
   <field name = "delivery tag" domain = "delivery tag" />
 
   <field name = "requeue" type = "bit">
@@ -2497,7 +2490,7 @@ localised reply text
     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
+    The server MUST raise a channel exception if this is called on a 
     transacted channel.
   </doc>
 </method>
@@ -2799,7 +2792,7 @@ localised reply text
   <response name = "open-ok" />
   <chassis name = "server" implement = "MUST" />
   <chassis name = "client" implement = "MUST" />
-
+  
   <field name = "identifier" type = "shortstr">
     staging identifier
     <doc>
@@ -2836,7 +2829,7 @@ localised reply text
   <response name = "stage" />
   <chassis name = "server" implement = "MUST" />
   <chassis name = "client" implement = "MUST" />
-
+  
   <field name = "staged size" type = "longlong">
     already staged amount
     <doc>
@@ -3052,7 +3045,7 @@ localised reply text
   </doc>
   <chassis name = "server" implement = "MUST" />
   <field name = "delivery tag" domain = "delivery tag" />
-
+      
   <field name = "multiple" type = "bit">
     acknowledge multiple messages
     <doc>
@@ -3091,7 +3084,7 @@ localised reply text
     not necessarily passed to another client.
   </doc>
   <chassis name = "server" implement = "MUST" />
-
+    
   <field name = "delivery tag" domain = "delivery tag" />
 
   <field name = "requeue" type = "bit">
@@ -3490,7 +3483,7 @@ localised reply text
     <doc>
       Specifies the routing key name specified when the message was
       published.
-    </doc>
+    </doc>     
   </field>
 </method>