QPID-2628 - Patch from Chuck Rolke

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

13 files changed, 733 insertions, 26 deletions

diff --git a/cpp/bindings/qpid/dotnet/examples/csharp.direct.receiver/csharp.direct.receiver.cs b/cpp/bindings/qpid/dotnet/examples/csharp.direct.receiver/csharp.direct.receiver.cs
index 6cc2a5e0a5..4888023830 100644
--- a/cpp/bindings/qpid/dotnet/examples/csharp.direct.receiver/csharp.direct.receiver.cs
+++ b/cpp/bindings/qpid/dotnet/examples/csharp.direct.receiver/csharp.direct.receiver.cs
@@ -37,7 +37,20 @@ namespace CSharpDirect
         {

             String host = "localhost:5672";

             String addr = "amq.direct/key";

-            int    nMsg = 10;

+            Int32 nMsg = 10;

+

+            if (args.Length > 0)

+                host = args[0];

+            if (args.Length > 1)

+                addr = args[1];

+            if (args.Length > 2)

+                nMsg = Convert.ToInt32(args[2]);

+

+            Console.WriteLine("csharp.direct.receiver");

+            Console.WriteLine("host : {0}", host);

+            Console.WriteLine("addr : {0}", addr);

+            Console.WriteLine("nMsg : {0}", nMsg);

+            Console.WriteLine();

 

             Connection conn = new Connection(host);

 

@@ -52,7 +65,7 @@ namespace CSharpDirect
 

                 Session sess = conn.createSession();

 

-                Duration dur = new Duration(1000 * 3600 * 24); // Wait one day

+                Duration dura = new Duration(3600000); // wait forever

 

                 Receiver rcv = sess.createReceiver(addr);

 

@@ -62,7 +75,7 @@ namespace CSharpDirect
                 {

                     try

                     {

-                        Message msg2 = rcv.fetch(dur);

+                        Message msg2 = rcv.fetch(dura);

                         Console.WriteLine("Rcvd msg {0} : {1}", i, msg2.getContent());

                     }

                     catch (Exception e)

diff --git a/cpp/bindings/qpid/dotnet/examples/csharp.direct.receiver/csharp.direct.receiver.csproj b/cpp/bindings/qpid/dotnet/examples/csharp.direct.receiver/csharp.direct.receiver.csproj
index 8cb4826a01..7bfcfb8331 100644
--- a/cpp/bindings/qpid/dotnet/examples/csharp.direct.receiver/csharp.direct.receiver.csproj
+++ b/cpp/bindings/qpid/dotnet/examples/csharp.direct.receiver/csharp.direct.receiver.csproj
@@ -17,7 +17,7 @@
     <DebugSymbols>true</DebugSymbols>

     <DebugType>full</DebugType>

     <Optimize>false</Optimize>

-    <OutputPath>bin\Debug\</OutputPath>

+    <OutputPath>..\..\..\..\..\src\Debug\</OutputPath>

     <DefineConstants>DEBUG;TRACE</DefineConstants>

     <ErrorReport>prompt</ErrorReport>

     <WarningLevel>4</WarningLevel>

@@ -31,10 +31,6 @@
     <WarningLevel>4</WarningLevel>

   </PropertyGroup>

   <ItemGroup>

-    <Reference Include="org.apache.qpid.messagingd, Version=1.0.3779.23054, Culture=neutral, PublicKeyToken=679e1f50b62dbace, processorArchitecture=x86">

-      <SpecificVersion>False</SpecificVersion>

-      <HintPath>..\..\bin\Debug\org.apache.qpid.messagingd.dll</HintPath>

-    </Reference>

     <Reference Include="System" />

     <Reference Include="System.Core">

       <RequiredTargetFramework>3.5</RequiredTargetFramework>

@@ -52,6 +48,12 @@
     <Compile Include="csharp.direct.receiver.cs" />

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

   </ItemGroup>

+  <ItemGroup>

+    <ProjectReference Include="..\..\src\org.apache.qpid.messaging.vcproj">

+      <Project>{AA5A3B83-5F98-406D-A01C-5A921467A57D}</Project>

+      <Name>org.apache.qpid.messaging</Name>

+    </ProjectReference>

+  </ItemGroup>

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

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

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

diff --git a/cpp/bindings/qpid/dotnet/examples/csharp.direct.sender/csharp.direct.sender.cs b/cpp/bindings/qpid/dotnet/examples/csharp.direct.sender/csharp.direct.sender.cs
index bf49787f9b..1fe56aa8a9 100644
--- a/cpp/bindings/qpid/dotnet/examples/csharp.direct.sender/csharp.direct.sender.cs
+++ b/cpp/bindings/qpid/dotnet/examples/csharp.direct.sender/csharp.direct.sender.cs
@@ -33,7 +33,20 @@ namespace csharp.direct.sender
         {

             String host = "localhost:5672";

             String addr = "amq.direct/key";

-            int nMsg = 10;

+            Int32 nMsg = 10;

+

+            if (args.Length > 0)

+                host = args[0];

+            if (args.Length > 1)

+                addr = args[1];

+            if (args.Length > 2)

+                nMsg = Convert.ToInt32(args[2]);

+

+            Console.WriteLine("csharp.direct.sender");

+            Console.WriteLine("host : {0}", host);

+            Console.WriteLine("addr : {0}", addr);

+            Console.WriteLine("nMsg : {0}", nMsg);

+            Console.WriteLine();

 

             Connection conn = new Connection(host);

 

diff --git a/cpp/bindings/qpid/dotnet/examples/csharp.direct.sender/csharp.direct.sender.csproj b/cpp/bindings/qpid/dotnet/examples/csharp.direct.sender/csharp.direct.sender.csproj
index f109d64b80..7ff92e163b 100644
--- a/cpp/bindings/qpid/dotnet/examples/csharp.direct.sender/csharp.direct.sender.csproj
+++ b/cpp/bindings/qpid/dotnet/examples/csharp.direct.sender/csharp.direct.sender.csproj
@@ -17,7 +17,7 @@
     <DebugSymbols>true</DebugSymbols>

     <DebugType>full</DebugType>

     <Optimize>false</Optimize>

-    <OutputPath>bin\Debug\</OutputPath>

+    <OutputPath>..\..\..\..\..\src\Debug\</OutputPath>

     <DefineConstants>DEBUG;TRACE</DefineConstants>

     <ErrorReport>prompt</ErrorReport>

     <WarningLevel>4</WarningLevel>

@@ -31,10 +31,6 @@
     <WarningLevel>4</WarningLevel>

   </PropertyGroup>

   <ItemGroup>

-    <Reference Include="org.apache.qpid.messagingd, Version=1.0.3779.23054, Culture=neutral, PublicKeyToken=679e1f50b62dbace, processorArchitecture=x86">

-      <SpecificVersion>False</SpecificVersion>

-      <HintPath>..\..\bin\Debug\org.apache.qpid.messagingd.dll</HintPath>

-    </Reference>

     <Reference Include="System" />

     <Reference Include="System.Core">

       <RequiredTargetFramework>3.5</RequiredTargetFramework>

@@ -52,6 +48,12 @@
     <Compile Include="csharp.direct.sender.cs" />

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

   </ItemGroup>

+  <ItemGroup>

+    <ProjectReference Include="..\..\src\org.apache.qpid.messaging.vcproj">

+      <Project>{AA5A3B83-5F98-406D-A01C-5A921467A57D}</Project>

+      <Name>org.apache.qpid.messaging</Name>

+    </ProjectReference>

+  </ItemGroup>

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

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

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

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
new file mode 100644
index 0000000000..8e2add189d
--- /dev/null
+++ b/cpp/bindings/qpid/dotnet/examples/csharp.map.callback.receiver/Properties/AssemblyInfo.cs
@@ -0,0 +1,54 @@
+/*

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

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

+* distributed with this work for additional information

+* regarding copyright ownership.  The ASF licenses this file

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

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

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

+*

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

+*

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

+* software distributed under the License is distributed on an

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

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

+* specific language governing permissions and limitations

+* under the License.

+*/

+using System.Reflection;

+using System.Runtime.CompilerServices;

+using System.Runtime.InteropServices;

+

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

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

+// associated with an assembly.

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

+[assembly: AssemblyDescription("")]

+[assembly: AssemblyConfiguration("")]

+[assembly: AssemblyCompany("")]

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

+[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 

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

+[assembly: ComVisible(false)]

+

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

+[assembly: Guid("002049f9-41c5-420f-9ff6-45bb652dded6")]

+

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

+//

+//      Major Version

+//      Minor Version 

+//      Build Number

+//      Revision

+//

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

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

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

+[assembly: AssemblyVersion("1.0.0.0")]

+[assembly: AssemblyFileVersion("1.0.0.0")]

diff --git a/cpp/bindings/qpid/dotnet/examples/csharp.map.callback.receiver/csharp.map.callback.receiver.cs b/cpp/bindings/qpid/dotnet/examples/csharp.map.callback.receiver/csharp.map.callback.receiver.cs
new file mode 100644
index 0000000000..e7294c6e1a
--- /dev/null
+++ b/cpp/bindings/qpid/dotnet/examples/csharp.map.callback.receiver/csharp.map.callback.receiver.cs
@@ -0,0 +1,280 @@
+/*

+ *

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

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

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

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

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

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

+ * 

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

+ * 

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

+ * software distributed under the License is distributed on an

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

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

+ * specific language governing permissions and limitations

+ * under the License.

+ *

+ */

+

+using System;

+using System.Collections.Generic;

+using org.apache.qpid.messaging;

+using org.apache.qpid.messaging.sessionreceiver;

+

+namespace org.apache.qpid.messaging.examples

+{

+    /// <summary>

+    /// A class with functions to display structured messages.

+    /// </summary>

+    public static class MessageViewer

+    {

+        /// <summary>

+        /// A Function to display a amqp/map message packaged as a Dictionary.

+        /// </summary>

+        /// <param name="dict">The AMQP map</param>

+        /// <param name="level">Nested depth</param>

+        public static void ShowDictionary(Dictionary<string, object> dict, int level)

+        {

+            foreach (KeyValuePair<string, object> kvp in dict)

+            {

+                Console.Write(new string(' ', level * 4));

+

+                if (QpidTypeCheck.ObjectIsMap(kvp.Value))

+                {

+                    Console.WriteLine("Key: {0}, Value: Dictionary", kvp.Key);

+                    ShowDictionary((Dictionary<string, object>)kvp.Value, level + 1);

+                }

+                else if (QpidTypeCheck.ObjectIsList(kvp.Value))

+                {

+                    Console.WriteLine("Key: {0}, Value: List", kvp.Key);

+                    ShowList((List<object>)kvp.Value, level + 1);

+                }

+                else

+                    Console.WriteLine("Key: {0}, Value: {1}, Type: {2}",

+                        kvp.Key, kvp.Value, kvp.Value.GetType().ToString());

+            }

+        }

+

+        /// <summary>

+        /// A function to display a ampq/list message packaged as a List.

+        /// </summary>

+        /// <param name="list">The AMQP list</param>

+        /// <param name="level">Nested depth</param>

+        public static void ShowList(List<object> list, int level)

+        {

+            foreach (object obj in list)

+            {

+                Console.Write(new string(' ', level * 4));

+

+                if (QpidTypeCheck.ObjectIsMap(obj))

+                {

+                    Console.WriteLine("Dictionary");

+                    ShowDictionary((Dictionary<string, object>)obj, level + 1);

+                }

+                else if (QpidTypeCheck.ObjectIsList(obj))

+                {

+                    Console.WriteLine("List");

+                    ShowList((List<object>)obj, level + 1);

+                }

+                else

+                    Console.WriteLine("Value: {0}, Type: {1}",

+                        obj.ToString(), obj.GetType().ToString());

+            }

+        }

+

+        /// <summary>

+        /// A function to diplay a Message. The native Object type is

+        /// decomposed into AMQP types.

+        /// </summary>

+        /// <param name="message">The Message</param>

+        public static void ShowMessage(Message message)

+        {

+            if ("amqp/map" == message.getContentType())

+            {

+                Console.WriteLine("Received a Dictionary");

+                Dictionary<string, object> content = new Dictionary<string, object>();

+                message.getContent(content);

+                ShowDictionary(content, 0);

+            }

+            else if ("amqp/list" == message.getContentType())

+            {

+                Console.WriteLine("Received a List");

+                List<object> content = new List<object>();

+                message.getContent(content);

+                ShowList(content, 0);

+            }

+            else

+            {

+                Console.WriteLine("Received a String");

+                Console.WriteLine(message.getContent());

+            }

+        }

+    }

+

+

+

+    /// <summary>

+    /// A model class to demonstrate how a user may use the Qpid Messaging

+    /// interface to receive Session messages using a callback.

+    /// </summary>

+    class ReceiverProcess : ISessionReceiver

+    {

+        UInt32 messagesReceived = 0;

+

+        /// <summary>

+        /// SessionReceiver implements the ISessionReceiver interface.

+        /// It is the callback function that receives all messages for a Session.

+        /// It may be called any time server is running.

+        /// It is always called on server's private thread.

+        /// </summary>

+        /// <param name="receiver">The Receiver associated with the message.</param>

+        /// <param name="message">The Message</param>

+        public void SessionReceiver(Receiver receiver, Message message)

+        {

+            //

+            // Indicate message reception

+            //

+            Console.WriteLine("--- Message {0}", ++messagesReceived);

+

+            //

+            // Display the received message

+            //

+            MessageViewer.ShowMessage(message);

+

+            //

+            // Acknowledge the receipt of all received messages.

+            //

+            receiver.getSession().acknowledge();

+        }

+

+

+        /// <summary>

+        /// Usage

+        /// </summary>

+        /// <param name="url">Connection target</param>

+        /// <param name="addr">Address: broker exchange + routing key</param>

+        /// <param name="nSec">n seconds to keep callback open</param>

+        static void usage(string url, string addr, int nSec)

+        {

+

+            Console.WriteLine("usage: {0} [url  [addr [nSec]]]",

+                System.Diagnostics.Process.GetCurrentProcess().ProcessName);

+            Console.WriteLine();

+            Console.WriteLine("A program to connect to a broker and receive");

+            Console.WriteLine("messages from a named exchange with a routing key.");

+            Console.WriteLine("The receiver uses a session callback and keeps the callback");

+            Console.WriteLine("server open for so many seconds.");

+            Console.WriteLine("The details of the message body's types and values are shown.");

+            Console.WriteLine();

+            Console.WriteLine(" url  = target address for 'new Connection(url)'");

+            Console.WriteLine(" addr = address for 'session.createReceiver(addr)'");

+            Console.WriteLine(" nSec = time in seconds to keep the receiver callback open");

+            Console.WriteLine();

+            Console.WriteLine("Default values:");

+            Console.WriteLine("  {0} {1} {2} {3}",

+                System.Diagnostics.Process.GetCurrentProcess().ProcessName,

+                url, addr, nSec);

+        }

+

+

+        /// <summary>

+        /// A function to illustrate how to open a Session callback and

+        /// receive messages.

+        /// </summary>

+        /// <param name="args">Main program arguments</param>

+        public void TestProgram(string[] args)

+        {

+            string url = "amqp:tcp:localhost:5672";

+            string addr = "amq.direct/map_example";

+            int nSec = 30;

+

+            if (1 == args.Length)

+            {

+                if (args[0].Equals("-h") || args[0].Equals("-H") || args[0].Equals("/?"))

+                {

+                    usage(url, addr, nSec);

+                    return;

+                }

+            }

+

+            if (args.Length > 0)

+                url = args[0];

+            if (args.Length > 1)

+                addr = args[1];

+            if (args.Length > 2)

+                nSec = System.Convert.ToInt32(args[2]);

+

+            //

+            // Create and open an AMQP connection to the broker URL

+            //

+            Connection connection = new Connection(url);

+            connection.open();

+

+            //

+            // Create a session.

+            //

+            Session session = connection.createSession();

+

+            //

+            // Receive through callback

+            //

+            // Create callback server and implicitly start it

+            //

+            sessionreceiver.server cbServer =

+                new sessionreceiver.server(session, this);

+

+            //

+            // The callback server is running and executing callbacks on a

+            // separate thread.

+            //

+

+            //

+            // Create a receiver for the direct exchange using the

+            // routing key "map_example".

+            //

+            Receiver receiver = session.createReceiver(addr);

+

+            //

+            // Establish a capacity

+            //

+            receiver.setCapacity(100);

+

+            //

+            // Wait so many seconds for messages to arrive.

+            //

+            System.Threading.Thread.Sleep(nSec * 1000);   // in mS

+

+            //

+            // Stop the callback server.

+            //

+            cbServer.close();

+

+            //

+            // Close the receiver and the connection.

+            //

+            receiver.close();

+            connection.close();

+        }

+    }

+

+

+    class MapCallbackReceiverMain

+    {

+        /// <summary>

+        /// Main program

+        /// </summary>

+        /// <param name="args">Main prgram args</param>

+        static void Main(string[] args)

+        {

+            // Invoke 'TestProgram' as non-static class.

+            ReceiverProcess mainProc = new ReceiverProcess();

+

+            mainProc.TestProgram(args);

+

+        }

+    }

+}

+

diff --git a/cpp/bindings/qpid/dotnet/examples/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj b/cpp/bindings/qpid/dotnet/examples/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj
new file mode 100644
index 0000000000..e8aae4be7d
--- /dev/null
+++ b/cpp/bindings/qpid/dotnet/examples/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <PropertyGroup>

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

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

+    <ProductVersion>9.0.30729</ProductVersion>

+    <SchemaVersion>2.0</SchemaVersion>

+    <ProjectGuid>{68A43817-2358-4A31-8FDF-FE21722BFBCF}</ProjectGuid>

+    <OutputType>Exe</OutputType>

+    <AppDesignerFolder>Properties</AppDesignerFolder>

+    <RootNamespace>csharp.map.callback.receiver</RootNamespace>

+    <AssemblyName>csharp.map.callback.receiver</AssemblyName>

+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>

+    <FileAlignment>512</FileAlignment>

+  </PropertyGroup>

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

+    <DebugSymbols>true</DebugSymbols>

+    <DebugType>full</DebugType>

+    <Optimize>false</Optimize>

+    <OutputPath>..\..\..\..\..\src\Debug\</OutputPath>

+    <DefineConstants>DEBUG;TRACE</DefineConstants>

+    <ErrorReport>prompt</ErrorReport>

+    <WarningLevel>4</WarningLevel>

+  </PropertyGroup>

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

+    <DebugType>pdbonly</DebugType>

+    <Optimize>true</Optimize>

+    <OutputPath>bin\Release\</OutputPath>

+    <DefineConstants>TRACE</DefineConstants>

+    <ErrorReport>prompt</ErrorReport>

+    <WarningLevel>4</WarningLevel>

+  </PropertyGroup>

+  <ItemGroup>

+    <Reference Include="System" />

+    <Reference Include="System.Core">

+      <RequiredTargetFramework>3.5</RequiredTargetFramework>

+    </Reference>

+    <Reference Include="System.Xml.Linq">

+      <RequiredTargetFramework>3.5</RequiredTargetFramework>

+    </Reference>

+    <Reference Include="System.Data.DataSetExtensions">

+      <RequiredTargetFramework>3.5</RequiredTargetFramework>

+    </Reference>

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

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

+  </ItemGroup>

+  <ItemGroup>

+    <Compile Include="csharp.map.callback.receiver.cs" />

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

+  </ItemGroup>

+  <ItemGroup>

+    <ProjectReference Include="..\..\src\org.apache.qpid.messaging.vcproj">

+      <Project>{AA5A3B83-5F98-406D-A01C-5A921467A57D}</Project>

+      <Name>org.apache.qpid.messaging</Name>

+    </ProjectReference>

+    <ProjectReference Include="..\..\src\sessionreceiver\org.apache.qpid.messaging.sessionreceiver.csproj">

+      <Project>{B0A51CEC-30A2-4C2E-90BE-AE95107EAA05}</Project>

+      <Name>org.apache.qpid.messaging.sessionreceiver</Name>

+    </ProjectReference>

+  </ItemGroup>

+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

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

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

+  <Target Name="BeforeBuild">

+  </Target>

+  <Target Name="AfterBuild">

+  </Target>

+  -->

+</Project>

diff --git a/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
new file mode 100644
index 0000000000..1f849441d4
--- /dev/null
+++ b/cpp/bindings/qpid/dotnet/examples/csharp.map.callback.sender/Properties/AssemblyInfo.cs
@@ -0,0 +1,54 @@
+/*

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

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

+* distributed with this work for additional information

+* regarding copyright ownership.  The ASF licenses this file

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

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

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

+*

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

+*

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

+* software distributed under the License is distributed on an

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

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

+* specific language governing permissions and limitations

+* under the License.

+*/

+using System.Reflection;

+using System.Runtime.CompilerServices;

+using System.Runtime.InteropServices;

+

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

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

+// associated with an assembly.

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

+[assembly: AssemblyDescription("")]

+[assembly: AssemblyConfiguration("")]

+[assembly: AssemblyCompany("")]

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

+[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 

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

+[assembly: ComVisible(false)]

+

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

+[assembly: Guid("1eec2eca-adbd-4394-8b01-f4c4645bb122")]

+

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

+//

+//      Major Version

+//      Minor Version 

+//      Build Number

+//      Revision

+//

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

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

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

+[assembly: AssemblyVersion("1.0.0.0")]

+[assembly: AssemblyFileVersion("1.0.0.0")]

diff --git a/cpp/bindings/qpid/dotnet/examples/csharp.map.callback.sender/csharp.map.callback.sender.cs b/cpp/bindings/qpid/dotnet/examples/csharp.map.callback.sender/csharp.map.callback.sender.cs
new file mode 100644
index 0000000000..a097267f5f
--- /dev/null
+++ b/cpp/bindings/qpid/dotnet/examples/csharp.map.callback.sender/csharp.map.callback.sender.cs
@@ -0,0 +1,146 @@
+/*

+ *

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

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

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

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

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

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

+ * 

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

+ * 

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

+ * software distributed under the License is distributed on an

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

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

+ * specific language governing permissions and limitations

+ * under the License.

+ *

+ */

+

+using System;

+using System.Collections.Generic;

+using System.Linq;

+using System.Text;

+using org.apache.qpid.messaging;

+

+namespace org.apache.qpid.messaging.examples

+{

+    class MapSender

+    {

+        //

+        // usage

+        //

+        static void usage(string url, string addr, UInt32 count)

+        {

+

+            Console.WriteLine("usage: {0} [url  [addr [count]]]",

+                System.Diagnostics.Process.GetCurrentProcess().ProcessName);

+            Console.WriteLine();

+            Console.WriteLine("A program to connect to a broker and send N");

+            Console.WriteLine("messages to a named exchange with a routing key.");

+            Console.WriteLine();

+            Console.WriteLine(" url = target address for 'new Connection(url)'");

+            Console.WriteLine(" addr = address for 'session.createReceiver(addr)'");

+            Console.WriteLine(" count = number of messages to send");

+            Console.WriteLine();

+            Console.WriteLine("Default values:");

+            Console.WriteLine("  {0} {1} {2} {3}",

+                System.Diagnostics.Process.GetCurrentProcess().ProcessName,

+                url, addr, count);

+        }

+

+        

+        //

+        // TestProgram

+        //

+        public void TestProgram(string[] args)

+        {

+            string url = "amqp:tcp:localhost:5672";

+            string addr = "amq.direct/map_example";

+            UInt32 count = 1;

+

+            if (1 == args.Length)

+            {

+                if (args[0].Equals("-h") || args[0].Equals("-H") || args[0].Equals("/?"))

+                {

+                    usage(url, addr, count);

+                    return;

+                }

+            }

+

+            if (args.Length > 0)

+                url = args[0];

+            if (args.Length > 1)

+                addr = args[1];

+            if (args.Length > 2)

+                count = System.Convert.ToUInt32(args[2]);

+

+            

+            //

+            // Create and open an AMQP connection to the broker URL

+            //

+            Connection connection = new Connection(url);

+            connection.open();

+

+            //

+            // Create a session and a sender to the direct exchange using the

+            // routing key "map_example".

+            //

+            Session session = connection.createSession();

+            Sender sender = session.createSender(addr);

+

+            //

+            // Create structured content for the message.  This example builds a

+            // map of items including a nested map and a list of values.

+            //

+            Dictionary<string, object> content = new Dictionary<string, object>();

+            Dictionary<string, object> subMap = new Dictionary<string, object>();

+            List<object> colors = new List<object>();

+

+            content["id"] = 987654321;

+            content["name"] = "Widget";

+            content["percent"] = 0.99;

+

+            subMap["name"] = "Smith";

+            subMap["number"] = 354;

+

+            content["nested"] = subMap;

+

+            colors.Add("red");

+            colors.Add("green");

+            colors.Add("white");

+

+            content["colors"] = colors;

+

+            //

+            // Construct a message with the map content and send it synchronously

+            // via the sender.

+            //

+            Message message = new Message(content);

+            for (UInt32 i = 0; i<count; i++)

+                sender.send(message, true);

+

+            //

+            // Close the connection.

+            //

+            connection.close();

+        }

+    }

+

+    class MapSenderMain

+    {

+        //

+        // Main

+        //

+        static void Main(string[] args)

+        {

+            // Invoke 'TestProgram' as non-static class.

+            MapSender mainProc = new MapSender();

+

+            mainProc.TestProgram(args);

+

+        }

+    }

+}

diff --git a/cpp/bindings/qpid/dotnet/examples/csharp.map.callback.sender/csharp.map.callback.sender.csproj b/cpp/bindings/qpid/dotnet/examples/csharp.map.callback.sender/csharp.map.callback.sender.csproj
new file mode 100644
index 0000000000..5089737dbe
--- /dev/null
+++ b/cpp/bindings/qpid/dotnet/examples/csharp.map.callback.sender/csharp.map.callback.sender.csproj
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <PropertyGroup>

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

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

+    <ProductVersion>9.0.30729</ProductVersion>

+    <SchemaVersion>2.0</SchemaVersion>

+    <ProjectGuid>{12F1C14F-5C7D-4075-9BAE-C091394FF99A}</ProjectGuid>

+    <OutputType>Exe</OutputType>

+    <AppDesignerFolder>Properties</AppDesignerFolder>

+    <RootNamespace>csharp.map.callback.sender</RootNamespace>

+    <AssemblyName>csharp.map.callback.sender</AssemblyName>

+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>

+    <FileAlignment>512</FileAlignment>

+  </PropertyGroup>

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

+    <DebugSymbols>true</DebugSymbols>

+    <DebugType>full</DebugType>

+    <Optimize>false</Optimize>

+    <OutputPath>..\..\..\..\..\src\Debug\</OutputPath>

+    <DefineConstants>DEBUG;TRACE</DefineConstants>

+    <ErrorReport>prompt</ErrorReport>

+    <WarningLevel>4</WarningLevel>

+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>

+  </PropertyGroup>

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

+    <DebugType>pdbonly</DebugType>

+    <Optimize>true</Optimize>

+    <OutputPath>bin\Release\</OutputPath>

+    <DefineConstants>TRACE</DefineConstants>

+    <ErrorReport>prompt</ErrorReport>

+    <WarningLevel>4</WarningLevel>

+  </PropertyGroup>

+  <ItemGroup>

+    <Reference Include="System" />

+    <Reference Include="System.Core">

+      <RequiredTargetFramework>3.5</RequiredTargetFramework>

+    </Reference>

+    <Reference Include="System.Xml.Linq">

+      <RequiredTargetFramework>3.5</RequiredTargetFramework>

+    </Reference>

+    <Reference Include="System.Data.DataSetExtensions">

+      <RequiredTargetFramework>3.5</RequiredTargetFramework>

+    </Reference>

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

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

+  </ItemGroup>

+  <ItemGroup>

+    <Compile Include="csharp.map.callback.sender.cs" />

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

+  </ItemGroup>

+  <ItemGroup>

+    <ProjectReference Include="..\..\src\org.apache.qpid.messaging.vcproj">

+      <Project>{AA5A3B83-5F98-406D-A01C-5A921467A57D}</Project>

+      <Name>org.apache.qpid.messaging</Name>

+    </ProjectReference>

+  </ItemGroup>

+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

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

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

+  <Target Name="BeforeBuild">

+  </Target>

+  <Target Name="AfterBuild">

+  </Target>

+  -->

+</Project>

diff --git a/cpp/bindings/qpid/dotnet/examples/csharp.map.receiver/csharp.map.receiver.csproj b/cpp/bindings/qpid/dotnet/examples/csharp.map.receiver/csharp.map.receiver.csproj
index a491274c62..380e33bb7d 100644
--- a/cpp/bindings/qpid/dotnet/examples/csharp.map.receiver/csharp.map.receiver.csproj
+++ b/cpp/bindings/qpid/dotnet/examples/csharp.map.receiver/csharp.map.receiver.csproj
@@ -17,7 +17,7 @@
     <DebugSymbols>true</DebugSymbols>

     <DebugType>full</DebugType>

     <Optimize>false</Optimize>

-    <OutputPath>bin\Debug\</OutputPath>

+    <OutputPath>..\..\..\..\..\src\Debug\</OutputPath>

     <DefineConstants>DEBUG;TRACE</DefineConstants>

     <ErrorReport>prompt</ErrorReport>

     <WarningLevel>4</WarningLevel>

@@ -31,10 +31,6 @@
     <WarningLevel>4</WarningLevel>

   </PropertyGroup>

   <ItemGroup>

-    <Reference Include="org.apache.qpid.messagingd, Version=1.0.3786.14109, Culture=neutral, PublicKeyToken=7e57166074abee8c, processorArchitecture=x86">

-      <SpecificVersion>False</SpecificVersion>

-      <HintPath>..\..\bin\Debug\org.apache.qpid.messagingd.dll</HintPath>

-    </Reference>

     <Reference Include="System" />

     <Reference Include="System.Core">

       <RequiredTargetFramework>3.5</RequiredTargetFramework>

@@ -52,6 +48,16 @@
     <Compile Include="csharp.map.recevier.cs" />

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

   </ItemGroup>

+  <ItemGroup>

+    <ProjectReference Include="..\..\src\org.apache.qpid.messaging.vcproj">

+      <Project>{AA5A3B83-5F98-406D-A01C-5A921467A57D}</Project>

+      <Name>org.apache.qpid.messaging</Name>

+    </ProjectReference>

+    <ProjectReference Include="..\..\src\sessionreceiver\org.apache.qpid.messaging.sessionreceiver.csproj">

+      <Project>{B0A51CEC-30A2-4C2E-90BE-AE95107EAA05}</Project>

+      <Name>org.apache.qpid.messaging.sessionreceiver</Name>

+    </ProjectReference>

+  </ItemGroup>

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

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

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

diff --git a/cpp/bindings/qpid/dotnet/examples/csharp.map.receiver/csharp.map.recevier.cs b/cpp/bindings/qpid/dotnet/examples/csharp.map.receiver/csharp.map.recevier.cs
index 461708ee16..9a425c03b7 100644
--- a/cpp/bindings/qpid/dotnet/examples/csharp.map.receiver/csharp.map.recevier.cs
+++ b/cpp/bindings/qpid/dotnet/examples/csharp.map.receiver/csharp.map.recevier.cs
@@ -29,8 +29,8 @@ namespace org.apache.qpid.messaging.examples
     {

         static void Main(string[] args)

         {

-//            string url = "amqp:tcp:localhost:5672";

-            string url = "10.16.18.254:5672";

+            string url = "amqp:tcp:localhost:5672";

+//            string url = "10.16.18.254:5672";

             if (args.Length > 0)

                 url = args[0];

 

diff --git a/cpp/bindings/qpid/dotnet/examples/csharp.map.sender/csharp.map.sender.csproj b/cpp/bindings/qpid/dotnet/examples/csharp.map.sender/csharp.map.sender.csproj
index d647509474..4482e6ab02 100644
--- a/cpp/bindings/qpid/dotnet/examples/csharp.map.sender/csharp.map.sender.csproj
+++ b/cpp/bindings/qpid/dotnet/examples/csharp.map.sender/csharp.map.sender.csproj
@@ -17,7 +17,7 @@
     <DebugSymbols>true</DebugSymbols>

     <DebugType>full</DebugType>

     <Optimize>false</Optimize>

-    <OutputPath>bin\Debug\</OutputPath>

+    <OutputPath>..\..\..\..\..\src\Debug\</OutputPath>

     <DefineConstants>DEBUG;TRACE</DefineConstants>

     <ErrorReport>prompt</ErrorReport>

     <WarningLevel>4</WarningLevel>

@@ -31,10 +31,6 @@
     <WarningLevel>4</WarningLevel>

   </PropertyGroup>

   <ItemGroup>

-    <Reference Include="org.apache.qpid.messagingd, Version=1.0.3786.14109, Culture=neutral, PublicKeyToken=7e57166074abee8c, processorArchitecture=x86">

-      <SpecificVersion>False</SpecificVersion>

-      <HintPath>..\..\bin\Debug\org.apache.qpid.messagingd.dll</HintPath>

-    </Reference>

     <Reference Include="System" />

     <Reference Include="System.Core">

       <RequiredTargetFramework>3.5</RequiredTargetFramework>

@@ -52,6 +48,12 @@
     <Compile Include="csharp.map.sender.cs" />

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

   </ItemGroup>

+  <ItemGroup>

+    <ProjectReference Include="..\..\src\org.apache.qpid.messaging.vcproj">

+      <Project>{AA5A3B83-5F98-406D-A01C-5A921467A57D}</Project>

+      <Name>org.apache.qpid.messaging</Name>

+    </ProjectReference>

+  </ItemGroup>

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

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

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