Qpid-1277: added nant support

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

7 files changed, 39 insertions, 14 deletions

diff --git a/dotnet/client-010/client/Properties/AssemblyInfo.cs b/dotnet/client-010/client/Properties/AssemblyInfo.cs
index e1804b779a..96a79040af 100644
--- a/dotnet/client-010/client/Properties/AssemblyInfo.cs
+++ b/dotnet/client-010/client/Properties/AssemblyInfo.cs
@@ -1,4 +1,4 @@
-using System.Reflection;

+using System.Reflection;

 using System.Runtime.CompilerServices;

 using System.Runtime.InteropServices;

 

@@ -6,11 +6,11 @@ using System.Runtime.InteropServices;
 // set of attributes. Change these attribute values to modify the information

 // associated with an assembly.

 [assembly: AssemblyTitle("Qpid Client")]

-[assembly: AssemblyDescription("")]

+[assembly: AssemblyDescription("Built from svn revision number: ")]

 [assembly: AssemblyConfiguration("")]

 [assembly: AssemblyCompany("Apache Software Foundation")]

 [assembly: AssemblyProduct("Qpid Client")]

-[assembly: AssemblyCopyright("Copyright © Apache Software Foundation 2008")]

+[assembly: AssemblyCopyright("Apache Software Foundation")]

 [assembly: AssemblyTrademark("")]

 [assembly: AssemblyCulture("")]

 

@@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
 //

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

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

-[assembly: AssemblyVersion("1.0.0.0")]

+[assembly: AssemblyVersion("0.10.0.0")]

 [assembly: AssemblyFileVersion("1.0.0.0")]

diff --git a/dotnet/client-010/client/client/Client.cs b/dotnet/client-010/client/client/Client.cs
index 646192c25d..6759c6dbdc 100644
--- a/dotnet/client-010/client/client/Client.cs
+++ b/dotnet/client-010/client/client/Client.cs
@@ -28,7 +28,6 @@ namespace org.apache.qpid.client
     public class Client : ClientInterface

     {

         private Connection _conn;

-        private ClientSession _session; 

         private static readonly Logger _log = Logger.get(typeof (Client));

         private const long timeout = 60000;

         private bool _closed;

diff --git a/dotnet/client-010/client/default.build b/dotnet/client-010/client/default.build
new file mode 100644
index 0000000000..16b1532af9
--- /dev/null
+++ b/dotnet/client-010/client/default.build
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>

+<project name="qpid.client" default="build">

+    <!--

+		Properties that come from master build file

+		- build.dir: root directory for build

+		- build.debug: true if building debug release

+		- build.defines: variables to define during build

+    -->

+

+    <target name="build">

+        <csc target="library" 

+				define="${build.defines}" 

+				debug="${build.debug}" 

+				output="${build.dir}/${project::get-name()}.dll">

+			

+			<sources>

+			   <include name="**/*.cs" />

+         </sources>

+         <references>

+            <include name="${build.dir}/log4net.dll" />	

+         </references>

+        </csc>

+    </target>

+</project>

+

diff --git a/dotnet/client-010/client/transport/Binding.cs b/dotnet/client-010/client/transport/Binding.cs
index 25884fc772..e07e85990d 100644
--- a/dotnet/client-010/client/transport/Binding.cs
+++ b/dotnet/client-010/client/transport/Binding.cs
@@ -29,6 +29,6 @@ namespace org.apache.qpid.transport
     {

         E endpoint(Sender<T> sender);

 

-        Receiver<T> receiver<T>(E endpoint) where T : EventArgs;

+        Receiver<R> receiver<R>(E endpoint) where R : EventArgs;

     }

 }
\ No newline at end of file
diff --git a/dotnet/client-010/client/transport/Method.cs b/dotnet/client-010/client/transport/Method.cs
index 0f9a84d778..c15343ba73 100644
--- a/dotnet/client-010/client/transport/Method.cs
+++ b/dotnet/client-010/client/transport/Method.cs
@@ -30,7 +30,7 @@ namespace org.apache.qpid.transport
     /// </summary>

     public abstract class Method : Struct, ProtocolEvent

     {

-        public static Method create(int type)

+        public new static Method create(int type)

         {

             return (Method) StructFactory.createInstruction(type);

         }

diff --git a/dotnet/client-010/client/transport/Struct.cs b/dotnet/client-010/client/transport/Struct.cs
index 718dcbc978..fead22268b 100644
--- a/dotnet/client-010/client/transport/Struct.cs
+++ b/dotnet/client-010/client/transport/Struct.cs
@@ -32,7 +32,7 @@ namespace org.apache.qpid.transport
 

     public abstract class Struct : Encodable

     {

-        public static Struct create(int type)

+        public  static Struct create(int type)

         {

             return StructFactory.create(type);

         }

diff --git a/dotnet/client-010/client/transport/codec/AbstractEncoder.cs b/dotnet/client-010/client/transport/codec/AbstractEncoder.cs
index a34bd43331..f70eb17a55 100644
--- a/dotnet/client-010/client/transport/codec/AbstractEncoder.cs
+++ b/dotnet/client-010/client/transport/codec/AbstractEncoder.cs
@@ -281,7 +281,7 @@ namespace org.apache.qpid.transport.codec
             Type klass = value.GetType();

             Code type = resolve(klass);

 

-            if (type == null)

+            if (type == Code.VOID)

             {

                 throw new Exception

                     ("unable to resolve type: " + klass + ", " + value);

@@ -294,17 +294,18 @@ namespace org.apache.qpid.transport.codec
 

         private static Code resolve(Type klass)

         {

-            Code type = ENCODINGS[klass];

-            if (type != null)

+            Code type;

+            if(ENCODINGS.ContainsKey(klass))

             {

-                return type;

+                return ENCODINGS[klass];

             }

+            

             Type sup = klass.BaseType;

             if (sup != null)

             {

                 type = resolve(sup);

 

-                if (type != null)

+                if (type != Code.VOID)

                 {

                     return type;

                 }

@@ -312,7 +313,7 @@ namespace org.apache.qpid.transport.codec
             foreach (Type iface in klass.GetInterfaces())

             {

                 type = resolve(iface);

-                if (type != null)

+                if (type != Code.VOID)

                 {

                     return type;

                 }