You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by tr...@apache.org on 2010/06/09 13:59:39 UTC

svn commit: r952968 [2/2] - in /qpid/trunk/qpid/cpp/bindings/qpid/dotnet: examples/csharp.direct.receiver/ examples/csharp.direct.sender/ examples/csharp.map.callback.receiver/ examples/csharp.map.callback.sender/ examples/csharp.map.receiver/ examples...

Modified: qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/TypeTranslator.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/TypeTranslator.cpp?rev=952968&r1=952967&r2=952968&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/TypeTranslator.cpp (original)
+++ qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/TypeTranslator.cpp Wed Jun  9 11:59:38 2010
@@ -29,10 +29,10 @@
 #include "QpidTypeCheck.h"
 #include "QpidMarshal.h"
 
-namespace org {
-namespace apache {
-namespace qpid {
-namespace messaging {
+namespace Org {
+namespace Apache {
+namespace Qpid {
+namespace Messaging {
 
     /// <summary>
     /// Translate between managed and native types.
@@ -42,11 +42,12 @@ namespace messaging {
     // The given object is a Dictionary.
     // Add its elements to the qpid map.
     //
-    void TypeTranslator::ManagedToNative(::qpid::types::Variant::Map & theMapp,
-                         QpidMap ^ theObjp)
+    void TypeTranslator::ManagedToNative(QpidMap ^ theDictionary,
+										 ::qpid::types::Variant::Map & qpidMap)
     {
         // iterate the items, converting each to a variant and adding to the map
-        for each (System::Collections::Generic::KeyValuePair<System::String^, System::Object^> kvp in theObjp)
+        for each (System::Collections::Generic::KeyValuePair
+			<System::String^, System::Object^> kvp in theDictionary)
         {
             if (QpidTypeCheck::ObjectIsMap(kvp.Value))
             {
@@ -55,7 +56,7 @@ namespace messaging {
                 ::qpid::types::Variant::Map newMap;
 
                 // Add the map variables to the map
-                ManagedToNative(newMap, (QpidMap ^)kvp.Value);
+                ManagedToNative((QpidMap ^)kvp.Value, newMap);
 
                 // Create a variant entry for the inner map
                 std::auto_ptr<::qpid::types::Variant> newVariantp(new ::qpid::types::Variant(newMap));
@@ -64,7 +65,7 @@ namespace messaging {
                 std::string entryName = QpidMarshal::ToNative(kvp.Key);
 
                 // Add inner map to outer map
-                theMapp.insert(std::make_pair<std::string, ::qpid::types::Variant>(entryName, *newVariantp));
+                qpidMap.insert(std::make_pair<std::string, ::qpid::types::Variant>(entryName, *newVariantp));
             }
             else if (QpidTypeCheck::ObjectIsList(kvp.Value))
             {
@@ -73,7 +74,7 @@ namespace messaging {
                 ::qpid::types::Variant::List newList;
 
                 // Add the List variables to the list
-                ManagedToNative(newList, (QpidList ^)kvp.Value);
+                ManagedToNative((QpidList ^)kvp.Value, newList);
 
                 // Create a variant entry for the inner map
                 ::qpid::types::Variant::List newVariant(newList);
@@ -84,7 +85,7 @@ namespace messaging {
                 std::string entryName = QpidMarshal::ToNative(kvp.Key);
 
                 // Add inner list to outer map
-                theMapp.insert(std::make_pair<std::string, ::qpid::types::Variant>(entryName, newVariant));
+                qpidMap.insert(std::make_pair<std::string, ::qpid::types::Variant>(entryName, newVariant));
             }
             else
             {
@@ -92,7 +93,7 @@ namespace messaging {
                 ::qpid::types::Variant entryValue;
                 ManagedToNativeObject(kvp.Value, entryValue);
                 std::string entryName = QpidMarshal::ToNative(kvp.Key);
-                theMapp.insert(std::make_pair<std::string, ::qpid::types::Variant>(entryName, entryValue));
+                qpidMap.insert(std::make_pair<std::string, ::qpid::types::Variant>(entryName, entryValue));
             }
         }
     }
@@ -103,11 +104,11 @@ namespace messaging {
     // The given object is a List.
     // Add its elements to the qpid list.
     //
-    void TypeTranslator::ManagedToNative(::qpid::types::Variant::List & theListp,
-                         QpidList ^ theObjp)
+    void TypeTranslator::ManagedToNative(QpidList ^ theList,
+										 ::qpid::types::Variant::List & qpidList)
     {
         // iterate the items, converting each to a variant and adding to the map
-        for each (System::Object ^ listObj in theObjp)
+        for each (System::Object ^ listObj in theList)
         {
             if (QpidTypeCheck::ObjectIsMap(listObj))
             {
@@ -116,13 +117,13 @@ namespace messaging {
                 ::qpid::types::Variant::Map newMap;
 
                 // Add the map variables to the map
-                ManagedToNative(newMap, (QpidMap ^)listObj);
+                ManagedToNative((QpidMap ^)listObj, newMap);
 
                 // Create a variant entry for the inner map
                 std::auto_ptr<::qpid::types::Variant> newVariantp(new ::qpid::types::Variant(newMap));
 
                 // Add inner map to outer list
-                theListp.push_back(*newVariantp);
+                qpidList.push_back(*newVariantp);
             }
             else if (QpidTypeCheck::ObjectIsList(listObj))
             {
@@ -131,20 +132,20 @@ namespace messaging {
                 ::qpid::types::Variant::List newList;
 
                 // Add the List variables to the list
-                ManagedToNative(newList, (QpidList ^)listObj);
+                ManagedToNative((QpidList ^)listObj, newList);
 
                 // Create a variant entry for the inner list
                 std::auto_ptr<::qpid::types::Variant> newVariantp(new ::qpid::types::Variant(newList));
 
                 // Add inner list to outer list
-                theListp.push_back(*newVariantp);
+                qpidList.push_back(*newVariantp);
             }
             else
             {
                 // Add a simple native type to list
                 ::qpid::types::Variant entryValue;
                 ManagedToNativeObject(listObj, entryValue);
-                theListp.push_back(entryValue);
+                qpidList.push_back(entryValue);
             }
         }
     }
@@ -155,57 +156,57 @@ namespace messaging {
     // Returns a variant representing simple native type object.
     // Not to be called for Map/List objects.
     //
-    void TypeTranslator::ManagedToNativeObject(System::Object ^ theObjp, 
-                               ::qpid::types::Variant & targetp)
+    void TypeTranslator::ManagedToNativeObject(System::Object ^ managedValue, 
+                               ::qpid::types::Variant & qpidVariant)
     {
-        System::Type     ^ typeP    = (*theObjp).GetType();
+        System::Type     ^ typeP    = (*managedValue).GetType();
         System::TypeCode   typeCode = System::Type::GetTypeCode( typeP );
 
         switch (typeCode)
         {
         case System::TypeCode::Boolean :
-            targetp = System::Convert::ToBoolean(theObjp);
+			qpidVariant = System::Convert::ToBoolean(managedValue, System::Globalization::CultureInfo::InvariantCulture);
             break;
 
         case System::TypeCode::Byte :
-            targetp = System::Convert::ToByte(theObjp);
+            qpidVariant = System::Convert::ToByte(managedValue, System::Globalization::CultureInfo::InvariantCulture);
             break;
 
         case System::TypeCode::UInt16 :
-            targetp = System::Convert::ToUInt16(theObjp);
+            qpidVariant = System::Convert::ToUInt16(managedValue, System::Globalization::CultureInfo::InvariantCulture);
             break;
 
         case System::TypeCode::UInt32 :
-            targetp = System::Convert::ToUInt32(theObjp);
+            qpidVariant = System::Convert::ToUInt32(managedValue, System::Globalization::CultureInfo::InvariantCulture);
             break;
 
         case System::TypeCode::UInt64 :
-            targetp = System::Convert::ToUInt64(theObjp);
+            qpidVariant = System::Convert::ToUInt64(managedValue, System::Globalization::CultureInfo::InvariantCulture);
             break;
 
         case System::TypeCode::Char :
         case System::TypeCode::SByte :
-            targetp = System::Convert::ToSByte(theObjp);
+            qpidVariant = System::Convert::ToSByte(managedValue, System::Globalization::CultureInfo::InvariantCulture);
             break;
 
         case System::TypeCode::Int16 :
-            targetp = System::Convert::ToInt16(theObjp);
+            qpidVariant = System::Convert::ToInt16(managedValue, System::Globalization::CultureInfo::InvariantCulture);
             break;
 
         case System::TypeCode::Int32 :
-            targetp = System::Convert::ToInt32(theObjp);
+            qpidVariant = System::Convert::ToInt32(managedValue, System::Globalization::CultureInfo::InvariantCulture);
             break;
 
         case System::TypeCode::Int64 :
-            targetp = System::Convert::ToInt64(theObjp);
+            qpidVariant = System::Convert::ToInt64(managedValue, System::Globalization::CultureInfo::InvariantCulture);
             break;
 
         case System::TypeCode::Single :
-            targetp = System::Convert::ToSingle(theObjp);
+            qpidVariant = System::Convert::ToSingle(managedValue, System::Globalization::CultureInfo::InvariantCulture);
             break;
 
         case System::TypeCode::Double :
-            targetp = System::Convert::ToDouble(theObjp);
+            qpidVariant = System::Convert::ToDouble(managedValue, System::Globalization::CultureInfo::InvariantCulture);
             break;
 
         case System::TypeCode::String :
@@ -213,10 +214,10 @@ namespace messaging {
                 std::string      rString;
                 System::String ^ rpString;
 
-                rpString = System::Convert::ToString(theObjp);
+                rpString = System::Convert::ToString(managedValue, System::Globalization::CultureInfo::InvariantCulture);
                 rString = QpidMarshal::ToNative(rpString);
-                targetp = rString;
-                targetp.setEncoding(QpidMarshal::ToNative("utf8"));
+                qpidVariant = rString;
+                qpidVariant.setEncoding(QpidMarshal::ToNative("utf8"));
             }
             break;
 
@@ -232,11 +233,12 @@ namespace messaging {
     // Given a user Dictionary and a qpid map,
     //   extract the qpid elements and put them into the dictionary.
     //
-    void TypeTranslator::NativeToManaged(QpidMap ^ dict, ::qpid::types::Variant::Map & map)
+    void TypeTranslator::NativeToManaged(::qpid::types::Variant::Map & qpidMap,
+										 QpidMap ^ dict)
     {
         // For each object in the message map, 
         //  create a .NET object and add it to the dictionary.
-        for (::qpid::types::Variant::Map::const_iterator i = map.begin(); i != map.end(); ++i) {
+        for (::qpid::types::Variant::Map::const_iterator i = qpidMap.begin(); i != qpidMap.end(); ++i) {
             // Get the name
             System::String ^ elementName = gcnew String(i->first.c_str());
 
@@ -299,7 +301,7 @@ namespace messaging {
                 {
                     QpidMap ^ newDict = gcnew QpidMap();
 
-                    NativeToManaged(newDict, variant.asMap());
+                    NativeToManaged(variant.asMap(), newDict);
 
                     dict[elementName] = newDict;
                     break;
@@ -309,7 +311,7 @@ namespace messaging {
                 {
                     QpidList ^ newList = gcnew QpidList();
 
-                    NativeToManaged(newList, variant.asList());
+                    NativeToManaged(variant.asList(), newList);
 
                     dict[elementName] = newList;
                     break;
@@ -322,10 +324,10 @@ namespace messaging {
     }
 
 
-    void TypeTranslator::NativeToManaged(QpidList ^ vList, ::qpid::types::Variant::List & qpidList)
+    void TypeTranslator::NativeToManaged(::qpid::types::Variant::List & qpidList, QpidList ^ managedList)
     {
-        // For each object in the message map, 
-        //  create a .NET object and add it to the dictionary.
+        // For each object in the qpidList 
+        //  create a .NET object and add it to the managed List.
         for (::qpid::types::Variant::List::const_iterator i = qpidList.begin(); i != qpidList.end(); ++i) 
         {
             ::qpid::types::Variant     variant = *i;
@@ -334,62 +336,62 @@ namespace messaging {
             switch (vType)
             {
             case ::qpid::types::VAR_BOOL:
-                (*vList).Add(variant.asBool());
+                (*managedList).Add(variant.asBool());
                 break;
                 
             case ::qpid::types::VAR_UINT8:
-                (*vList).Add(variant.asUint8());
+                (*managedList).Add(variant.asUint8());
                 break;
                 
             case ::qpid::types::VAR_UINT16:
-                (*vList).Add(variant.asUint16());
+                (*managedList).Add(variant.asUint16());
                 break;
                 
             case ::qpid::types::VAR_UINT32:
-                (*vList).Add(variant.asUint32());
+                (*managedList).Add(variant.asUint32());
                 break;
                 
             case ::qpid::types::VAR_UINT64:
-                (*vList).Add(variant.asUint64());
+                (*managedList).Add(variant.asUint64());
                 break;
                 
             case ::qpid::types::VAR_INT8:
-                (*vList).Add(variant.asInt8());
+                (*managedList).Add(variant.asInt8());
                 break;
                 
             case ::qpid::types::VAR_INT16:
-                (*vList).Add(variant.asInt16());
+                (*managedList).Add(variant.asInt16());
                 break;
                 
             case ::qpid::types::VAR_INT32:
-                (*vList).Add(variant.asInt32());
+                (*managedList).Add(variant.asInt32());
                 break;
                 
             case ::qpid::types::VAR_INT64:
-                (*vList).Add(variant.asInt64());
+                (*managedList).Add(variant.asInt64());
                 break;
                 
             case ::qpid::types::VAR_FLOAT:
-                (*vList).Add(variant.asFloat());
+                (*managedList).Add(variant.asFloat());
                 break;
                 
             case ::qpid::types::VAR_DOUBLE:
-                (*vList).Add(variant.asDouble());
+                (*managedList).Add(variant.asDouble());
                 break;
                 
             case ::qpid::types::VAR_STRING:
                 {
                     System::String ^ elementValue = gcnew System::String(variant.asString().c_str());
-                    (*vList).Add(elementValue);
+                    (*managedList).Add(elementValue);
                     break;
                 }
             case ::qpid::types::VAR_MAP:
                 {
                     QpidMap ^ newDict = gcnew QpidMap();
 
-                    NativeToManaged(newDict, variant.asMap());
+                    NativeToManaged(variant.asMap(), newDict);
 
-                    (*vList).Add(newDict);
+                    (*managedList).Add(newDict);
                     break;
                 }
 
@@ -397,9 +399,9 @@ namespace messaging {
                 {
                     QpidList ^ newList = gcnew QpidList();
 
-                    NativeToManaged(newList, variant.asList());
+                    NativeToManaged(variant.asList(), newList);
 
-                    (*vList).Add(newList);
+                    (*managedList).Add(newList);
                     break;
                 }
                 

Modified: qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/TypeTranslator.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/TypeTranslator.h?rev=952968&r1=952967&r2=952968&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/TypeTranslator.h (original)
+++ qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/TypeTranslator.h Wed Jun  9 11:59:38 2010
@@ -28,43 +28,44 @@
 
 #include "QpidTypeCheck.h"
 
-namespace org {
-namespace apache {
-namespace qpid {
-namespace messaging {
+namespace Org {
+namespace Apache {
+namespace Qpid {
+namespace Messaging {
 
     /// <summary>
     /// TypeTranslator provides codec between .NET Dictionary/List and
     /// qpid messaging Map/List.
     /// </summary>
-
-    public ref class TypeTranslator
+    public ref class TypeTranslator sealed
     {
+	private:
+		TypeTranslator::TypeTranslator() {}
 
     public:
-        // The given object is a Dictionary.
+        // The given object is a managed Dictionary.
         // Add its elements to the qpid map.
-        static void ManagedToNative(::qpid::types::Variant::Map & theMapp,
-                                    QpidMap ^ theObjp);
+        static void ManagedToNative(QpidMap ^ theDictionary,
+									::qpid::types::Variant::Map & qpidMap);
 
-        // The given object is a List.
+        // The given object is a managed List.
         // Add its elements to the qpid list.
-        static void ManagedToNative(::qpid::types::Variant::List & theListp,
-                                    QpidList ^ theObjp);
+        static void ManagedToNative(QpidList ^ theList,
+									::qpid::types::Variant::List & qpidList);
 
-        // The given object is a simple native type (not a Dictionary or List)
+        // The given object is a simple managed type (not a Dictionary or List)
         // Returns a variant representing simple native type object.
-        static void ManagedToNativeObject(System::Object ^ theObjp,
-                                          ::qpid::types::Variant & targetp);
+        static void ManagedToNativeObject(System::Object ^ managedValue,
+                                          ::qpid::types::Variant & qpidVariant);
 
-        // Given a Dictionary,
-        // Return its values in a Qpid map
-        static void NativeToManaged(QpidMap ^ dict, 
-                                    ::qpid::types::Variant::Map & map);
-
-        // Given a List,
-        // Return its values in a Qpid list
-        static void NativeToManaged(QpidList ^ vList, 
-                                    ::qpid::types::Variant::List & qpidList);
+        // The given object is a qpid map.
+        // Add its elements to the managed Dictionary.
+        static void NativeToManaged(::qpid::types::Variant::Map & qpidMap,
+									QpidMap ^ dict);
+
+        // The given object is a qpid list.
+        // Add its elements to the managed List.
+        static void NativeToManaged(::qpid::types::Variant::List & qpidList,
+									QpidList ^ managedList);
     };
 }}}}

Modified: qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/org.apache.qpid.messaging.rc
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/org.apache.qpid.messaging.rc?rev=952968&r1=952967&r2=952968&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/org.apache.qpid.messaging.rc (original)
+++ qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/org.apache.qpid.messaging.rc Wed Jun  9 11:59:38 2010
@@ -69,12 +69,12 @@ BEGIN
     BEGIN
         BLOCK "040904b0"
         BEGIN
-            VALUE "FileDescription", "org"
+            VALUE "FileDescription", "org.apache.qpid.messaging"
             VALUE "FileVersion", "1, 3, 0, 1"
-            VALUE "InternalName", "org"
+            VALUE "InternalName", "org.apache.qpid.messaging"
             VALUE "LegalCopyright", "Copyright (C) 2010"
             VALUE "OriginalFilename", "org.apache.qpid.messaging"
-            VALUE "ProductName", "org"
+            VALUE "ProductName", "org.apache.qpid.messaging"
             VALUE "ProductVersion", "1, 3, 0, 1"
         END
     END

Modified: qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/org.apache.qpid.messaging.vcproj
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/org.apache.qpid.messaging.vcproj?rev=952968&r1=952967&r2=952968&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/org.apache.qpid.messaging.vcproj (original)
+++ qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/org.apache.qpid.messaging.vcproj Wed Jun  9 11:59:38 2010
@@ -2,7 +2,7 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="9.00"
-	Name="org.apache.qpid.messaging"
+	Name="Org.Apache.Qpid.Messaging"
 	ProjectGUID="{AA5A3B83-5F98-406D-A01C-5A921467A57D}"
 	RootNamespace="org.apache.qpid.messaging"
 	Keyword="ManagedCProj"
@@ -244,6 +244,10 @@
 				>
 			</File>
 			<File
+				RelativePath=".\QpidException.h"
+				>
+			</File>
+			<File
 				RelativePath=".\QpidMarshal.h"
 				>
 			</File>

Modified: qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/sessionreceiver/Properties/AssemblyInfo.cs
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/sessionreceiver/Properties/AssemblyInfo.cs?rev=952968&r1=952967&r2=952968&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/sessionreceiver/Properties/AssemblyInfo.cs (original)
+++ qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/sessionreceiver/Properties/AssemblyInfo.cs Wed Jun  9 11:59:38 2010
@@ -24,11 +24,11 @@ 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("org.apache.qpid.messaging.sessionreceiver")]
+[assembly: AssemblyTitle("Org.Apache.Qpid.Messaging.SessionReceiver")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("org.apache.qpid.messaging.sessionreceiver")]
+[assembly: AssemblyProduct("Org.Apache.Qpid.Messaging.SessionReceiver")]
 [assembly: AssemblyCopyright("Copyright ©  2010")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

Modified: qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/sessionreceiver/sessionreceiver.cs
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/sessionreceiver/sessionreceiver.cs?rev=952968&r1=952967&r2=952968&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/sessionreceiver/sessionreceiver.cs (original)
+++ qpid/trunk/qpid/cpp/bindings/qpid/dotnet/src/sessionreceiver/sessionreceiver.cs Wed Jun  9 11:59:38 2010
@@ -23,9 +23,9 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using org.apache.qpid.messaging;
+using Org.Apache.Qpid.Messaging;
 
-namespace org.apache.qpid.messaging.sessionreceiver
+namespace Org.Apache.Qpid.Messaging.SessionReceiver
 {
     /// <summary>
     /// ISessionReceiver interface defines the callback for users to supply.
@@ -43,19 +43,19 @@ namespace org.apache.qpid.messaging.sess
 
     
     /// <summary>
-    /// eventEngine - wait for messages from the underlying C++ code.
+    /// EventEngine - wait for messages from the underlying C++ code.
     /// When available get them and deliver them via callback to our 
     /// client through the ISessionReceiver interface.
     /// This class consumes the thread that calls the Run() function.
     /// </summary>
 
-    internal class eventEngine
+    internal class EventEngine
     {
         private Session          session;
         private ISessionReceiver callback;
         private bool             keepRunning;
 
-        public eventEngine(Session theSession, ISessionReceiver thecallback)
+        public EventEngine(Session theSession, ISessionReceiver thecallback)
         {
             this.session  = theSession;
             this.callback = thecallback;
@@ -65,35 +65,35 @@ namespace org.apache.qpid.messaging.sess
         /// Function to call Session's nextReceiver, discover messages,
         /// and to deliver messages through the callback.
         /// </summary>
-        public void open()
+        public void Open()
         {
-            Receiver rcvr = session.createReceiver();
+            Receiver rcvr = session.CreateReceiver();
             Message  msg;
 
             keepRunning = true;
             while (keepRunning)
             {
-                if (session.nextReceiver(rcvr, DurationConstants.SECOND))
+                if (session.NextReceiver(rcvr, DurationConstants.SECOND))
                 {
                     if (keepRunning)
                     {
-                        msg = rcvr.fetch(DurationConstants.SECOND);
+                        msg = rcvr.Fetch(DurationConstants.SECOND);
                         this.callback.SessionReceiver(rcvr, msg);
                     }
                 }
                 //else
                 //    receive timed out
-                //    eventEngine exits the nextReceiver() function periodically
+                //    EventEngine exits the nextReceiver() function periodically
                 //    in order to test the keepRunning flag
             }
             // Private thread is now exiting.
         }
 
         /// <summary>
-        /// Function to stop the eventEngine. Private thread will exit within
+        /// Function to stop the EventEngine. Private thread will exit within
         /// one second.
         /// </summary>
-        public void close()
+        public void Close()
         {
             keepRunning = false;
         }
@@ -104,9 +104,9 @@ namespace org.apache.qpid.messaging.sess
     /// server is the class that users instantiate to connect a SessionReceiver
     /// callback to the stream of received messages received on a Session.
     /// </summary>
-    public class server
+    public class CallbackServer
     {
-        private eventEngine ee;
+        private EventEngine ee;
 
         /// <summary>
         /// Constructor for the server.
@@ -114,20 +114,20 @@ namespace org.apache.qpid.messaging.sess
         /// <param name="session">The Session whose messages are collected.</param>
         /// <param name="callback">The user function call with each message.</param>
         /// 
-        public server(Session session, ISessionReceiver callback)
+        public CallbackServer(Session session, ISessionReceiver callback)
         {
-            ee = new eventEngine(session, callback);
+            ee = new EventEngine(session, callback);
 
             new System.Threading.Thread(
-                new System.Threading.ThreadStart(ee.open)).Start();
+                new System.Threading.ThreadStart(ee.Open)).Start();
         }
 
         /// <summary>
         /// Function to stop the server.
         /// </summary>
-        public void close()
+        public void Close()
         {
-            ee.close();
+            ee.Close();
         }
     }
 }

Modified: qpid/trunk/qpid/cpp/bindings/qpid/dotnet/test/messaging.test/messaging.test.cs
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/bindings/qpid/dotnet/test/messaging.test/messaging.test.cs?rev=952968&r1=952967&r2=952968&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/bindings/qpid/dotnet/test/messaging.test/messaging.test.cs (original)
+++ qpid/trunk/qpid/cpp/bindings/qpid/dotnet/test/messaging.test/messaging.test.cs Wed Jun  9 11:59:38 2010
@@ -2,9 +2,9 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using org.apache.qpid.messaging;
+using Org.Apache.Qpid.Messaging;
 
-namespace org.apache.qpid.messaging
+namespace Org.Apache.Qpid.Messaging
 {
     class Program
     {
@@ -64,22 +64,22 @@ namespace org.apache.qpid.messaging
 
             Address aType = new Address ("check3", "subj", options, "hot");
 
-            Console.WriteLine("aEmpty : {0}", aEmpty.str());
-            Console.WriteLine("aStr   : {0}", aStr.str());
-            Console.WriteLine("aSubj  : {0}", aSubj.str());
-            Console.WriteLine("aType  : {0}", aType.str());
+            Console.WriteLine("aEmpty : {0}", aEmpty.ToStr());
+            Console.WriteLine("aStr   : {0}", aStr.ToStr());
+            Console.WriteLine("aSubj  : {0}", aSubj.ToStr());
+            Console.WriteLine("aType  : {0}", aType.ToStr());
 
             //
             // Raw message data retrieval
             //
 
             Message m2 = new Message("rarey");
-            UInt64 m2Size = m2.getContentSize();
+            UInt64 m2Size = m2.GetContentSize();
 
 
             byte[] myRaw = new byte [m2Size];
 
-            m2.getRaw(myRaw);
+            m2.GetRaw(myRaw);
             Console.WriteLine("Got raw array size {0}", m2Size);
             for (UInt64 i = 0; i < m2Size; i++)
                 Console.Write("{0} ", myRaw[i].ToString());



---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project:      http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org