Undo bad merge from trunk - merged at wrong level.

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/QPID-2519@1187150 13f79535-47bb-0310-9956-ffa450edef68

24 files changed, 95 insertions, 339 deletions

diff --git a/cpp/bindings/qpid/dotnet/configure-windows.ps1 b/cpp/bindings/qpid/dotnet/configure-windows.ps1
index 23fc742e07..34395911b9 100644
--- a/cpp/bindings/qpid/dotnet/configure-windows.ps1
+++ b/cpp/bindings/qpid/dotnet/configure-windows.ps1
@@ -24,32 +24,29 @@
 # This script configures a qpid\cpp developer build environment under Windows

 # to enable working with cpp\bindings\qpid\dotnet binding source code.

 #

-# * Supports multiple versions of Visual Studio (VS2008, VS2010) as CMake

-#   generator.

-#

 # * Supports 32-bit and/or 64-bit development platforms.

 #

 # * User chooses in-source or out-of-source build directories.

 #

 #     - 'In-source' builds happen when CMake is run from directory qpid\cpp.

-#       Hundreds of CMake-generated output files are placed in qpid\cpp\src.

+#       Hundreds of CMake-generated output files are placed in qpid\cpp\src. 

 #       These files go right on top of files that are part of the source tree

 #       in qpid\cpp\src.

-#       In-source builds support only one platform.

+#       In-source builds support only one platform. 

 #       Choose only a 32-bit or a 64-bit platform but not both.

 #

 #     - Out-of-source builds happen when the user chooses another directory

 #       under qpid in which to run CMake. Out-of-source builds are required

-#       in order to build both x86 and x64 targets using the same source tree.

+#       in order to build both x86 and x64 targets using the same source tree. 

 #       For each build platform (32-bit x86 or Win32, or 64-bit x64) the user

-#       specifies a build directory and a specific version of Boost.

+#       specifies a build directory and a specific version of Boost. 

 #       Many platform/Boost-version directories may reside side by side.

 #

 # * User chooses to run CMake or not.

 #

 #     - When a new build directory is created then the user is given the

-#       option of running CMake in that directory. Running CMake is a

-#       necessary step as CMake creates important source, solution, and

+#       option of running CMake in that directory. Running CMake is a 

+#       necessary step as CMake creates important source, solution, and 

 #       project files.

 #

 #     - If a directory "looks like" is has already had CMake run in it

@@ -66,7 +63,7 @@
 #  3. CMake 2.8 (or later) must be installed. The cmake\bin directory

 #     must be in the user's path.

 #  4. Boost library specifications may or may not be in the user's path.

-#     The script author recommeds not to have Boost in the path and only

+#     The script author recommeds not to have Boost in the path and only 

 #     allow the Boost path to be specified by generated command procedures.

 #  5. Visual Studio build environment must be installed.

 #

@@ -93,7 +90,7 @@
 #  In this example the build dirs are new. The script will prompt

 #  asking if CMake is to run in the build directories. User chooses Yes.

 #

-#  Now this script runs CMake twice, once each with the 32-bit and 64-bit

+#  Now this script runs CMake twice, once each with the 32-bit and 64-bit 

 #  generators.

 #  * This step creates qpid-cpp.sln and related project files.

 #      C:\svn\qpid\build32\qpid-cpp.sln

@@ -110,7 +107,7 @@
 #   C:\svn\qpid\build64\setenv-messaging-x64-64bit.bat

 #

 #  Next the user compiles solution qpid\build32\qpid-cpp.sln.

-#

+#  

 # Using the generated scripts:

 #

 # Case 1. Run an executable in 32-bit mode.

@@ -145,11 +142,6 @@ $global:txtPath = '$env:PATH'
 $global:txtQR   = '$env:QPID_BUILD_ROOT'

 $global:txtWH   = 'Write-Host'

 

-#############################

-# Visual Studio version selection dialog items and choice

-#

-[array]$global:VsVersionCmakeChoiceList = "Visual Studio 10", "Visual Studio 9 2008"

-$global:cmakeGenerator = ''

 

 #############################

 # Select-Folder

@@ -176,7 +168,7 @@ function AskYesOrNo ($Question="No question?", $Title="No Title?")
            [Windows.Forms.MessageBoxIcon]::Question)

 

     $result = $dlg -eq [Windows.Forms.DialogResult]::Yes

-

+    

     $result

 }

 

@@ -196,7 +188,7 @@ function SanityCheckBoostPath ($path=0)
 

         $toTest = ('include', 'lib')

         foreach ($pattern in $toTest) {

-            $target = Join-Path $path $pattern

+        	$target = Join-Path $path $pattern

             if (!(Test-Path -path $target)) {

                 $result = $false

             }

@@ -204,7 +196,7 @@ function SanityCheckBoostPath ($path=0)
     } else {

         $result = $false

     }

-

+    

     if (! $result) {

         Write-Host "The path ""$displayPath"" does not appear to be a Boost root path."

     }

@@ -227,7 +219,7 @@ function SanityCheckBuildPath ($path=0)
         $toTest = ('CMakeFiles', 'docs', 'etc', 'examples', 'include',

                    'managementgen', 'src')

         foreach ($pattern in $toTest) {

-            $target = Join-Path $path $pattern

+        	$target = Join-Path $path $pattern

             if (!(Test-Path -path $target)) {

                 $result = $false

             }

@@ -321,7 +313,7 @@ function WriteDotnetBindingEnvSetupBat
 

     $out = @("@ECHO OFF

 REM

-REM Call this command procedure from a command prompt to set up a $vsPlatform ($nBits-bit)

+REM Call this command procedure from a command prompt to set up a $vsPlatform ($nBits-bit) 

 REM $slnName environment

 REM

 REM     > call $outfileName

@@ -337,56 +329,6 @@ ECHO Environment set for $slnName $vsPlatform $nBits-bit development.
     $out | Out-File "$buildRoot\$outfileName" -encoding ASCII

 }

 

-#############################

-# Return the SelectedItem from the dropdown list and close the form.

-#

-function Return-DropDown {

-    if ($DropDown.SelectedItem -ne $null) {

-        $global:cmakeGenerator = $DropDown.SelectedItem.ToString()

-    	$Form.Close()

-        Write-Host "Selected generator: $global:cmakeGenerator"

-    }

-}

-

-#############################

-# Create the CMake generator form and launch it

-#

-function SelectCMakeGenerator {

-

-    $Form = New-Object System.Windows.Forms.Form

-

-    $Form.width = 350

-    $Form.height = 150

-    $Form.Text = ”Select CMake Generator”

-

-    $DropDown          = new-object System.Windows.Forms.ComboBox

-    $DropDown.Location = new-object System.Drawing.Size(120,10)

-    $DropDown.Size     = new-object System.Drawing.Size(150,30)

-

-    ForEach ($Item in $global:VsVersionCmakeChoiceList) {

-    	$DropDown.Items.Add($Item)

-    }

-    $DropDown.SelectedIndex = 0

-

-    $Form.Controls.Add($DropDown)

-

-    $DropDownLabel          = new-object System.Windows.Forms.Label

-    $DropDownLabel.Location = new-object System.Drawing.Size(10,10)

-    $DropDownLabel.size     = new-object System.Drawing.Size(100,20)

-    $DropDownLabel.Text     = "CMake generators"

-    $Form.Controls.Add($DropDownLabel)

-

-    $Button          = new-object System.Windows.Forms.Button

-    $Button.Location = new-object System.Drawing.Size(120,50)

-    $Button.Size     = new-object System.Drawing.Size(120,20)

-    $Button.Text     = "Select a generator"

-    $Button.Add_Click({Return-DropDown})

-    $form.Controls.Add($Button)

-

-    $Form.Add_Shown({$Form.Activate()})

-    $Form.ShowDialog()

-}

-

 

 #############################

 # Main

@@ -399,12 +341,6 @@ function SelectCMakeGenerator {
 [string] $cppDir   = Resolve-Path (Join-Path $curDir "..\..\..")

 

 [System.Reflection.Assembly]::LoadWithPartialName("System.Windows.Forms") | Out-Null

-[System.Reflection.Assembly]::LoadWithPartialName("System.Drawing")       | Out-Null

-

-#############################

-# User dialog to select a version of Visual Studio as CMake generator

-#

-SelectCMakeGenerator

 

 #############################

 # User dialog to get optional 32-bit boost and build paths

@@ -476,7 +412,7 @@ if ($make32) {
     $env:BOOST_ROOT = "$boost32"

     cd "$build32"

     Write-Host "Running 32-bit CMake in $build32 ..."

-    CMake -G "$global:cmakeGenerator" "-DCMAKE_INSTALL_PREFIX=install_x86" $cppDir

+    CMake -G "Visual Studio 9 2008" "-DCMAKE_INSTALL_PREFIX=install_x86" $cppDir

 } else {

     Write-Host "Skipped 32-bit CMake."

 }

@@ -488,7 +424,7 @@ if ($make64) {
     $env:BOOST_ROOT = "$boost64"

     cd "$build64"

     Write-Host "Running 64-bit CMake in $build64"

-    CMake -G "$global:cmakeGenerator Win64" "-DCMAKE_INSTALL_PREFIX=install_x64" $cppDir

+    CMake -G "Visual Studio 9 2008 Win64" "-DCMAKE_INSTALL_PREFIX=install_x64" $cppDir

 } else {

     Write-Host "Skipped 64-bit CMake."

 }

@@ -501,7 +437,7 @@ if ($make64) {
 if ($defined32) {

 

     Write-Host "Writing 32-bit scripts..."

-

+    

     ###########

     # Powershell script to launch org.apache.qpid.messaging.sln

     #

@@ -512,8 +448,8 @@ if ($defined32) {
                                       -vsPlatform "x86" `

                                            -nBits "32" `

                                      -outfileName "start-devenv-messaging-x86-32bit.ps1"

-

-

+                                     

+    

     ###########

     # Batch script (that you doubleclick) to launch powershell script

     # that launches org.apache.qpid.messaging.sln.

@@ -546,7 +482,7 @@ if ($defined32) {
 if ($defined64) {

 

     Write-Host "Writing 64-bit scripts..."

-

+    

     ###########

     # Powershell script to launch org.apache.qpid.messaging.sln

     #

@@ -557,8 +493,8 @@ if ($defined64) {
                                       -vsPlatform "x64" `

                                            -nBits "64" `

                                      -outfileName "start-devenv-messaging-x64-64bit.ps1"

-

-

+                                     

+    

     ###########

     # Batch script (that you doubleclick) to launch powershell script

     # that launches org.apache.qpid.messaging.sln.

diff --git a/cpp/bindings/qpid/dotnet/examples/csharp.direct.receiver/Properties/AssemblyInfo.cs b/cpp/bindings/qpid/dotnet/examples/csharp.direct.receiver/Properties/AssemblyInfo.cs
index 6976be5d02..abe35cf053 100644
--- a/cpp/bindings/qpid/dotnet/examples/csharp.direct.receiver/Properties/AssemblyInfo.cs
+++ b/cpp/bindings/qpid/dotnet/examples/csharp.direct.receiver/Properties/AssemblyInfo.cs
@@ -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

@@ -23,7 +23,7 @@ using System.Reflection;
 using System.Runtime.CompilerServices;

 using System.Runtime.InteropServices;

 

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

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

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

 // associated with an assembly.

 [assembly: AssemblyTitle("csharp.direct.receiver")]

@@ -31,12 +31,12 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]

 [assembly: AssemblyCompany("")]

 [assembly: AssemblyProduct("csharp.direct.receiver")]

-[assembly: AssemblyCopyright("Copyright 2011")]

+[assembly: AssemblyCopyright("Copyright ©  2010")]

 [assembly: AssemblyTrademark("")]

 [assembly: AssemblyCulture("")]

 

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

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

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

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

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

 [assembly: ComVisible(false)]

 

@@ -46,11 +46,11 @@ using System.Runtime.InteropServices;
 // Version information for an assembly consists of the following four values:

 //

 //      Major Version

-//      Minor Version

+//      Minor Version 

 //      Build Number

 //      Revision

 //

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

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

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

 // [assembly: AssemblyVersion("1.0.*")]

 [assembly: AssemblyVersion("1.0.0.0")]

diff --git a/cpp/bindings/qpid/dotnet/examples/csharp.direct.sender/Properties/AssemblyInfo.cs b/cpp/bindings/qpid/dotnet/examples/csharp.direct.sender/Properties/AssemblyInfo.cs
index 12368def8e..18502a0666 100644
--- a/cpp/bindings/qpid/dotnet/examples/csharp.direct.sender/Properties/AssemblyInfo.cs
+++ b/cpp/bindings/qpid/dotnet/examples/csharp.direct.sender/Properties/AssemblyInfo.cs
@@ -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

@@ -23,7 +23,7 @@ using System.Reflection;
 using System.Runtime.CompilerServices;

 using System.Runtime.InteropServices;

 

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

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

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

 // associated with an assembly.

 [assembly: AssemblyTitle("csharp.direct.sender")]

@@ -31,12 +31,12 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]

 [assembly: AssemblyCompany("")]

 [assembly: AssemblyProduct("csharp.direct.sender")]

-[assembly: AssemblyCopyright("Copyright 2011")]

+[assembly: AssemblyCopyright("Copyright ©  2010")]

 [assembly: AssemblyTrademark("")]

 [assembly: AssemblyCulture("")]

 

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

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

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

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

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

 [assembly: ComVisible(false)]

 

@@ -46,11 +46,11 @@ using System.Runtime.InteropServices;
 // Version information for an assembly consists of the following four values:

 //

 //      Major Version

-//      Minor Version

+//      Minor Version 

 //      Build Number

 //      Revision

 //

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

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

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

 // [assembly: AssemblyVersion("1.0.*")]

 [assembly: AssemblyVersion("1.0.0.0")]

diff --git a/cpp/bindings/qpid/dotnet/examples/csharp.map.callback.receiver/Properties/AssemblyInfo.cs b/cpp/bindings/qpid/dotnet/examples/csharp.map.callback.receiver/Properties/AssemblyInfo.cs
index 459130ec6c..a87f92ccdf 100644
--- a/cpp/bindings/qpid/dotnet/examples/csharp.map.callback.receiver/Properties/AssemblyInfo.cs
+++ b/cpp/bindings/qpid/dotnet/examples/csharp.map.callback.receiver/Properties/AssemblyInfo.cs
@@ -20,7 +20,7 @@ using System.Reflection;
 using System.Runtime.CompilerServices;

 using System.Runtime.InteropServices;

 

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

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

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

 // associated with an assembly.

 [assembly: AssemblyTitle("csharp.map.callback.receiver")]

@@ -28,12 +28,12 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]

 [assembly: AssemblyCompany("")]

 [assembly: AssemblyProduct("csharp.map.callback.receiver")]

-[assembly: AssemblyCopyright("Copyright 2011")]

+[assembly: AssemblyCopyright("Copyright ©  2010")]

 [assembly: AssemblyTrademark("")]

 [assembly: AssemblyCulture("")]

 

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

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

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

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

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

 [assembly: ComVisible(false)]

 

@@ -43,11 +43,11 @@ using System.Runtime.InteropServices;
 // Version information for an assembly consists of the following four values:

 //

 //      Major Version

-//      Minor Version

+//      Minor Version 

 //      Build Number

 //      Revision

 //

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

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

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

 // [assembly: AssemblyVersion("1.0.*")]

 [assembly: AssemblyVersion("1.0.0.0")]

diff --git a/cpp/bindings/qpid/dotnet/examples/csharp.map.callback.sender/Properties/AssemblyInfo.cs b/cpp/bindings/qpid/dotnet/examples/csharp.map.callback.sender/Properties/AssemblyInfo.cs
index 2be4011f19..e633f76673 100644
--- a/cpp/bindings/qpid/dotnet/examples/csharp.map.callback.sender/Properties/AssemblyInfo.cs
+++ b/cpp/bindings/qpid/dotnet/examples/csharp.map.callback.sender/Properties/AssemblyInfo.cs
@@ -28,7 +28,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]

 [assembly: AssemblyCompany("")]

 [assembly: AssemblyProduct("csharp.map.callback.sender")]

-[assembly: AssemblyCopyright("Copyright 2010")]

+[assembly: AssemblyCopyright("Copyright ©  2010")]

 [assembly: AssemblyTrademark("")]

 [assembly: AssemblyCulture("")]

 

diff --git a/cpp/bindings/qpid/dotnet/examples/csharp.map.receiver/Properties/AssemblyInfo.cs b/cpp/bindings/qpid/dotnet/examples/csharp.map.receiver/Properties/AssemblyInfo.cs
index f11ce8c220..694d6b9ce1 100644
--- a/cpp/bindings/qpid/dotnet/examples/csharp.map.receiver/Properties/AssemblyInfo.cs
+++ b/cpp/bindings/qpid/dotnet/examples/csharp.map.receiver/Properties/AssemblyInfo.cs
@@ -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

@@ -23,7 +23,7 @@ using System.Reflection;
 using System.Runtime.CompilerServices;

 using System.Runtime.InteropServices;

 

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

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

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

 // associated with an assembly.

 [assembly: AssemblyTitle("csharp.map.receiver")]

@@ -31,12 +31,12 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]

 [assembly: AssemblyCompany("")]

 [assembly: AssemblyProduct("csharp.map.receiver")]

-[assembly: AssemblyCopyright("Copyright 2011")]

+[assembly: AssemblyCopyright("Copyright ©  2010")]

 [assembly: AssemblyTrademark("")]

 [assembly: AssemblyCulture("")]

 

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

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

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

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

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

 [assembly: ComVisible(false)]

 

@@ -46,11 +46,11 @@ using System.Runtime.InteropServices;
 // Version information for an assembly consists of the following four values:

 //

 //      Major Version

-//      Minor Version

+//      Minor Version 

 //      Build Number

 //      Revision

 //

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

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

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

 // [assembly: AssemblyVersion("1.0.*")]

 [assembly: AssemblyVersion("1.0.0.0")]

diff --git a/cpp/bindings/qpid/dotnet/examples/csharp.map.sender/Properties/AssemblyInfo.cs b/cpp/bindings/qpid/dotnet/examples/csharp.map.sender/Properties/AssemblyInfo.cs
index ee09057f18..ea29ac2417 100644
--- a/cpp/bindings/qpid/dotnet/examples/csharp.map.sender/Properties/AssemblyInfo.cs
+++ b/cpp/bindings/qpid/dotnet/examples/csharp.map.sender/Properties/AssemblyInfo.cs
@@ -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

@@ -23,7 +23,7 @@ using System.Reflection;
 using System.Runtime.CompilerServices;

 using System.Runtime.InteropServices;

 

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

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

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

 // associated with an assembly.

 [assembly: AssemblyTitle("csharp.map.sender")]

@@ -31,12 +31,12 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]

 [assembly: AssemblyCompany("")]

 [assembly: AssemblyProduct("csharp.map.sender")]

-[assembly: AssemblyCopyright("Copyright 2011")]

+[assembly: AssemblyCopyright("Copyright ©  2010")]

 [assembly: AssemblyTrademark("")]

 [assembly: AssemblyCulture("")]

 

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

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

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

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

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

 [assembly: ComVisible(false)]

 

@@ -46,11 +46,11 @@ using System.Runtime.InteropServices;
 // Version information for an assembly consists of the following four values:

 //

 //      Major Version

-//      Minor Version

+//      Minor Version 

 //      Build Number

 //      Revision

 //

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

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

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

 // [assembly: AssemblyVersion("1.0.*")]

 [assembly: AssemblyVersion("1.0.0.0")]

diff --git a/cpp/bindings/qpid/dotnet/examples/visualbasic.example.client/MyProject/AssemblyInfo.vb b/cpp/bindings/qpid/dotnet/examples/visualbasic.example.client/MyProject/AssemblyInfo.vb
index 469d6ed5cf..d0727fe9fa 100644
--- a/cpp/bindings/qpid/dotnet/examples/visualbasic.example.client/MyProject/AssemblyInfo.vb
+++ b/cpp/bindings/qpid/dotnet/examples/visualbasic.example.client/MyProject/AssemblyInfo.vb
@@ -6,9 +6,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,34 +21,34 @@ Imports System
 Imports System.Reflection

 Imports System.Runtime.InteropServices

 

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

+' General Information about an assembly is controlled through the following 

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

 ' associated with an assembly.

 

 ' Review the values of the assembly attributes

 

-<Assembly: AssemblyTitle("visualbasic.example.client")>

-<Assembly: AssemblyDescription("")>

-<Assembly: AssemblyCompany("")>

-<Assembly: AssemblyProduct("visualbasic.example.client")>

-<Assembly: AssemblyCopyright("Copyright 2011")>

-<Assembly: AssemblyTrademark("")>

+<Assembly: AssemblyTitle("visualbasic.example.client")> 

+<Assembly: AssemblyDescription("")> 

+<Assembly: AssemblyCompany("Microsoft")> 

+<Assembly: AssemblyProduct("visualbasic.example.client")> 

+<Assembly: AssemblyCopyright("Copyright © Microsoft 2010")> 

+<Assembly: AssemblyTrademark("")> 

 

 <Assembly: ComVisible(False)>

 

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

-<Assembly: Guid("ec9df8cf-c1d4-4938-9e72-93fb81d55700")>

+<Assembly: Guid("ec9df8cf-c1d4-4938-9e72-93fb81d55700")> 

 

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

 '

 '      Major Version

-'      Minor Version

+'      Minor Version 

 '      Build Number

 '      Revision

 '

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

+' You can specify all the values or you can default the Build and Revision Numbers 

 ' by using the '*' as shown below:

-' <Assembly: AssemblyVersion("1.0.*")>

+' <Assembly: AssemblyVersion("1.0.*")> 

 

-<Assembly: AssemblyVersion("1.0.0.0")>

-<Assembly: AssemblyFileVersion("1.0.0.0")>

+<Assembly: AssemblyVersion("1.0.0.0")> 

+<Assembly: AssemblyFileVersion("1.0.0.0")> 

diff --git a/cpp/bindings/qpid/dotnet/org.apache.qpid.messaging.sessionreceiver.sln b/cpp/bindings/qpid/dotnet/org.apache.qpid.messaging.sessionreceiver.sln
index edf8af4808..90e98a4bbe 100644
--- a/cpp/bindings/qpid/dotnet/org.apache.qpid.messaging.sessionreceiver.sln
+++ b/cpp/bindings/qpid/dotnet/org.apache.qpid.messaging.sessionreceiver.sln
@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 10.00

 # Visual Studio 2008

-#

+# 

 # Licensed to the Apache Software Foundation (ASF) under one

 # or more contributor license agreements.  See the NOTICE file

 # distributed with this work for additional information

@@ -8,9 +8,9 @@ Microsoft Visual Studio Solution File, Format Version 10.00
 # to you under the Apache License, Version 2.0 (the

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

 # with the License.  You may obtain a copy of the License at

-#

+# 

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

-#

+# 

 # Unless required by applicable law or agreed to in writing,

 # software distributed under the License is distributed on an

 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

diff --git a/cpp/bindings/qpid/dotnet/src/Address.cpp b/cpp/bindings/qpid/dotnet/src/Address.cpp
index 79a8021d9a..b688d973ed 100644
--- a/cpp/bindings/qpid/dotnet/src/Address.cpp
+++ b/cpp/bindings/qpid/dotnet/src/Address.cpp
@@ -141,7 +141,7 @@ namespace Messaging {
 		}

     }

 

-    // Copy constructor look-alike (C#)

+    // copy constructor

     Address::Address(const Address ^ address)

     {

         System::Exception ^ newException = nullptr;

@@ -163,28 +163,6 @@ namespace Messaging {
 		}

     }

 

-    // Copy constructor implicitly dereferenced (C++)

-    Address::Address(const Address % address)

-    {

-        System::Exception ^ newException = nullptr;

-

-        try 

-		{

-            addressp = new ::qpid::messaging::Address(

-                        *(const_cast<Address %>(address).NativeAddress));

-        } 

-        catch (const ::qpid::types::Exception & error) 

-		{

-            String ^ errmsg = gcnew String(error.what());

-            newException    = gcnew QpidException(errmsg);

-        }

-

-		if (newException != nullptr) 

-		{

-	        throw newException;

-		}

-    }

-

     // unmanaged clone

     Address::Address(const ::qpid::messaging::Address & addrp)

     {

diff --git a/cpp/bindings/qpid/dotnet/src/Address.h b/cpp/bindings/qpid/dotnet/src/Address.h
index 8bbc207d4e..e5a00d8f11 100644
--- a/cpp/bindings/qpid/dotnet/src/Address.h
+++ b/cpp/bindings/qpid/dotnet/src/Address.h
@@ -64,7 +64,6 @@ namespace Messaging {
 

         // copy constructor

         Address(const Address ^ address);

-        Address(const Address % address);

 

         // unmanaged clone

         Address(const ::qpid::messaging::Address & addrp);

diff --git a/cpp/bindings/qpid/dotnet/src/Connection.cpp b/cpp/bindings/qpid/dotnet/src/Connection.cpp
index 12c0e29f74..69ace7db52 100644
--- a/cpp/bindings/qpid/dotnet/src/Connection.cpp
+++ b/cpp/bindings/qpid/dotnet/src/Connection.cpp
@@ -114,7 +114,7 @@ namespace Messaging {
     }

 

 

-    // Copy constructor look-alike (C#)

+    // Copy constructor

     Connection::Connection(const Connection ^ connection)

     {

         System::Exception ^ newException = nullptr;

@@ -136,28 +136,6 @@ namespace Messaging {
 		}

     }

 

-    // Copy constructor implicitly dereferenced (C++)

-    Connection::Connection(const Connection % connection)

-    {

-        System::Exception ^ newException = nullptr;

-

-        try 

-		{

-            connectionp = new ::qpid::messaging::Connection(

-                        *(const_cast<Connection %>(connection).NativeConnection));

-        } 

-        catch (const ::qpid::types::Exception & error) 

-		{

-            String ^ errmsg = gcnew String(error.what());

-            newException    = gcnew QpidException(errmsg);

-        }

-

-		if (newException != nullptr) 

-		{

-	        throw newException;

-		}

-    }

-

 

     // Destructor

     Connection::~Connection()

diff --git a/cpp/bindings/qpid/dotnet/src/Connection.h b/cpp/bindings/qpid/dotnet/src/Connection.h
index 0788f5d225..f9b62d4a08 100644
--- a/cpp/bindings/qpid/dotnet/src/Connection.h
+++ b/cpp/bindings/qpid/dotnet/src/Connection.h
@@ -56,7 +56,6 @@ namespace Messaging {
 

         // copy constructor

         Connection(const Connection ^ connection);

-        Connection(const Connection % connection);

 

 		// unmanaged clone

 		// not defined

diff --git a/cpp/bindings/qpid/dotnet/src/Duration.h b/cpp/bindings/qpid/dotnet/src/Duration.h
index d4239fae88..213c338a59 100644
--- a/cpp/bindings/qpid/dotnet/src/Duration.h
+++ b/cpp/bindings/qpid/dotnet/src/Duration.h
@@ -81,17 +81,7 @@ namespace Messaging {
             Duration ^ result = gcnew Duration(multiplier * dur->Milliseconds);

             return result;

         }

-

-        static bool operator == (Duration ^ a, Duration ^ b)

-        {

-            return a->Milliseconds == b->Milliseconds;

-        }

-

-        static bool operator != (Duration ^ a, Duration ^ b)

-        {

-            return a->Milliseconds != b->Milliseconds;

-        }

-};

+	};

 

     public ref class DurationConstants sealed

     {

diff --git a/cpp/bindings/qpid/dotnet/src/FailoverUpdates.h b/cpp/bindings/qpid/dotnet/src/FailoverUpdates.h
index d82e276fc8..1dd92b8688 100644
--- a/cpp/bindings/qpid/dotnet/src/FailoverUpdates.h
+++ b/cpp/bindings/qpid/dotnet/src/FailoverUpdates.h
@@ -54,7 +54,6 @@ namespace Messaging {
 

         // copy constructor

         FailoverUpdates(const FailoverUpdates ^ failoverUpdates) {}

-        FailoverUpdates(const FailoverUpdates % failoverUpdates) {}

 

         // assignment operator

         FailoverUpdates % operator=(const FailoverUpdates % rhs) 

diff --git a/cpp/bindings/qpid/dotnet/src/Message.cpp b/cpp/bindings/qpid/dotnet/src/Message.cpp
index e5dbf845b3..fe7825134d 100644
--- a/cpp/bindings/qpid/dotnet/src/Message.cpp
+++ b/cpp/bindings/qpid/dotnet/src/Message.cpp
@@ -235,7 +235,7 @@ namespace Messaging {
         }

     }

 

-    // Copy constructor look-alike (C#)

+    // Copy constructor

     Message::Message(const Message ^ message)

     {

         System::Exception ^ newException = nullptr;

@@ -257,29 +257,7 @@ namespace Messaging {
 		}

     }

 

-    // Copy constructor implicitly dereferenced (C++)

-    Message::Message(const Message % message)

-    {

-        System::Exception ^ newException = nullptr;

-

-        try 

-		{

-            messagep = new ::qpid::messaging::Message(

-                        *(const_cast<Message %>(message).NativeMessage));

-        } 

-        catch (const ::qpid::types::Exception & error) 

-		{

-            String ^ errmsg = gcnew String(error.what());

-            newException    = gcnew QpidException(errmsg);

-        }

-

-		if (newException != nullptr) 

-		{

-	        throw newException;

-		}

-    }

-

-    // Property

+	// Property

     void Message::SetProperty(System::String ^ name, System::Object ^ value)

     {

         System::Exception ^ newException = nullptr;

diff --git a/cpp/bindings/qpid/dotnet/src/Message.h b/cpp/bindings/qpid/dotnet/src/Message.h
index ac7f285fe5..b92cc4200b 100644
--- a/cpp/bindings/qpid/dotnet/src/Message.h
+++ b/cpp/bindings/qpid/dotnet/src/Message.h
@@ -71,7 +71,6 @@ namespace Messaging {
 

         // Copy constructor

         Message(const Message ^ message);

-        Message(const Message % message);

 

 	    // unmanaged clone

         Message(const ::qpid::messaging::Message & msgp);

diff --git a/cpp/bindings/qpid/dotnet/src/Receiver.cpp b/cpp/bindings/qpid/dotnet/src/Receiver.cpp
index 8aa77effbd..3c0d79b393 100644
--- a/cpp/bindings/qpid/dotnet/src/Receiver.cpp
+++ b/cpp/bindings/qpid/dotnet/src/Receiver.cpp
@@ -89,7 +89,7 @@ namespace Messaging {
     }

 

 

-    // Copy constructor look-alike (C#)

+    // Copy constructor

     Receiver::Receiver(const Receiver ^ receiver) :

         parentSession(receiver->parentSession)

     {

@@ -112,29 +112,6 @@ namespace Messaging {
 		}

     }

 

-    // Copy constructor implicitly dereferenced (C++)

-    Receiver::Receiver(const Receiver % receiver) :

-        parentSession(receiver.parentSession)

-    {

-        System::Exception ^ newException = nullptr;

-

-        try 

-		{

-            receiverp = new ::qpid::messaging::Receiver(

-                        *(const_cast<Receiver %>(receiver).NativeReceiver));

-        } 

-        catch (const ::qpid::types::Exception & error) 

-		{

-            String ^ errmsg = gcnew String(error.what());

-            newException    = gcnew QpidException(errmsg);

-        }

-

-		if (newException != nullptr) 

-		{

-	        throw newException;

-		}

-    }

-

 

     //

     // Get(message)

diff --git a/cpp/bindings/qpid/dotnet/src/Receiver.h b/cpp/bindings/qpid/dotnet/src/Receiver.h
index 8ddcc9ac01..e9912a61dd 100644
--- a/cpp/bindings/qpid/dotnet/src/Receiver.h
+++ b/cpp/bindings/qpid/dotnet/src/Receiver.h
@@ -65,7 +65,6 @@ namespace Messaging {
 

         // copy constructor

         Receiver(const Receiver ^ receiver);

-        Receiver(const Receiver % receiver);

 

         // unmanaged clone

         // undefined

diff --git a/cpp/bindings/qpid/dotnet/src/Sender.cpp b/cpp/bindings/qpid/dotnet/src/Sender.cpp
index 3225f1a6e1..584075ef5f 100644
--- a/cpp/bindings/qpid/dotnet/src/Sender.cpp
+++ b/cpp/bindings/qpid/dotnet/src/Sender.cpp
@@ -84,7 +84,7 @@ namespace Messaging {
     }

 

 

-    // Copy constructor look-alike (C#)

+    // Copy constructor

     Sender::Sender(const Sender ^ sender)

         : parentSession(sender->parentSession)

     {

@@ -107,29 +107,6 @@ namespace Messaging {
 		}

     }

 

-    // Copy constructor implicitly dereferenced (C++)

-    Sender::Sender(const Sender % sender)

-        : parentSession(sender.parentSession)

-    {

-        System::Exception ^ newException = nullptr;

-

-        try 

-		{

-            senderp = new ::qpid::messaging::Sender(

-                        *(const_cast<Sender %>(sender).NativeSender));

-        } 

-        catch (const ::qpid::types::Exception & error) 

-		{

-            String ^ errmsg = gcnew String(error.what());

-            newException    = gcnew QpidException(errmsg);

-        }

-

-		if (newException != nullptr) 

-		{

-	        throw newException;

-		}

-    }

-

 

     //

     // Send(msg)

diff --git a/cpp/bindings/qpid/dotnet/src/Sender.h b/cpp/bindings/qpid/dotnet/src/Sender.h
index 4054e87316..0e90a9f4a4 100644
--- a/cpp/bindings/qpid/dotnet/src/Sender.h
+++ b/cpp/bindings/qpid/dotnet/src/Sender.h
@@ -62,7 +62,6 @@ namespace Messaging {
         

         // copy constructor

         Sender(const Sender ^ sender);

-        Sender(const Sender % sender);

 

         ~Sender();

         !Sender();

diff --git a/cpp/bindings/qpid/dotnet/src/Session.cpp b/cpp/bindings/qpid/dotnet/src/Session.cpp
index 0e918769a3..880331c588 100644
--- a/cpp/bindings/qpid/dotnet/src/Session.cpp
+++ b/cpp/bindings/qpid/dotnet/src/Session.cpp
@@ -89,7 +89,7 @@ namespace Messaging {
     }

 

 

-    // Copy constructor look-alike (C#)

+    // Copy constructor

     Session::Session(const Session ^ session)

         : parentConnectionp(session->parentConnectionp)

     {

@@ -113,30 +113,6 @@ namespace Messaging {
 		}

     }

 

-    // Copy constructor implicitly dereferenced (C++)

-    Session::Session(const Session % session)

-        : parentConnectionp(session.parentConnectionp)

-    {

-        System::Exception ^ newException = nullptr;

-

-        try 

-		{

-            sessionp = new ::qpid::messaging::Session(

-                        *(const_cast<Session %>(session).NativeSession));

-          

-        } 

-        catch (const ::qpid::types::Exception & error) 

-		{

-            String ^ errmsg = gcnew String(error.what());

-            newException    = gcnew QpidException(errmsg);

-        }

-

-		if (newException != nullptr) 

-		{

-	        throw newException;

-		}

-    }

-

 

     void Session::Close()

     {

@@ -248,31 +224,6 @@ namespace Messaging {
 		}

     }

 

-    void Session::AcknowledgeUpTo(Message ^ message)

-    {

-        AcknowledgeUpTo(message, false);

-    }

-

-    void Session::AcknowledgeUpTo(Message ^ message, bool sync)

-    {

-        System::Exception ^ newException = nullptr;

-

-        try 

-		{

-            sessionp->acknowledgeUpTo(*(message->NativeMessage), sync);

-        } 

-        catch (const ::qpid::types::Exception & error) 

-		{

-            String ^ errmsg = gcnew String(error.what());

-            newException    = gcnew QpidException(errmsg);

-        }

-

-		if (newException != nullptr) 

-		{

-	        throw newException;

-		}

-    }

-

     void Session::Reject(Message ^ message)

     {

         System::Exception ^ newException = nullptr;

diff --git a/cpp/bindings/qpid/dotnet/src/Session.h b/cpp/bindings/qpid/dotnet/src/Session.h
index 4b98a37f18..7eaad8a0a5 100644
--- a/cpp/bindings/qpid/dotnet/src/Session.h
+++ b/cpp/bindings/qpid/dotnet/src/Session.h
@@ -69,7 +69,6 @@ namespace Messaging {
 

         // copy constructor

         Session(const Session ^ session);

-        Session(const Session % session);

 

         ~Session();

         !Session();

@@ -104,8 +103,6 @@ namespace Messaging {
         void Acknowledge(bool sync);

         void Acknowledge(Message ^ message);

         void Acknowledge(Message ^ message, bool sync);

-        void AcknowledgeUpTo(Message ^ message);

-        void AcknowledgeUpTo(Message ^ message, bool sync);

         void Reject(Message ^);

         void Release(Message ^);

         void Sync();

diff --git a/cpp/bindings/qpid/dotnet/test/messaging.test/Properties/AssemblyInfo.cs b/cpp/bindings/qpid/dotnet/test/messaging.test/Properties/AssemblyInfo.cs
index 81a89ce393..cf50e88200 100644
--- a/cpp/bindings/qpid/dotnet/test/messaging.test/Properties/AssemblyInfo.cs
+++ b/cpp/bindings/qpid/dotnet/test/messaging.test/Properties/AssemblyInfo.cs
@@ -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

@@ -23,7 +23,7 @@ using System.Reflection;
 using System.Runtime.CompilerServices;

 using System.Runtime.InteropServices;

 

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

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

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

 // associated with an assembly.

 [assembly: AssemblyTitle("messaging.test")]

@@ -31,12 +31,12 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]

 [assembly: AssemblyCompany("")]

 [assembly: AssemblyProduct("messaging.test")]

-[assembly: AssemblyCopyright("Copyright 2011")]

+[assembly: AssemblyCopyright("Copyright ©  2010")]

 [assembly: AssemblyTrademark("")]

 [assembly: AssemblyCulture("")]

 

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

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

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

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

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

 [assembly: ComVisible(false)]

 

@@ -46,11 +46,11 @@ using System.Runtime.InteropServices;
 // Version information for an assembly consists of the following four values:

 //

 //      Major Version

-//      Minor Version

+//      Minor Version 

 //      Build Number

 //      Revision

 //

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

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

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

 // [assembly: AssemblyVersion("1.0.*")]

 [assembly: AssemblyVersion("1.0.0.0")]