qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ai...@apache.org
Subject svn commit: r886962 [5/5] - in /qpid/trunk/qpid/dotnet/client-010: ./ addins/ExcelAddIn/ addins/ExcelAddInMessageProcessor/ addins/ExcelAddInProducer/ client/ client/client/ client/transport/ client/transport/codec/ client/transport/exception/ client/t...
Date Thu, 03 Dec 2009 22:31:17 GMT
Modified: qpid/trunk/qpid/dotnet/client-010/management/console/Session.cs
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/dotnet/client-010/management/console/Session.cs?rev=886962&r1=886961&r2=886962&view=diff
==============================================================================
--- qpid/trunk/qpid/dotnet/client-010/management/console/Session.cs (original)
+++ qpid/trunk/qpid/dotnet/client-010/management/console/Session.cs Thu Dec  3 22:31:12 2009
@@ -201,8 +201,8 @@
 						}
 					}
 					
-					Encoder enc = broker.CreateEncoder('G', seq) ;
-					enc.writeMap(getParameters) ;
+					IEncoder enc = broker.CreateEncoder('G', seq) ;
+					enc.WriteMap(getParameters) ;
 					string routingKey = String.Format("agent.{0}.{1}", agent.BrokerBank, agent.AgentBank) ; 
 					Message msg = broker.CreateMessage(enc, routingKey) ;
 					log.Debug("Get Object Keys: ") ;
@@ -339,10 +339,10 @@
 			if (method != null) {
 				KeyValuePair<SchemaMethod, bool> pair = new KeyValuePair<SchemaMethod, bool>(method, synchronous) ;
 				seq = SequenceManager.Reserve(pair) ;
-				Encoder enc = aBroker.CreateEncoder('M', seq) ;
+				IEncoder enc = aBroker.CreateEncoder('M', seq) ;
 				obj.ObjectID.encode(enc) ;
 				obj.Schema.Key.encode(enc) ;
-				enc.writeStr8(name) ;
+				enc.WriteStr8(name) ;
 				
 				if (args.Count < method.InputArgCount) {
 					throw new Exception(String.Format("Incorrect number of arguments: expected {0}, got{1}", method.InputArgCount, args.Count)) ;
@@ -404,18 +404,18 @@
 			}		
 		}			
 	
-		public void HandleBrokerResponse(Broker broker, Decoder decoder, long sequence) {
+		public void HandleBrokerResponse(Broker broker, IDecoder decoder, long sequence) {
 			if (Console != null) {
 				Console.BrokerInformation(broker) ;
 			}				
 		
 		    long seq = SequenceManager.Reserve(CONTEXT_STARTUP) ;
-			Encoder endocder = broker.CreateEncoder('P', seq) ;
+			IEncoder endocder = broker.CreateEncoder('P', seq) ;
 			broker.Send(endocder) ;
 		}
 	
-		public void HandlePackageIndicator(Broker broker, Decoder decoder, long sequence) {
-			string packageName = decoder.readStr8() ;
+		public void HandlePackageIndicator(Broker broker, IDecoder decoder, long sequence) {
+			string packageName = decoder.ReadStr8() ;
 			bool notify = false ;
 			if (!Packages.ContainsKey(packageName)) {
 				lock (LockObject) {
@@ -430,15 +430,15 @@
 			
 			broker.IncrementOutstanding() ;
 			long seq = SequenceManager.Reserve(Session.CONTEXT_STARTUP) ; 
-			Encoder enc = broker.CreateEncoder('Q', seq) ;			
-			enc.writeStr8(packageName) ;	
+			IEncoder enc = broker.CreateEncoder('Q', seq) ;			
+			enc.WriteStr8(packageName) ;	
 			broker.Send(enc) ;
 		}		
 		
-		public void HandleCommandComplete(Broker broker, Decoder decoder, long sequence) {
+		public void HandleCommandComplete(Broker broker, IDecoder decoder, long sequence) {
 		
-			long code = decoder.readUint32() ;
-			string text = decoder.readStr8() ;
+			long code = decoder.ReadUint32() ;
+			string text = decoder.ReadStr8() ;
 			Object context = this.SequenceManager.Release(sequence) ;
 			
 			if (context.Equals(CONTEXT_STARTUP)) {
@@ -459,8 +459,8 @@
 			}
 		}	
 			
-		public void HandleClassIndicator(Broker broker, Decoder decoder, long sequence) {
-			short kind = decoder.readUint8() ;	
+		public void HandleClassIndicator(Broker broker, IDecoder decoder, long sequence) {
+			short kind = decoder.ReadUint8() ;	
 			ClassKey classKey = new ClassKey(decoder) ;
 			bool unknown = false ;
 			
@@ -476,15 +476,15 @@
 			if (unknown) {
 				broker.IncrementOutstanding() ;
 				long seq = SequenceManager.Reserve(Session.CONTEXT_STARTUP) ; 
-				Encoder enc = broker.CreateEncoder('S', seq) ;			
+				IEncoder enc = broker.CreateEncoder('S', seq) ;			
 				classKey.encode(enc) ;	
 				broker.Send(enc) ;				
 			}
 		}		
 		
-		public void HandleMethodResponse(Broker broker, Decoder decoder, long sequence) {	
-			long code = decoder.readUint32() ;
-			string text = decoder.readStr16() ;
+		public void HandleMethodResponse(Broker broker, IDecoder decoder, long sequence) {	
+			long code = decoder.ReadUint32() ;
+			string text = decoder.ReadStr16() ;
 			
 			Dictionary<string, object> outArgs = new Dictionary<string, object>() ;
 			object obj = SequenceManager.Release(sequence) ;
@@ -514,15 +514,15 @@
 			}	
 		}	
 			
-		public void HandleHeartbeatIndicator(Broker broker, Decoder decoder, long sequence, IMessage msg) {
+		public void HandleHeartbeatIndicator(Broker broker, IDecoder decoder, long sequence, IMessage msg) {
 			if (Console != null) {
 				long brokerBank = 1 ;
 				long agentBank = 0 ;
 				try {
-					string routingKey = msg.DeliveryProperties.getRoutingKey() ;
+					string routingKey = msg.DeliveryProperties.GetRoutingKey() ;
 					if (routingKey != null) {
-						agentBank = Agent.getBrokerBank(routingKey) ;
-						brokerBank = Agent.getBrokerBank(routingKey) ;				
+						agentBank = Agent.GetBrokerBank(routingKey) ;
+						brokerBank = Agent.GetBrokerBank(routingKey) ;				
 					}
 				}
 				catch (Exception e) {
@@ -530,7 +530,7 @@
 				}
 				
 				string agentKey = Agent.AgentKey(agentBank, brokerBank) ;
-				long timestamp = decoder.readUint64() ;
+				long timestamp = decoder.ReadUint64() ;
 				if (broker.Agents.ContainsKey(agentKey)) {
 					Agent agent = broker.Agents[agentKey] ;
 					Console.HearbeatRecieved(agent, timestamp) ;
@@ -539,15 +539,15 @@
 			
 		}		
 		
-		public void HandleEventIndicator(Broker broker, Decoder decoder, long sequence) {
+		public void HandleEventIndicator(Broker broker, IDecoder decoder, long sequence) {
 			if (Console != null) {
 				QMFEvent newEvent = new QMFEvent(this, decoder) ;
 				Console.EventRecieved(broker, newEvent) ;
 			}			
 		}		
 		
-		public void HandleSchemaResponse(Broker broker, Decoder decoder, long sequence) {
-			short kind = decoder.readUint8() ;	
+		public void HandleSchemaResponse(Broker broker, IDecoder decoder, long sequence) {
+			short kind = decoder.ReadUint8() ;	
 			ClassKey classKey = new ClassKey(decoder) ;
 			SchemaClass sClass = new SchemaClass(kind, classKey, decoder, this) ;				
 			lock(LockObject) {
@@ -563,7 +563,7 @@
 			}	
 		}	
 			
-		public void HandleContentIndicator(Broker broker, Decoder decoder, long sequence, bool hasProperties, bool hasStatistics) {
+		public void HandleContentIndicator(Broker broker, IDecoder decoder, long sequence, bool hasProperties, bool hasStatistics) {
 		
 			ClassKey key = new ClassKey(decoder) ;
 			SchemaClass sClass = null ;;
@@ -600,46 +600,46 @@
 			return true ;
 		}
 		
-		public object DecodeValue(Decoder dec, short type) {
+		public object DecodeValue(IDecoder dec, short type) {
 		
 		 	switch (type) {
-		 		case 1: return dec.readUint8() ;        // U8
-		 		case 2: return dec.readUint16() ;       // U16     
-		 		case 3: return dec.readUint32() ;       // U32
-		 		case 4: return dec.readUint64() ;       // U64 
-		 		case 6: return dec.readStr8() ;         // SSTR
-		 		case 7: return dec.readStr16() ;        // LSTR
-		 		case 8: return dec.readDatetime() ;	    // ABSTIME
-		 		case 9: return dec.readUint32() ;       // DELTATIME
+		 		case 1: return dec.ReadUint8() ;        // U8
+		 		case 2: return dec.ReadUint16() ;       // U16     
+		 		case 3: return dec.ReadUint32() ;       // U32
+		 		case 4: return dec.ReadUint64() ;       // U64 
+		 		case 6: return dec.ReadStr8() ;         // SSTR
+		 		case 7: return dec.ReadStr16() ;        // LSTR
+		 		case 8: return dec.ReadDatetime() ;	    // ABSTIME
+		 		case 9: return dec.ReadUint32() ;       // DELTATIME
 		 		case 10: return new ObjectID(dec) ;		// ref
-		 		case 11: return dec.readUint8() != 0 ;  // bool
-		 		case 12: return dec.readFloat() ;       // float		
-		 		case 13: return dec.readDouble() ;      // double		 
-		 		case 14: return dec.readUuid() ;	    // UUID			
+		 		case 11: return dec.ReadUint8() != 0 ;  // bool
+		 		case 12: return dec.ReadFloat() ;       // float		
+		 		case 13: return dec.ReadDouble() ;      // double		 
+		 		case 14: return dec.ReadUuid() ;	    // UUID			
 		 		case 15:	                            // Ftable
 		 			Dictionary<string, object> ftable = new Dictionary<string, object>() ;
 		 			MSDecoder sc = new MSDecoder() ;
-		 			sc.init(new MemoryStream(dec.readVbin32())) ;
-		 			if (sc.hasRemaining()) {
-		 				long count = sc.readUint32() ;
+		 			sc.Init(new MemoryStream(dec.ReadVbin32())) ;
+		 			if (sc.HasRemaining()) {
+		 				long count = sc.ReadUint32() ;
 		 				while (count > 0) {
-		 					string key = sc.readStr8() ;
-		 					short code = sc.readUint8() ;
+		 					string key = sc.ReadStr8() ;
+		 					short code = sc.ReadUint8() ;
 		 					object newValue = this.DecodeValue(sc, code) ;
 		 					ftable.Add(key, newValue) ;
 		 					count -= 1 ;
 		 				}
 		 			}
 		 			return ftable ;
-		 		case 16: return dec.readInt8() ;        // int8
-		 		case 17: return dec.readInt16() ;       // int16    
-		 		case 18: return dec.readInt32() ;       // int32
-		 		case 19: return dec.readInt64() ;       // int64 		 			
+		 		case 16: return dec.ReadInt8() ;        // int8
+		 		case 17: return dec.ReadInt16() ;       // int16    
+		 		case 18: return dec.ReadInt32() ;       // int32
+		 		case 19: return dec.ReadInt64() ;       // int64 		 			
 		 		case 20:                                // Object
 		 			// Peek into the inner type code, make sure 
 		 			// it is actually an object
 		 			object returnValue = null ;
-		 			short innerTypeCode = dec.readUint8() ;
+		 			short innerTypeCode = dec.ReadUint8() ;
 		 			if (innerTypeCode != 20) {
 		 				returnValue = this.DecodeValue(dec, innerTypeCode) ;
 		 			}
@@ -653,75 +653,81 @@
 		 				}
 		 			}
 		 			return returnValue;
-		 		case 21:                                 // List
-		 			MSDecoder lDec = new MSDecoder() ;
-		 			lDec.init(new MemoryStream(dec.readVbin32())) ;		 		
-		 			long count = lDec.readUint32() ;
-		 			List<object> newList = new List<object>() ;
-		 			while (count > 0){
-		 				short innerType = lDec.readUint8() ;
-		 				newList.Add(this.DecodeValue(lDec, innerType)) ;
-		 				count -= 1 ;
-		 			}
-		 			return newList ;
-		 		case 22:							    // Array
-		 			MSDecoder aDec = new MSDecoder() ;
-		 			aDec.init(new MemoryStream(dec.readVbin32())) ;		 		
-	 				long cnt = aDec.readUint32() ;
-	 				short innerType = aDec.readUint8() ;
-		 			List<object> aList = new List<object>() ;
-		 			while (cnt > 0){
-		 				aList.Add(this.DecodeValue(aDec, innerType)) ;
-		 				cnt -= 1 ;
-		 			}
-		 			return aList ;
-		 		default: 
+                case 21:                                 // List
+		 	        {
+		 	            MSDecoder lDec = new MSDecoder();
+		 	            lDec.Init(new MemoryStream(dec.ReadVbin32()));
+		 	            long count = lDec.ReadUint32();
+		 	            List<object> newList = new List<object>();
+		 	            while (count > 0)
+		 	            {
+		 	                short innerType = lDec.ReadUint8();
+		 	                newList.Add(this.DecodeValue(lDec, innerType));
+		 	                count -= 1;
+		 	            }
+		 	            return newList;
+		 	        }
+                case 22:							    // Array
+		 	        {
+		 	            MSDecoder aDec = new MSDecoder();
+		 	            aDec.Init(new MemoryStream(dec.ReadVbin32()));
+		 	            long cnt = aDec.ReadUint32();
+		 	            short innerType = aDec.ReadUint8();
+		 	            List<object> aList = new List<object>();
+		 	            while (cnt > 0)
+		 	            {
+		 	                aList.Add(this.DecodeValue(aDec, innerType));
+		 	                cnt -= 1;
+		 	            }
+		 	            return aList;
+		 	        }
+		 	    default: 
 		 			throw new Exception(String.Format("Invalid Type Code: {0}", type)) ;		
 		 	}	
 		 }		
 		 
 		 
-		public void EncodeValue(Encoder enc, short type, object val) {
+		public void EncodeValue(IEncoder enc, short type, object val) {
 			try {
 			 	switch ((int)type) {
-			 		case 1: enc.writeUint8((short) val) ; break;       // U8
-			 		case 2: enc.writeUint16((int) val) ;  break;       // U16     
-			 		case 3: enc.writeUint32((long) val) ; break;       // U32
-			 		case 4: enc.writeUint64((long) val) ; break;       // U64 
-			 		case 6: enc.writeStr8((string) val) ; break;       // SSTR
-			 		case 7: enc.writeStr16((string) val) ; break;      // LSTR
-			 		case 8: enc.writeDatetime((long) val); break;	   // ABSTIME
-			 		case 9: enc.writeUint32((long) val);   break;      // DELTATIME
+			 		case 1: enc.WriteUint8((short) val) ; break;       // U8
+			 		case 2: enc.WriteUint16((int) val) ;  break;       // U16     
+			 		case 3: enc.WriteUint32((long) val) ; break;       // U32
+			 		case 4: enc.WriteUint64((long) val) ; break;       // U64 
+			 		case 6: enc.WriteStr8((string) val) ; break;       // SSTR
+			 		case 7: enc.WriteStr16((string) val) ; break;      // LSTR
+			 		case 8: enc.WriteDatetime((long) val); break;	   // ABSTIME
+			 		case 9: enc.WriteUint32((long) val);   break;      // DELTATIME
 			 		case 10: ((ObjectID)val).encode(enc) ; break;	   // ref
 			 		case 11: 
 			 			if ((bool) val) {
-			 				enc.writeUint8(1) ;
+			 				enc.WriteUint8(1) ;
 			 			} else {
-			 				enc.writeUint8(0) ;
+			 				enc.WriteUint8(0) ;
 			 			}
 			 			break ;
-			 		case 12: enc.writeFloat((float) val); break;	   // FLOAT
-			 		case 13: enc.writeDouble((double) val);   break;   // DOUBLE			 			
-			 		case 14: enc.writeUuid((UUID) val) ; break ;	   // UUID		
+			 		case 12: enc.WriteFloat((float) val); break;	   // FLOAT
+			 		case 13: enc.WriteDouble((double) val);   break;   // DOUBLE			 			
+			 		case 14: enc.WriteUuid((UUID) val) ; break ;	   // UUID		
 			 		case 15:	                                       // Ftable
 			 			Dictionary<string, object> ftable = (Dictionary<string, object>) val ;
 			 			MSEncoder sc = new MSEncoder(1) ;
-			 			sc.init() ;
-			 			sc.writeUint32(ftable.Count) ;
+			 			sc.Init() ;
+			 			sc.WriteUint32(ftable.Count) ;
 			 			foreach (String key in ftable.Keys) {
 			 				object obj = ftable[key] ;
 			 				short innerType = Util.QMFType(obj) ;
-			 				sc.writeStr8(key) ;
-			 				sc.writeUint8(innerType) ;
+			 				sc.WriteStr8(key) ;
+			 				sc.WriteUint8(innerType) ;
 			 				this.EncodeValue(sc,innerType,obj) ;
 			 			}
-			 			byte[] bytes = sc.segment().ToArray() ;
-			 			enc.writeVbin32(bytes) ;
+			 			byte[] bytes = sc.Segment().ToArray() ;
+			 			enc.WriteVbin32(bytes) ;
 			 			break ;
-			 		case 16: enc.writeInt8((short) val) ; break;       // int8
-			 		case 17: enc.writeInt16((int) val) ;  break;       // int16     
-			 		case 18: enc.writeInt32(long.Parse(""+ val)) ; break;       // int32
-			 		case 19: enc.writeInt64(long.Parse("" + val)) ; break;       // int64 
+			 		case 16: enc.WriteInt8((short) val) ; break;       // int8
+			 		case 17: enc.WriteInt16((int) val) ;  break;       // int16     
+			 		case 18: enc.WriteInt32(long.Parse(""+ val)) ; break;       // int32
+			 		case 19: enc.WriteInt64(long.Parse("" + val)) ; break;       // int64 
 			 		case 20: 									       // Object
 			 			// Check that the object has a session, if not
 			 			// take ownership of it
@@ -734,30 +740,30 @@
 			 		case 21:                                             // List	
 			 			List<object> items = (List<object>) val ;
 			 			MSEncoder lEnc = new MSEncoder(1) ;
-			 			lEnc.init() ;			 			
-			 			lEnc.writeUint32(items.Count) ;
+			 			lEnc.Init() ;			 			
+			 			lEnc.WriteUint32(items.Count) ;
 			 			foreach (object obj in items) {
 			 				short innerType = Util.QMFType(obj) ;
-			 				lEnc.writeUint8(innerType) ;
+			 				lEnc.WriteUint8(innerType) ;
 			 				this.EncodeValue(lEnc,innerType,obj) ;		 				
 			 			}
-			 			enc.writeVbin32(lEnc.segment().ToArray()) ;
+			 			enc.WriteVbin32(lEnc.Segment().ToArray()) ;
 			 			break ;
 			 		case 22:							                 // Array
 			 			List<object> aItems = (List<object>) val ;
 			 			MSEncoder aEnc = new MSEncoder(1) ;
-			 			aEnc.init() ;			 						 			
+			 			aEnc.Init() ;			 						 			
 			 			long aCount = aItems.Count ;	 			
-			 			aEnc.writeUint32(aCount) ;
+			 			aEnc.WriteUint32(aCount) ;
 			 			if (aCount > 0) {
 			 				Object anObj = aItems[0] ;
 			 				short innerType = Util.QMFType(anObj) ;
-				 			aEnc.writeUint8(innerType) ;
+				 			aEnc.WriteUint8(innerType) ;
 				 			foreach (object obj in aItems) {
 				 				this.EncodeValue(aEnc,innerType,obj) ;		 				
 				 			}
 			 			}
-			 			enc.writeVbin32(aEnc.segment().ToArray()) ;			 			
+			 			enc.WriteVbin32(aEnc.Segment().ToArray()) ;			 			
 			 			break ;
 			 		default: 
 			 			throw new Exception(String.Format("Invalid Type Code: {0}", type)) ;			 			
@@ -804,15 +810,15 @@
 	    	return (QMFObject) ci.Invoke(args) ;
 	    }	
 	    
-	    protected QMFObject CreateQMFObject(SchemaClass schema, Decoder dec, bool hasProperties, bool hasStats , bool isManaged) {
+	    protected QMFObject CreateQMFObject(SchemaClass schema, IDecoder dec, bool hasProperties, bool hasStats , bool isManaged) {
 	    	Type realClass = typeof(QMFObject) ;	    	
 	    	if (Console != null) {
 	    		realClass = Console.TypeMapping(schema.Key) ;    		
 	    	}
-	    	Type[] types = new Type[] {typeof(Session), typeof(SchemaClass), typeof(Decoder), typeof(bool), typeof(bool),typeof(bool)} ;
+	    	Type[] types = new Type[] {typeof(Session), typeof(SchemaClass), typeof(IDecoder), typeof(bool), typeof(bool),typeof(bool)} ;
 	    	object[] args = new object[] {this, schema, dec, hasProperties, hasStats, isManaged} ;
 	    	ConstructorInfo ci = realClass.GetConstructor(types);	    
 	    	return (QMFObject) ci.Invoke(args) ;
 	    }		    		 																		 																
 	}
-}
\ No newline at end of file
+}

Modified: qpid/trunk/qpid/dotnet/client-010/management/console/console.csproj
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/dotnet/client-010/management/console/console.csproj?rev=886962&r1=886961&r2=886962&view=diff
==============================================================================
--- qpid/trunk/qpid/dotnet/client-010/management/console/console.csproj (original)
+++ qpid/trunk/qpid/dotnet/client-010/management/console/console.csproj Thu Dec  3 22:31:12 2009
@@ -1,74 +1,81 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<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>8.0.50727</ProductVersion>
+    <ProductVersion>9.0.30729</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{42E3CD17-EFDC-4533-95AA-4AF67FF534B5}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AssemblyName>console</AssemblyName>
+    <ProjectGuid>{E8D2202F-3959-4F29-AA0D-875CD37905CA}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Console</RootNamespace>
+    <AssemblyName>Console</AssemblyName>
+    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>bin\Debug</OutputPath>
-    <DefineConstants>DEBUG</DefineConstants>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>none</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Release</OutputPath>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
-    <Reference Include="qpid.client, Version=0.5.0.0, Culture=neutral, PublicKeyToken=null" />
-    <Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821" />
+    <Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\lib\log4net\log4net.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="AbstractConsole.cs" />
     <Compile Include="Agent.cs" />
     <Compile Include="Broker.cs" />
     <Compile Include="BrokerURL.cs" />
-    <Compile Include="Session.cs" />
-    <Compile Include="Console.cs" />
-    <Compile Include="SequenceManager.cs" />
     <Compile Include="ClassKey.cs" />
+    <Compile Include="Console.cs" />
+    <Compile Include="MethodResult.cs" />
+    <Compile Include="ObjectID.cs" />
+    <Compile Include="QMFEvent.cs" />
+    <Compile Include="QMFObject.cs" />
+    <Compile Include="SchemaArgument.cs" />
     <Compile Include="SchemaClass.cs" />
     <Compile Include="SchemaMethod.cs" />
-    <Compile Include="SchemaArgument.cs" />
     <Compile Include="SchemaProperty.cs" />
     <Compile Include="SchemaStatistic.cs" />
     <Compile Include="SchemaVariable.cs" />
+    <Compile Include="SequenceManager.cs" />
+    <Compile Include="Session.cs" />
     <Compile Include="Util.cs" />
-    <Compile Include="QMFObject.cs" />
-    <Compile Include="ObjectID.cs" />
-    <Compile Include="MethodResult.cs" />
-    <Compile Include="QMFEvent.cs" />
-    <Compile Include="AbstractConsole.cs" />
     <Compile Include="XMLUtil.cs" />
   </ItemGroup>
-  <ProjectExtensions>
-    <MonoDevelop>
-      <Properties InternalTargetFrameworkVersion="3.5" />
-    </MonoDevelop>
-  </ProjectExtensions>
   <ItemGroup>
-    <None Include="console.userprefs">
-      <Visible>False</Visible>
-    </None>
-    <None Include="console.usertasks">
-      <Visible>False</Visible>
-    </None>
-    <None Include="default.build">
-      <Visible>False</Visible>
-    </None>
-    <None Include="bin\Debug\qpid.client.dll.mdb">
-      <Visible>False</Visible>
-    </None>
+    <ProjectReference Include="..\..\client\Client.csproj">
+      <Project>{B911FFD7-754F-4735-A188-218D5065BE79}</Project>
+      <Name>Client</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+  <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>

Modified: qpid/trunk/qpid/dotnet/client-010/management/console/console.sln
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/dotnet/client-010/management/console/console.sln?rev=886962&r1=886961&r2=886962&view=diff
==============================================================================
--- qpid/trunk/qpid/dotnet/client-010/management/console/console.sln (original)
+++ qpid/trunk/qpid/dotnet/client-010/management/console/console.sln Thu Dec  3 22:31:12 2009
@@ -1,7 +1,9 @@
 
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "console", "console.csproj", "{42E3CD17-EFDC-4533-95AA-4AF67FF534B5}"
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Console", "Console.csproj", "{E8D2202F-3959-4F29-AA0D-875CD37905CA}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Client", "..\..\client\Client.csproj", "{B911FFD7-754F-4735-A188-218D5065BE79}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -9,12 +11,16 @@
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{42E3CD17-EFDC-4533-95AA-4AF67FF534B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{42E3CD17-EFDC-4533-95AA-4AF67FF534B5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{42E3CD17-EFDC-4533-95AA-4AF67FF534B5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{42E3CD17-EFDC-4533-95AA-4AF67FF534B5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E8D2202F-3959-4F29-AA0D-875CD37905CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E8D2202F-3959-4F29-AA0D-875CD37905CA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E8D2202F-3959-4F29-AA0D-875CD37905CA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E8D2202F-3959-4F29-AA0D-875CD37905CA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B911FFD7-754F-4735-A188-218D5065BE79}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B911FFD7-754F-4735-A188-218D5065BE79}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B911FFD7-754F-4735-A188-218D5065BE79}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B911FFD7-754F-4735-A188-218D5065BE79}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
-	GlobalSection(MonoDevelopProperties) = preSolution
-		StartupItem = console.csproj
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
 	EndGlobalSection
 EndGlobal

Modified: qpid/trunk/qpid/dotnet/client-010/perftest/PerfTest.cs
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/dotnet/client-010/perftest/PerfTest.cs?rev=886962&r1=886961&r2=886962&view=diff
==============================================================================
--- qpid/trunk/qpid/dotnet/client-010/perftest/PerfTest.cs (original)
+++ qpid/trunk/qpid/dotnet/client-010/perftest/PerfTest.cs Thu Dec  3 22:31:12 2009
@@ -35,15 +35,20 @@
     [CommandLineManager(ApplicationName = "Qpid Perf Tests", Copyright = "Apache Software Foundation")]
     public class Options
     {
-        [CommandLineOption(Description = "Displays this help text")] public bool Help;
+        [CommandLineOption(Description = "Displays this help text")] 
+        public bool Help;
 
-        [CommandLineOption(Description = "Create shared queues.", MinOccurs = 0)] public Boolean Setup;
+        [CommandLineOption(Description = "Create shared queues.", MinOccurs = 0)] 
+        public Boolean Setup;
 
-        [CommandLineOption(Description = "Run test, print report.", MinOccurs = 0)] public Boolean Control;
+        [CommandLineOption(Description = "Run test, print report.", MinOccurs = 0)] 
+        public Boolean Control;
 
-        [CommandLineOption(Description = "Publish messages.", MinOccurs = 0)] public Boolean Publish;
+        [CommandLineOption(Description = "Publish messages.", MinOccurs = 0)] 
+        public Boolean Publish;
 
-        [CommandLineOption(Description = "Subscribe for messages.", MinOccurs = 0)] public Boolean Subscribe;
+        [CommandLineOption(Description = "Subscribe for messages.", MinOccurs = 0)] 
+        public Boolean Subscribe;
 
         [CommandLineOption(Description = "Test mode: [shared|fanout|topic]", MinOccurs = 0)]
         public string Mode
@@ -113,14 +118,18 @@
 
         private long _size = 1024;
 
-        [CommandLineOption(Description = "Publisher use confirm-mode.", MinOccurs = 0)] public Boolean Confirm = true;
+        [CommandLineOption(Description = "Publisher use confirm-mode.", MinOccurs = 0)] 
+        public Boolean Confirm = true;
 
-        [CommandLineOption(Description = "Publish messages as durable.", MinOccurs = 0)] public Boolean Durable;
+        [CommandLineOption(Description = "Publish messages as durable.", MinOccurs = 0)] 
+        public Boolean Durable;
 
-        [CommandLineOption(Description = "Make data for each message unique.", MinOccurs = 0)] public Boolean UniqueData;
+        [CommandLineOption(Description = "Make data for each message unique.", MinOccurs = 0)] 
+        public Boolean UniqueData;
 
         [CommandLineOption(Description = "Wait for confirmation of each message before sending the next one.",
-            MinOccurs = 0)] public Boolean SyncPub;
+            MinOccurs = 0)]
+        public Boolean SyncPub;
 
         [CommandLineOption(Description = ">=0 delay between msg publish.", MinOccurs = 0)]
         public double IntervalPub
@@ -192,8 +201,8 @@
 
         private int _tx;
 
-        [CommandLineOption(Description = "Make queue durable (implied if durable set.", MinOccurs = 0)] public Boolean
-            QueueDurable;
+        [CommandLineOption(Description = "Make queue durable (implied if durable set.", MinOccurs = 0)] 
+        public Boolean QueueDurable;
 
         [CommandLineOption(Description = "Queue policy: count to trigger 'flow to disk'", MinOccurs = 0)]
         public double QueueMaxCount
@@ -229,11 +238,11 @@
 
     public abstract class PerfTestClient : Startable
     {
-        private readonly Client _connection;
-        private readonly ClientSession _session;
+        private readonly IClient _connection;
+        private readonly IClientSession _session;
         private readonly Options _options;
 
-        public ClientSession Session
+        public IClientSession Session
         {
             get { return _session; }
         }
@@ -247,8 +256,8 @@
         {
             _options = options;
             _connection = new Client();
-            _connection.connect(options.Broker, options.Port, "test", "guest", "guest");
-            _session = _connection.createSession(50000);
+            _connection.Connect(options.Broker, options.Port, "test", "guest", "guest");
+            _session = _connection.CreateSession(50000);
         }
 
         public abstract void Start();
@@ -263,10 +272,10 @@
 
         private void queueInit(String name, Boolean durable, Dictionary<String, Object> arguments)
         {
-            Session.queueDeclare(name, null, arguments, durable ? Option.DURABLE : Option.NONE);
-            Session.queuePurge(name);
-            Session.exchangeBind(name, "amq.direct", name);
-            Session.sync();
+            Session.QueueDeclare(name, null, arguments, durable ? Option.DURABLE : Option.NONE);
+            Session.QueuePurge(name);
+            Session.ExchangeBind(name, "amq.direct", name);
+            Session.Sync();
         }
 
         public override void Start()
@@ -298,10 +307,10 @@
         public SubscribeThread(Options options, string key, string exchange)
             : base(options)
         {
-            _queue = "perftest" + (new UUID(10, 10)).ToString();
-            Session.queueDeclare(_queue, null, null, Option.EXCLUSIVE, Option.AUTO_DELETE,
+            _queue = "perftest" + (new UUID(10, 10));
+            Session.QueueDeclare(_queue, null, null, Option.EXCLUSIVE, Option.AUTO_DELETE,
                                  Options.Durable ? Option.DURABLE : Option.NONE);
-            Session.exchangeBind(_queue, exchange, key);
+            Session.ExchangeBind(_queue, exchange, key);
         }
 
         public SubscribeThread(Options options, string key)
@@ -314,34 +323,35 @@
         {
             if (Options.Tx > 0)
             {
-                Session.txSelect();
-                Session.sync();
+                Session.TxSelect();
+                Session.Sync();
             }
             CircularBuffer<IMessage> buffer = new CircularBuffer<IMessage>(100);
             // Create a listener and subscribe it to the queue named "message_queue"
             IMessageListener listener = new SyncListener(buffer);
-            string dest = "dest" + UUID.randomUUID().ToString();
-            Session.attachMessageListener(listener, dest);
-            Session.messageSubscribe(_queue, dest,
+
+            string dest = "dest" + UUID.RandomUuid();
+            Session.AttachMessageListener(listener, dest);
+            Session.MessageSubscribe(_queue, dest,
                                      Options.Tx > 0 || Options.SubAck > 0
                                          ? MessageAcceptMode.EXPLICIT
                                          : MessageAcceptMode.NONE,
                                      MessageAcquireMode.PRE_ACQUIRED, null, 0, null);
             // issue credits     
-            Session.messageSetFlowMode(dest, MessageFlowMode.WINDOW);
-            Session.messageFlow(dest, MessageCreditUnit.BYTE, ClientSession.MESSAGE_FLOW_MAX_BYTES);
+            Session.MessageSetFlowMode(dest, MessageFlowMode.WINDOW);
+            Session.MessageFlow(dest, MessageCreditUnit.BYTE, ClientSession.MESSAGE_FLOW_MAX_BYTES);
 
             // Notify controller we are ready.
             IMessage message = new Message();
-            message.DeliveryProperties.setRoutingKey("sub_ready");
+            message.DeliveryProperties.SetRoutingKey("sub_ready");
 
-            message.appendData(Encoding.UTF8.GetBytes("ready"));
-            Session.messageTransfer("amq.direct", message);
+            message.AppendData(Encoding.UTF8.GetBytes("ready"));
+            Session.MessageTransfer("amq.direct", message);
 
             if (Options.Tx > 0)
             {
-                Session.txCommit();
-                Session.sync();
+                Session.TxCommit();
+                Session.Sync();
             }
 
 
@@ -349,7 +359,7 @@
             {
                
                 //need to allocate some more credit
-                Session.messageFlow(dest, MessageCreditUnit.MESSAGE, (long)Options.SubQuota);
+                Session.MessageFlow(dest, MessageCreditUnit.MESSAGE, (long)Options.SubQuota);
                 
                 RangeSet range = new RangeSet();
                 IMessage msg;
@@ -359,37 +369,37 @@
                     msg = buffer.Dequeue();
                     if (Options.Tx > 0 && ((i + 1)%Options.Tx == 0))
                     {
-                        Session.txCommit();
-                        Session.sync();
+                        Session.TxCommit();
+                        Session.Sync();
                     }
                     if (Options.IntervalSub > 0)
                     {
                         Thread.Sleep((int) Options.IntervalSub*1000);
                     }
-                    range.add(msg.Id);
+                    range.Add(msg.Id);
                 }
                 if (Options.Tx > 0 || Options.SubAck > 0)
-                    Session.messageAccept(range);
-                range.clear();
+                    Session.MessageAccept(range);
+                range.Clear();
                 if (Options.Tx > 0)
                 {
-                    Session.txSelect();
-                    Session.sync();
+                    Session.TxSelect();
+                    Session.Sync();
                 }
                 DateTime end = DateTime.Now;
 
                 // Report to publisher.
-                message.DeliveryProperties.setRoutingKey("sub_done");
-                message.clearData();
-                message.appendData(BitConverter.GetBytes(Options.SubQuota / end.Subtract(start).TotalMilliseconds ));
-                Session.messageTransfer("amq.direct", message);
+                message.DeliveryProperties.SetRoutingKey("sub_done");
+                message.ClearData();
+                message.AppendData(BitConverter.GetBytes(Options.SubQuota / end.Subtract(start).TotalMilliseconds ));
+                Session.MessageTransfer("amq.direct", message);
                 if (Options.Tx > 0)
                 {
-                    Session.txSelect();
-                    Session.sync();
+                    Session.TxSelect();
+                    Session.Sync();
                 }
             }
-            Session.close();
+            Session.Close();
         }
     }
 
@@ -402,7 +412,7 @@
             _buffer = buffer;
         }
 
-        public void messageTransfer(IMessage m)
+        public void MessageTransfer(IMessage m)
         {
             _buffer.Enqueue(m);
         }
@@ -429,31 +439,31 @@
             Random r = new Random(34);
             r.NextBytes(data);
             IMessage message = new Message();
-            message.appendData(data);
+            message.AppendData(data);
 
-            message.DeliveryProperties.setRoutingKey(_key);
+            message.DeliveryProperties.SetRoutingKey(_key);
 
             if (Options.Durable)
-                message.DeliveryProperties.setDeliveryMode(MessageDeliveryMode.PERSISTENT);
+                message.DeliveryProperties.SetDeliveryMode(MessageDeliveryMode.PERSISTENT);
 
             if (Options.Tx > 0)
             {
-                Session.txSelect();
-                Session.sync();
+                Session.TxSelect();
+                Session.Sync();
             }
 
             CircularBuffer<IMessage> buffer = new CircularBuffer<IMessage>(100);
             // Create a listener and subscribe it to the queue named "pub_start"          
             IMessageListener listener = new SyncListener(buffer);
-            string localQueue = "localQueue-" + UUID.randomUUID().ToString();
-            Session.queueDeclare(localQueue, null, null, Option.AUTO_DELETE);
-            Session.exchangeBind(localQueue, "amq.direct", "pub_start");
-            Session.attachMessageListener(listener, localQueue);
-            Session.messageSubscribe(localQueue);
+            string localQueue = "localQueue-" + UUID.RandomUuid().ToString();
+            Session.QueueDeclare(localQueue, null, null, Option.AUTO_DELETE);
+            Session.ExchangeBind(localQueue, "amq.direct", "pub_start");
+            Session.AttachMessageListener(listener, localQueue);
+            Session.MessageSubscribe(localQueue);
             if (Options.Tx > 0)
             {
-                Session.txCommit();
-                Session.sync();
+                Session.TxCommit();
+                Session.Sync();
             }
             buffer.Dequeue();
 
@@ -462,39 +472,39 @@
                 DateTime start = DateTime.Now;                
                 for (long i = 0; i < Options.Count; ++i)
                 {
-                    Session.messageTransfer(_exchange, message);
+                    Session.MessageTransfer(_exchange, message);
 
                     if (Options.SyncPub)
                     {
-                        Session.sync();
+                        Session.Sync();
                     }
                     if (Options.Tx > 0 && (i + 1)%Options.Tx == 0)
                     {
-                        Session.txSelect();
-                        Session.sync();
+                        Session.TxSelect();
+                        Session.Sync();
                     }
                     if (Options.IntervalPub > 0)
                     {
                         Thread.Sleep((int) Options.IntervalSub*1000);
                     }
                 }
-                Session.sync();
+                Session.Sync();
                 DateTime end = DateTime.Now;
 
                 // Report to publisher.
-                message.DeliveryProperties.setRoutingKey("pub_done");
-                message.clearData();
+                message.DeliveryProperties.SetRoutingKey("pub_done");
+                message.ClearData();
                 double time = end.Subtract(start).TotalMilliseconds;
                 byte[] rate = BitConverter.GetBytes( Options.Count / time );
-                message.appendData(rate);
-                Session.messageTransfer("amq.direct", message);
+                message.AppendData(rate);
+                Session.MessageTransfer("amq.direct", message);
                 if (Options.Tx > 0)
                 {
-                    Session.txSelect();
-                    Session.sync();
+                    Session.TxSelect();
+                    Session.Sync();
                 }
             }
-            Session.close();
+            Session.Close();
         }
     }
 
@@ -509,11 +519,11 @@
         {
             CircularBuffer<IMessage> buffer = new CircularBuffer<IMessage>(100);
             IMessageListener listener = new SyncListener(buffer);
-            string localQueue = "queue-" + UUID.randomUUID().ToString();
-            Session.queueDeclare(localQueue, null, null, Option.AUTO_DELETE);
-            Session.exchangeBind(localQueue, "amq.direct", queue);
-            Session.attachMessageListener(listener, localQueue);
-            Session.messageSubscribe(localQueue);
+            string localQueue = "queue-" + UUID.RandomUuid();
+            Session.QueueDeclare(localQueue, null, null, Option.AUTO_DELETE);
+            Session.ExchangeBind(localQueue, "amq.direct", queue);
+            Session.AttachMessageListener(listener, localQueue);
+            Session.MessageSubscribe(localQueue);
             for (int i = 0; i < size; ++i)
             {
                 buffer.Dequeue();
@@ -524,34 +534,34 @@
         {
             CircularBuffer<IMessage> buffer = new CircularBuffer<IMessage>(100);
             IMessageListener listener = new SyncListener(buffer);
-            string localQueue = "queue-" + UUID.randomUUID().ToString();
-            Session.queueDeclare(localQueue, null, null, Option.AUTO_DELETE);
-            Session.exchangeBind(localQueue, "amq.direct", queue);
-            Session.attachMessageListener(listener, localQueue);
-            Session.messageSubscribe(localQueue);
+            string localQueue = "queue-" + UUID.RandomUuid();
+            Session.QueueDeclare(localQueue, null, null, Option.AUTO_DELETE);
+            Session.ExchangeBind(localQueue, "amq.direct", queue);
+            Session.AttachMessageListener(listener, localQueue);
+            Session.MessageSubscribe(localQueue);
             double rate = 0;
             RangeSet range = new RangeSet();
             for (int i = 0; i < size; ++i)
             {
                 IMessage m = buffer.Dequeue();
-                range.add(m.Id);
+                range.Add(m.Id);
                 BinaryReader reader = new BinaryReader(m.Body, Encoding.UTF8);
                 byte[] body = new byte[m.Body.Length - m.Body.Position];
                 reader.Read(body, 0, body.Length);
                 rate += BitConverter.ToDouble(body,0);
             }
-            Session.messageAccept(range);
+            Session.MessageAccept(range);
             return rate;
         }
 
         private void send(int size, string queue, string data)
         {
             IMessage message = new Message();
-            message.DeliveryProperties.setRoutingKey(queue);
-            message.appendData(Encoding.UTF8.GetBytes(data));
+            message.DeliveryProperties.SetRoutingKey(queue);
+            message.AppendData(Encoding.UTF8.GetBytes(data));
             for (int i = 0; i < size; ++i)
             {
-                Session.messageTransfer("amq.direct", message);
+                Session.MessageTransfer("amq.direct", message);
             }
         }
 

Modified: qpid/trunk/qpid/dotnet/client-010/perftest/perftest.csproj
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/dotnet/client-010/perftest/perftest.csproj?rev=886962&r1=886961&r2=886962&view=diff
==============================================================================
--- qpid/trunk/qpid/dotnet/client-010/perftest/perftest.csproj (original)
+++ qpid/trunk/qpid/dotnet/client-010/perftest/perftest.csproj Thu Dec  3 22:31:12 2009
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.50727</ProductVersion>
+    <ProductVersion>9.0.30729</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{7F7E8DE7-FDF2-4A52-A4CE-D3756B05273C}</ProjectGuid>
     <OutputType>Exe</OutputType>
@@ -56,6 +56,11 @@
       <Name>Client</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="..\App.config">
+      <Link>App.config</Link>
+    </None>
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
@@ -64,4 +69,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>

Modified: qpid/trunk/qpid/dotnet/client-010/test/Test.csproj
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/dotnet/client-010/test/Test.csproj?rev=886962&r1=886961&r2=886962&view=diff
==============================================================================
--- qpid/trunk/qpid/dotnet/client-010/test/Test.csproj (original)
+++ qpid/trunk/qpid/dotnet/client-010/test/Test.csproj Thu Dec  3 22:31:12 2009
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.50727</ProductVersion>
+    <ProductVersion>9.0.30729</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95CB4C90-7C53-44A9-B11C-96235F158ACA}</ProjectGuid>
     <OutputType>Library</OutputType>
@@ -64,6 +64,11 @@
       <Name>Client</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="..\App.config">
+      <Link>App.config</Link>
+    </None>
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
@@ -72,4 +77,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>

Modified: qpid/trunk/qpid/dotnet/client-010/test/interop/Admin.cs
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/dotnet/client-010/test/interop/Admin.cs?rev=886962&r1=886961&r2=886962&view=diff
==============================================================================
--- qpid/trunk/qpid/dotnet/client-010/test/interop/Admin.cs (original)
+++ qpid/trunk/qpid/dotnet/client-010/test/interop/Admin.cs Thu Dec  3 22:31:12 2009
@@ -26,34 +26,34 @@
 
 namespace test.interop
 {
-    public class Admin:TestCase
+    public class Admin : TestCase
     {
-        private static readonly Logger _log = Logger.get(typeof(Admin));
+        private static readonly Logger _log = Logger.Get(typeof(Admin));
 
         [Test]
         public void createSession()
         {
-            _log.debug("Running: createSession");
-            ClientSession ssn = Client.createSession(0);
-            ssn.close();            
+            _log.Debug("Running: CreateSession");
+            IClientSession ssn = Client.CreateSession(0);
+            ssn.Close();            
             // This test fails if an exception is thrown 
         }
 
         [Test]
         public void queueLifecycle()
         {
-            _log.debug("Running: queueLifecycle");
-            ClientSession ssn = Client.createSession(0);
-            ssn.queueDeclare("queue1", null, null);
-            ssn.sync();
-            ssn.queueDelete("queue1");
-            ssn.sync();
+            _log.Debug("Running: queueLifecycle");
+            IClientSession ssn = Client.CreateSession(0);
+            ssn.QueueDeclare("queue1", null, null);
+            ssn.Sync();
+            ssn.QueueDelete("queue1");
+            ssn.Sync();
             try
             {
-                ssn.exchangeBind("queue1", "amq.direct", "queue1", null);
-                ssn.sync();
+                ssn.ExchangeBind("queue1", "amq.direct", "queue1", null);
+                ssn.Sync();
             }
-            catch (SessionException e)
+            catch (SessionException)
             {
               // as expected
             }           
@@ -63,25 +63,25 @@
         [Test]
         public void exchangeCheck()
         {
-            _log.debug("Running: exchangeCheck");           
-            ClientSession ssn = Client.createSession(0);            
-            ExchangeQueryResult query = (ExchangeQueryResult) ssn.exchangeQuery("amq.direct").Result;
-            Assert.IsFalse(query.getNotFound());
-            Assert.IsTrue(query.getDurable());
-            query = (ExchangeQueryResult)ssn.exchangeQuery("amq.topic").Result;
-            Assert.IsFalse(query.getNotFound());
-            Assert.IsTrue(query.getDurable());           
-            query = (ExchangeQueryResult) ssn.exchangeQuery("foo").Result;           
-            Assert.IsTrue(query.getNotFound());
+            _log.Debug("Running: exchangeCheck");           
+            IClientSession ssn = Client.CreateSession(0);            
+            ExchangeQueryResult query = (ExchangeQueryResult) ssn.ExchangeQuery("amq.direct").Result;
+            Assert.IsFalse(query.GetNotFound());
+            Assert.IsTrue(query.GetDurable());
+            query = (ExchangeQueryResult)ssn.ExchangeQuery("amq.topic").Result;
+            Assert.IsFalse(query.GetNotFound());
+            Assert.IsTrue(query.GetDurable());           
+            query = (ExchangeQueryResult) ssn.ExchangeQuery("foo").Result;           
+            Assert.IsTrue(query.GetNotFound());
         }
 
         [Test]
         public void exchangeBind()
         {
-            _log.debug("Running: exchangeBind");       
-            ClientSession ssn = Client.createSession(0);
-            ssn.queueDeclare("queue1", null, null);
-            ssn.exchangeBind("queue1", "amq.direct", "queue1", null);
+            _log.Debug("Running: ExchangeBind");       
+            IClientSession ssn = Client.CreateSession(0);
+            ssn.QueueDeclare("queue1", null, null);
+            ssn.ExchangeBind("queue1", "amq.direct", "queue1", null);
             // This test fails if an exception is thrown 
         }
 

Modified: qpid/trunk/qpid/dotnet/client-010/test/interop/ApplicationHeaders.cs
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/dotnet/client-010/test/interop/ApplicationHeaders.cs?rev=886962&r1=886961&r2=886962&view=diff
==============================================================================
--- qpid/trunk/qpid/dotnet/client-010/test/interop/ApplicationHeaders.cs (original)
+++ qpid/trunk/qpid/dotnet/client-010/test/interop/ApplicationHeaders.cs Thu Dec  3 22:31:12 2009
@@ -28,23 +28,23 @@
 {
     public class ApplicationHeaders:TestCase
     {
-        private static readonly Logger _log = Logger.get(typeof(ApplicationHeaders));
+        private static readonly Logger _log = Logger.Get(typeof(ApplicationHeaders));
 
         [Test]
         public void setHeaders()
         {          
-            _log.debug("Running: setHeaders");
-            ClientSession ssn = Client.createSession(0);
-            ssn.queueDeclare("queue1");
-            ssn.exchangeBind("queue1", "amq.direct", "queue1");
-            ssn.sync();
+            _log.Debug("Running: setHeaders");
+            IClientSession ssn = Client.CreateSession(0);
+            ssn.QueueDeclare("queue1");
+            ssn.ExchangeBind("queue1", "amq.direct", "queue1");
+            ssn.Sync();
             CircularBuffer<IMessage> buff = new CircularBuffer<IMessage>(10); 
             SyncListener listener = new SyncListener(ssn, buff);
-            ssn.attachMessageListener(listener, "queue1");
-            ssn.messageSubscribe("queue1");
+            ssn.AttachMessageListener(listener, "queue1");
+            ssn.MessageSubscribe("queue1");
 
             IMessage message = new org.apache.qpid.client.Message();
-            message.DeliveryProperties.setRoutingKey("queue1");
+            message.DeliveryProperties.SetRoutingKey("queue1");
             const long someLong = 14444444;
             message.ApplicationHeaders.Add("someLong", someLong);
             const int someInt = 14;
@@ -63,7 +63,7 @@
             message.ApplicationHeaders.Add("someBoolean", someBoolean);
 
             // transfer the message 
-            ssn.messageTransfer("amq.direct", message); 
+            ssn.MessageTransfer("amq.direct", message); 
 
             // get the message and check the headers 
             IMessage messageBack = buff.Dequeue();

Modified: qpid/trunk/qpid/dotnet/client-010/test/interop/Message.cs
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/dotnet/client-010/test/interop/Message.cs?rev=886962&r1=886961&r2=886962&view=diff
==============================================================================
--- qpid/trunk/qpid/dotnet/client-010/test/interop/Message.cs (original)
+++ qpid/trunk/qpid/dotnet/client-010/test/interop/Message.cs Thu Dec  3 22:31:12 2009
@@ -30,38 +30,39 @@
 {
     public class Message : TestCase
     {
-        private static readonly Logger _log = Logger.get(typeof (Message));
+        private static readonly Logger _log = Logger.Get(typeof (Message));
 
         [Test]
         public void sendAndPurge()
         {
-            _log.debug("Running: exchangeBind");
-            ClientSession ssn = Client.createSession(0);
-            ssn.queueDelete("queue1");
-            QueueQueryResult result = (QueueQueryResult) ssn.queueQuery("queue1").Result;
-            Assert.IsNull(result.getQueue());
-            ssn.queueDeclare("queue1", null, null);
-            ssn.exchangeBind("queue1", "amq.direct", "queue1", null);
+            _log.Debug("Running: ExchangeBind");
+            IClientSession ssn = Client.CreateSession(0);
+            ssn.QueueDelete("queue1");
+            QueueQueryResult result = (QueueQueryResult) ssn.QueueQuery("queue1").Result;
+            Assert.IsNull(result.GetQueue());
+            ssn.QueueDeclare("queue1", null, null);
+            ssn.ExchangeBind("queue1", "amq.direct", "queue1", null);
+
             for (int i = 0; i < 10; i++)
             {
-                ssn.messageTransfer("amq.direct", MessageAcceptMode.NONE, MessageAcquireMode.PRE_ACQUIRED,
-                                    new Header(new DeliveryProperties().setRoutingKey("queue1"),
-                                               new MessageProperties().setMessageId(UUID.randomUUID())),
+                ssn.MessageTransfer("amq.direct", MessageAcceptMode.NONE, MessageAcquireMode.PRE_ACQUIRED,
+                                    new Header(new DeliveryProperties().SetRoutingKey("queue1"),
+                                               new MessageProperties().SetMessageId(UUID.RandomUuid())),
                                     Encoding.UTF8.GetBytes("test: " + i));
             }
-            ssn.sync();
-            result = (QueueQueryResult) ssn.queueQuery("queue1").Result;
-            Assert.IsTrue(result.getMessageCount() == 10);
-            ssn.queuePurge("queue1");
-            ssn.sync();
-            result = (QueueQueryResult) ssn.queueQuery("queue1").Result;
-            Assert.IsTrue(result.getMessageCount() == 0);
+            ssn.Sync();
+            result = (QueueQueryResult) ssn.QueueQuery("queue1").Result;
+            Assert.IsTrue(result.GetMessageCount() == 10);
+            ssn.QueuePurge("queue1");
+            ssn.Sync();
+            result = (QueueQueryResult) ssn.QueueQuery("queue1").Result;
+            Assert.IsTrue(result.GetMessageCount() == 0);
         }
 
         [Test]
         public void sendAndReceiveSmallMessages()
         {
-            _log.debug("Running: sendAndReceiveSmallMessages");
+            _log.Debug("Running: sendAndReceiveSmallMessages");
             byte[] smallMessage = Encoding.UTF8.GetBytes("test");
             sendAndReceive(smallMessage, 100);
         }
@@ -69,7 +70,7 @@
         [Test]
         public void sendAndReceiveLargeMessages()
         {
-            _log.debug("Running: sendAndReceiveSmallMessages");
+            _log.Debug("Running: sendAndReceiveSmallMessages");
             byte[] largeMessage = new byte[100 * 1024];
             Random random = new Random();
             random.NextBytes(largeMessage);
@@ -79,7 +80,7 @@
         [Test]
         public void sendAndReceiveVeryLargeMessages()
         {
-            _log.debug("Running: sendAndReceiveSmallMessages");
+            _log.Debug("Running: sendAndReceiveSmallMessages");
             byte[] verylargeMessage = new byte[1000 * 1024];
             Random random = new Random();
             random.NextBytes(verylargeMessage);
@@ -88,36 +89,36 @@
 
         private void sendAndReceive(byte[] messageBody, int count)
         {           
-            ClientSession ssn = Client.createSession(0);
-            ssn.sync();
-            ssn.queueDeclare("queue1", null, null);
-            ssn.queueDelete("queue1");           
-            QueueQueryResult result = (QueueQueryResult) ssn.queueQuery("queue1").Result;            
-            Assert.IsNull(result.getQueue());
-            ssn.queueDeclare("queue1", null, null);
-            ssn.exchangeBind("queue1", "amq.direct", "queue1", null);
+            IClientSession ssn = Client.CreateSession(0);
+            ssn.Sync();
+            ssn.QueueDeclare("queue1", null, null);
+            ssn.QueueDelete("queue1");           
+            QueueQueryResult result = (QueueQueryResult) ssn.QueueQuery("queue1").Result;            
+            Assert.IsNull(result.GetQueue());
+            ssn.QueueDeclare("queue1", null, null);
+            ssn.ExchangeBind("queue1", "amq.direct", "queue1", null);
             Object myLock = new Object();
             MyListener myListener = new MyListener(myLock, count);
-            ssn.attachMessageListener(myListener, "myDest");
+            ssn.AttachMessageListener(myListener, "myDest");
 
-            ssn.messageSubscribe("queue1", "myDest", MessageAcceptMode.EXPLICIT, MessageAcquireMode.PRE_ACQUIRED, null,
+            ssn.MessageSubscribe("queue1", "myDest", MessageAcceptMode.EXPLICIT, MessageAcquireMode.PRE_ACQUIRED, null,
                                  0, null);
 
 
             // issue credits     
-            ssn.messageSetFlowMode("myDest", MessageFlowMode.WINDOW);
-            ssn.messageFlow("myDest", MessageCreditUnit.BYTE, ClientSession.MESSAGE_FLOW_MAX_BYTES);
-            ssn.messageFlow("myDest", MessageCreditUnit.MESSAGE, 10000);
-            ssn.sync();
+            ssn.MessageSetFlowMode("myDest", MessageFlowMode.WINDOW);
+            ssn.MessageFlow("myDest", MessageCreditUnit.BYTE, ClientSession.MESSAGE_FLOW_MAX_BYTES);
+            ssn.MessageFlow("myDest", MessageCreditUnit.MESSAGE, 10000);
+            ssn.Sync();
 
             for (int i = 0; i < count; i++)
             {
-                ssn.messageTransfer("amq.direct", MessageAcceptMode.NONE, MessageAcquireMode.PRE_ACQUIRED,
-                                    new Header(new DeliveryProperties().setRoutingKey("queue1"),
-                                               new MessageProperties().setMessageId(UUID.randomUUID())),
+                ssn.MessageTransfer("amq.direct", MessageAcceptMode.NONE, MessageAcquireMode.PRE_ACQUIRED,
+                                    new Header(new DeliveryProperties().SetRoutingKey("queue1"),
+                                               new MessageProperties().SetMessageId(UUID.RandomUuid())),
                                     messageBody);
             }
-            ssn.sync();
+            ssn.Sync();
            
             lock (myLock)
             {
@@ -127,19 +128,19 @@
                 }
             }
             Assert.IsTrue(myListener.Count == 0);
-            ssn.messageAccept(myListener.UnAck);
-            ssn.sync();
+            ssn.MessageAccept(myListener.UnAck);
+            ssn.Sync();
             // the queue should be empty 
-            result = (QueueQueryResult)ssn.queueQuery("queue1").Result;
-            Assert.IsTrue(result.getMessageCount() == 0);
-            ssn.close();        
+            result = (QueueQueryResult)ssn.QueueQuery("queue1").Result;
+            Assert.IsTrue(result.GetMessageCount() == 0);
+            ssn.Close();        
         }
 
 
 
         private class MyListener : IMessageListener
         {
-            private static readonly Logger _log = Logger.get(typeof (MyListener));
+            private static readonly Logger _log = Logger.Get(typeof (MyListener));
             private readonly Object _wl;
             private int _count;
             private RangeSet _rs = new RangeSet();
@@ -150,11 +151,11 @@
                 _count = count;
             }
 
-            public void messageTransfer(IMessage     m)
+            public void MessageTransfer(IMessage     m)
             {
                 byte[] body = new byte[m.Body.Length - m.Body.Position];                               
-                _log.debug("Got a message of size: " + body.Length + " count = " + _count);
-                _rs.add(m.Id);
+                _log.Debug("Got a message of size: " + body.Length + " count = " + _count);
+                _rs.Add(m.Id);
                 lock (_wl)
                 {
                     _count--;

Modified: qpid/trunk/qpid/dotnet/client-010/test/interop/TestCase.cs
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/dotnet/client-010/test/interop/TestCase.cs?rev=886962&r1=886961&r2=886962&view=diff
==============================================================================
--- qpid/trunk/qpid/dotnet/client-010/test/interop/TestCase.cs (original)
+++ qpid/trunk/qpid/dotnet/client-010/test/interop/TestCase.cs Thu Dec  3 22:31:12 2009
@@ -45,13 +45,13 @@
         {
             XmlConfigurator.Configure(new FileInfo("/log.xml"));
             // populate default properties
-            _properties.Add("UserName", "guest");
+            _properties.Add("Username", "guest");
             _properties.Add("Password", "guest");
             _properties.Add("Host", "localhost");
             _properties.Add("Port", "5672");
             _properties.Add("VirtualHost", "test");
              //Read the test config file  
-            XmlTextReader reader = new XmlTextReader(Environment.CurrentDirectory + "/test.config");
+            XmlTextReader reader = new XmlTextReader(Environment.CurrentDirectory + "/Qpid Test.dll.config");
             while (reader.Read())
             {                
                 // if node type is an element
@@ -70,15 +70,17 @@
             }
             // create a client and connect to the broker
             _client = new Client();
-            _client.connect(Properties["Host"], Convert.ToInt16(Properties["Port"]), Properties["VirtualHost"],
-                           Properties["UserName"], Properties["Password"]);           
+            _client.Connect(Properties["Host"], Convert.ToInt16(Properties["Port"]), Properties["VirtualHost"],
+                           Properties["Username"], Properties["Password"]);           
    
         }
 
         [TestFixtureTearDown]
         public void Cleanup()
         {
-         _client.close();
+            // Note : breaks the Resharper nunit test runner. It blocks on the Monitor.WaitAll() 
+            // Certainly a problem with the threading context..
+            //_client.Close();
         }
 
         public Client Client
@@ -94,22 +96,22 @@
 
         public class SyncListener : IMessageListener
         {
-            private static readonly Logger _log = Logger.get(typeof(SyncListener));
+            private static readonly Logger _log = Logger.Get(typeof(SyncListener));
             private readonly CircularBuffer<IMessage> _buffer;
             private readonly RangeSet _range = new RangeSet();
-            private readonly ClientSession _session;
+            private readonly IClientSession _session;
 
-            public SyncListener(ClientSession session, CircularBuffer<IMessage> buffer)
+            public SyncListener(IClientSession session, CircularBuffer<IMessage> buffer)
             {
                 _buffer = buffer;
                 _session = session;
             }
 
-            public void messageTransfer(IMessage m)
+            public void MessageTransfer(IMessage m)
             {
-                _range.clear();
-                _range.add(m.Id);
-                _session.messageAccept(_range);
+                _range.Clear();
+                _range.Add(m.Id);
+                _session.MessageAccept(_range);
                 _buffer.Enqueue(m);
             }
         }

Modified: qpid/trunk/qpid/dotnet/client-010/test/transport/util/ByteEncoderTest.cs
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/dotnet/client-010/test/transport/util/ByteEncoderTest.cs?rev=886962&r1=886961&r2=886962&view=diff
==============================================================================
--- qpid/trunk/qpid/dotnet/client-010/test/transport/util/ByteEncoderTest.cs (original)
+++ qpid/trunk/qpid/dotnet/client-010/test/transport/util/ByteEncoderTest.cs Thu Dec  3 22:31:12 2009
@@ -29,12 +29,12 @@
 
     public class ByteEncoderTest
     {        
-        private static readonly Logger _log = Logger.get(typeof(ByteEncoderTest));
+        private static readonly Logger _log = Logger.Get(typeof(ByteEncoderTest));
 
         [Test]
         public void GetBigEndianInt32()
         {
-            _log.debug("Running: GetBigEndianInt32");
+            _log.Debug("Running: GetBigEndianInt32");
             const int anInt = -12345;
             Int32 aNewInt = ByteEncoder.GetBigEndian(anInt);
             Assert.IsTrue( anInt == ByteEncoder.GetBigEndian(aNewInt) );
@@ -43,7 +43,7 @@
         [Test]
         public void GetBigEndianUInt16()
         {
-            _log.debug("Running: GetBigEndianUInt16");
+            _log.Debug("Running: GetBigEndianUInt16");
             const UInt16 anInt = 123;
             UInt16 aNewInt = ByteEncoder.GetBigEndian(anInt);
             Assert.IsTrue(anInt == ByteEncoder.GetBigEndian(aNewInt));
@@ -52,7 +52,7 @@
         [Test]
         public void GetBigEndianUInt32()
         {
-            _log.debug("Running: GetBigEndianUInt32");
+            _log.Debug("Running: GetBigEndianUInt32");
             const UInt32 anInt = 12345;
             UInt32 aNewInt = ByteEncoder.GetBigEndian(anInt);
             Assert.IsTrue(anInt == ByteEncoder.GetBigEndian(aNewInt));
@@ -61,7 +61,7 @@
         [Test]
         public void GetBigEndianlong()
         {
-            _log.debug("Running: GetBigEndianlong");
+            _log.Debug("Running: GetBigEndianlong");
             const long anInt = 123456660700770;
             long aNewInt = ByteEncoder.GetBigEndian(anInt);
             Assert.IsTrue(anInt == ByteEncoder.GetBigEndian(aNewInt));
@@ -70,7 +70,7 @@
         [Test]
         public void GetLittleEndianInt32()
         {
-            _log.debug("Running: GetBigEndianInt32");
+            _log.Debug("Running: GetBigEndianInt32");
             const int anInt = -12345;
             Int32 aNewInt = ByteEncoder.GetLittleEndian(anInt);
             Assert.IsTrue(anInt == ByteEncoder.GetLittleEndian(aNewInt));
@@ -79,7 +79,7 @@
         [Test]
         public void GetLittleEndianUInt16()
         {
-            _log.debug("Running: GetLittleEndianUInt16");
+            _log.Debug("Running: GetLittleEndianUInt16");
             const UInt16 anInt = 123;
             UInt16 aNewInt = ByteEncoder.GetLittleEndian(anInt);
             Assert.IsTrue(anInt == ByteEncoder.GetLittleEndian(aNewInt));
@@ -88,7 +88,7 @@
         [Test]
         public void GetLittleEndianUInt32()
         {
-            _log.debug("Running: GetLittleEndianUInt32");
+            _log.Debug("Running: GetLittleEndianUInt32");
             const UInt32 anInt = 12345;
             UInt32 aNewInt = ByteEncoder.GetLittleEndian(anInt);
             Assert.IsTrue(anInt == ByteEncoder.GetLittleEndian(aNewInt));
@@ -97,7 +97,7 @@
         [Test]
         public void GetLittleEndianlong()
         {
-            _log.debug("Running: GetLittleEndianlong");
+            _log.Debug("Running: GetLittleEndianlong");
             const long anInt = 123456660700770;
             long aNewInt = ByteEncoder.GetLittleEndian(anInt);
             Assert.IsTrue(anInt == ByteEncoder.GetLittleEndian(aNewInt));

Modified: qpid/trunk/qpid/dotnet/client-010/test/transport/util/CircularBufferTest.cs
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/dotnet/client-010/test/transport/util/CircularBufferTest.cs?rev=886962&r1=886961&r2=886962&view=diff
==============================================================================
--- qpid/trunk/qpid/dotnet/client-010/test/transport/util/CircularBufferTest.cs (original)
+++ qpid/trunk/qpid/dotnet/client-010/test/transport/util/CircularBufferTest.cs Thu Dec  3 22:31:12 2009
@@ -32,12 +32,12 @@
     public class CircularBufferTest
     {
         private CircularBuffer<Object> _buf;
-        private static readonly Logger _log = Logger.get(typeof(CircularBufferTest));
+        private static readonly Logger _log = Logger.Get(typeof(CircularBufferTest));
 
         [Test]
         public void BlockingEnqueue()
         {
-            _log.debug("Running: BlockingEnqueue");
+            _log.Debug("Running: BlockingEnqueue");
             const int size = 10;
             _buf = new CircularBuffer<Object>(size);
             // add size element anc check that the size +1 add blocks 
@@ -60,7 +60,7 @@
         [Test]
         public void Close()
         {
-            _log.debug("Running: BlockingEnqueue");
+            _log.Debug("Running: BlockingEnqueue");
             const int size = 10;
             _buf = new CircularBuffer<Object>(size);
             // add size element anc check that the size +1 add blocks 
@@ -74,7 +74,7 @@
             Thread.Sleep(1000);
             // the trhead t should block until the buffer is closed             
             Assert.IsTrue(t.ThreadState == ThreadState.WaitSleepJoin);
-            _buf.close();
+            _buf.Close();
             Thread.Sleep(100);
             // t should now be stopped 
             Assert.IsTrue(t.ThreadState == ThreadState.Stopped);           

Modified: qpid/trunk/qpid/dotnet/client-010/test/transport/util/ResultFutureTest.cs
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/dotnet/client-010/test/transport/util/ResultFutureTest.cs?rev=886962&r1=886961&r2=886962&view=diff
==============================================================================
--- qpid/trunk/qpid/dotnet/client-010/test/transport/util/ResultFutureTest.cs (original)
+++ qpid/trunk/qpid/dotnet/client-010/test/transport/util/ResultFutureTest.cs Thu Dec  3 22:31:12 2009
@@ -33,17 +33,17 @@
     [TestFixture]
     public class ResultFutureTest
     {
-        private static readonly Logger _log = Logger.get(typeof (ByteEncoderTest));
+        private static readonly Logger _log = Logger.Get(typeof (ByteEncoderTest));
         private static ResultFuture _future;
 
         [Test]
         public void getFutureTimeout()
         {
-            _log.debug("Running: getFutureTimeout");                        
+            _log.Debug("Running: getFutureTimeout");                        
             _future = new ResultFuture();
             _future.Session = new Session(new byte[1]);
             DateTime start = DateTime.Now;
-            Struct result = _future.get(1000);
+            Struct result = _future.Get(1000);
             Assert.IsTrue(DateTime.Now.Subtract(start).TotalMilliseconds >= 1000);
             Assert.IsNull(result);           
         }
@@ -51,12 +51,12 @@
         [Test]
         public void getFuture()
         {
-            _log.debug("Running: getFuture");
+            _log.Debug("Running: getFuture");
             _future = new ResultFuture();
             _future.Session = new Session(new byte[1]);
             Thread t = new Thread(Go);
             t.Start();
-            Struct result = _future.get(2000);
+            Struct result = _future.Get(2000);
             Assert.IsNotNull(result);
         }
 
@@ -70,27 +70,27 @@
 
     public class myStruct:Struct
     {
-        public override int getStructType()
+        public override int GetStructType()
         {
             throw new System.NotImplementedException();
         }
 
-        public override int getSizeWidth()
+        public override int GetSizeWidth()
         {
             throw new System.NotImplementedException();
         }
 
-        public override int getPackWidth()
+        public override int GetPackWidth()
         {
             throw new System.NotImplementedException();
         }
 
-        public override void read(Decoder dec)
+        public override void Read(IDecoder dec)
         {
             throw new System.NotImplementedException();
         }
 
-        public override void write(Encoder enc)
+        public override void Write(IEncoder enc)
         {
             throw new System.NotImplementedException();
         }

Modified: qpid/trunk/qpid/dotnet/client-010/test/transport/util/SerialTest.cs
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/dotnet/client-010/test/transport/util/SerialTest.cs?rev=886962&r1=886961&r2=886962&view=diff
==============================================================================
--- qpid/trunk/qpid/dotnet/client-010/test/transport/util/SerialTest.cs (original)
+++ qpid/trunk/qpid/dotnet/client-010/test/transport/util/SerialTest.cs Thu Dec  3 22:31:12 2009
@@ -26,7 +26,7 @@
     [TestFixture]
     public class SerialTest
     {
-        private static readonly Logger _log = Logger.get(typeof (SerialTest));
+        private static readonly Logger _log = Logger.Get(typeof (SerialTest));
 
         [Test]
         ///
@@ -34,11 +34,11 @@
         ///
         public void testBoundaries()
         {
-            Assert.IsTrue(Serial.gt(1, 0));
-            Assert.IsTrue(Serial.lt(0, 1));
+            Assert.IsTrue(Serial.Gt(1, 0));
+            Assert.IsTrue(Serial.Lt(0, 1));
 
-            Assert.IsTrue(Serial.gt(int.MaxValue, int.MaxValue - 1));
-            Assert.IsTrue(Serial.lt(int.MaxValue - 1, int.MaxValue));
+            Assert.IsTrue(Serial.Gt(int.MaxValue, int.MaxValue - 1));
+            Assert.IsTrue(Serial.Lt(int.MaxValue - 1, int.MaxValue));
         }
 
         ///
@@ -57,8 +57,8 @@
             {
                 for (int n = 1; n < 4096; n += 512)
                 {
-                    Assert.IsTrue(Serial.gt(s + n, s));
-                    Assert.IsTrue(Serial.lt(s, s + n));
+                    Assert.IsTrue(Serial.Gt(s + n, s));
+                    Assert.IsTrue(Serial.Lt(s, s + n));
                 }
 
                 s += 1024;



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


Mime
View raw message