From dda84019faf93b56028fd0c67f646362a137f0d1 Mon Sep 17 00:00:00 2001 From: Tomas Restrepo Date: Mon, 14 May 2007 14:06:40 +0000 Subject: Merged revisions 537834-537845 via svnmerge from https://svn.apache.org/repos/asf/incubator/qpid/branches/M2 ........ r537834 | tomasr | 2007-05-14 08:37:45 -0500 (Mon, 14 May 2007) | 6 lines * QPID-489 Added Nant build scripts for Qpid.NET * Modified msbuild files to build to central location matching nant builds * Removed old files from Qpid.Buffer * Removed MonoDevelop project files * Updated build scripts, readme.txt, todo.txt ........ r537835 | tomasr | 2007-05-14 08:38:14 -0500 (Mon, 14 May 2007) | 1 line * removed MonoDevelop solution ........ r537841 | tomasr | 2007-05-14 08:50:18 -0500 (Mon, 14 May 2007) | 1 line Fixed Qpid.Client.Tests build on linux ........ r537845 | tomasr | 2007-05-14 08:57:12 -0500 (Mon, 14 May 2007) | 1 line Fixed release script and made executable ........ git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@537848 13f79535-47bb-0310-9956-ffa450edef68 --- .../Qpid.Buffer.Tests/Qpid.Buffer.Tests.csproj | 6 +- qpid/dotnet/Qpid.Buffer.Tests/default.build | 27 ++ qpid/dotnet/Qpid.Buffer/FixedByteBuffer.cs | 380 ----------------- qpid/dotnet/Qpid.Buffer/HeapByteBuffer.cs | 473 --------------------- qpid/dotnet/Qpid.Buffer/Qpid.Buffer.csproj | 6 +- qpid/dotnet/Qpid.Buffer/Qpid.Buffer.mdp | 35 -- qpid/dotnet/Qpid.Buffer/default.build | 25 ++ .../Qpid.Client.Tests/Qpid.Client.Tests.csproj | 4 +- .../dotnet/Qpid.Client.Tests/Qpid.Client.Tests.mdp | 42 -- .../connection/SslConnectionTest.cs | 2 +- qpid/dotnet/Qpid.Client.Tests/default.build | 91 ++-- qpid/dotnet/Qpid.Client/Qpid.Client.csproj | 4 +- qpid/dotnet/Qpid.Client/Qpid.Client.mdp | 95 ----- qpid/dotnet/Qpid.Client/default.build | 75 ++-- qpid/dotnet/Qpid.Codec/Qpid.Codec.csproj | 4 +- qpid/dotnet/Qpid.Codec/Qpid.Codec.mdp | 41 -- qpid/dotnet/Qpid.Codec/default.build | 26 ++ .../Qpid.Common.Tests/Qpid.Common.Tests.csproj | 6 +- .../dotnet/Qpid.Common.Tests/Qpid.Common.Tests.mdp | 28 -- qpid/dotnet/Qpid.Common.Tests/default.build | 31 ++ qpid/dotnet/Qpid.Common/Qpid.Common.csproj | 4 +- qpid/dotnet/Qpid.Common/Qpid.Common.mdp | 157 ------- qpid/dotnet/Qpid.Common/default.build | 68 ++- qpid/dotnet/Qpid.Messaging/Qpid.Messaging.csproj | 4 +- qpid/dotnet/Qpid.Messaging/Qpid.Messaging.mdp | 45 -- qpid/dotnet/Qpid.Messaging/default.build | 24 ++ .../Mechanisms/DigestSaslClientTests.cs | 2 +- .../Mechanisms/ExternalSaslClientTests.cs | 1 - qpid/dotnet/Qpid.Sasl.Tests/Qpid.Sasl.Tests.csproj | 4 +- qpid/dotnet/Qpid.Sasl.Tests/default.build | 31 ++ qpid/dotnet/Qpid.Sasl/Qpid.Sasl.csproj | 2 +- qpid/dotnet/Qpid.Sasl/default.build | 24 ++ qpid/dotnet/README.txt | 30 +- qpid/dotnet/TODO.txt | 9 +- qpid/dotnet/TopicListener/TopicListener.csproj | 4 +- qpid/dotnet/TopicListener/default.build | 26 ++ qpid/dotnet/TopicPublisher/TopicPublisher.csproj | 4 +- qpid/dotnet/TopicPublisher/default.build | 26 ++ qpid/dotnet/build-dotnet11 | 8 +- qpid/dotnet/build-dotnet11.bat | 2 +- qpid/dotnet/build-mono | 86 +--- qpid/dotnet/default.build | 116 +++++ qpid/dotnet/dotnet.mds | 45 -- qpid/dotnet/release | 44 +- 44 files changed, 494 insertions(+), 1673 deletions(-) create mode 100644 qpid/dotnet/Qpid.Buffer.Tests/default.build delete mode 100644 qpid/dotnet/Qpid.Buffer/FixedByteBuffer.cs delete mode 100644 qpid/dotnet/Qpid.Buffer/HeapByteBuffer.cs delete mode 100644 qpid/dotnet/Qpid.Buffer/Qpid.Buffer.mdp create mode 100644 qpid/dotnet/Qpid.Buffer/default.build delete mode 100644 qpid/dotnet/Qpid.Client.Tests/Qpid.Client.Tests.mdp delete mode 100644 qpid/dotnet/Qpid.Client/Qpid.Client.mdp delete mode 100644 qpid/dotnet/Qpid.Codec/Qpid.Codec.mdp create mode 100644 qpid/dotnet/Qpid.Codec/default.build delete mode 100644 qpid/dotnet/Qpid.Common.Tests/Qpid.Common.Tests.mdp create mode 100644 qpid/dotnet/Qpid.Common.Tests/default.build delete mode 100644 qpid/dotnet/Qpid.Common/Qpid.Common.mdp delete mode 100644 qpid/dotnet/Qpid.Messaging/Qpid.Messaging.mdp create mode 100644 qpid/dotnet/Qpid.Messaging/default.build create mode 100644 qpid/dotnet/Qpid.Sasl.Tests/default.build create mode 100644 qpid/dotnet/Qpid.Sasl/default.build create mode 100644 qpid/dotnet/TopicListener/default.build create mode 100644 qpid/dotnet/TopicPublisher/default.build create mode 100644 qpid/dotnet/default.build delete mode 100644 qpid/dotnet/dotnet.mds mode change 100644 => 100755 qpid/dotnet/release (limited to 'qpid') diff --git a/qpid/dotnet/Qpid.Buffer.Tests/Qpid.Buffer.Tests.csproj b/qpid/dotnet/Qpid.Buffer.Tests/Qpid.Buffer.Tests.csproj index ac9e2f5229..e830782269 100644 --- a/qpid/dotnet/Qpid.Buffer.Tests/Qpid.Buffer.Tests.csproj +++ b/qpid/dotnet/Qpid.Buffer.Tests/Qpid.Buffer.Tests.csproj @@ -14,7 +14,7 @@ true full false - bin\Debug\ + ..\bin\net-2.0\debug\ DEBUG;TRACE prompt 4 @@ -23,7 +23,7 @@ pdbonly true - bin\Release\ + ..\bin\net-2.0\release\ TRACE prompt 4 @@ -56,4 +56,4 @@ --> - + \ No newline at end of file diff --git a/qpid/dotnet/Qpid.Buffer.Tests/default.build b/qpid/dotnet/Qpid.Buffer.Tests/default.build new file mode 100644 index 0000000000..829f052510 --- /dev/null +++ b/qpid/dotnet/Qpid.Buffer.Tests/default.build @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/qpid/dotnet/Qpid.Buffer/FixedByteBuffer.cs b/qpid/dotnet/Qpid.Buffer/FixedByteBuffer.cs deleted file mode 100644 index 30d51b6d9e..0000000000 --- a/qpid/dotnet/Qpid.Buffer/FixedByteBuffer.cs +++ /dev/null @@ -1,380 +0,0 @@ -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ -using System; - -namespace Qpid.Buffer -{ - /// - /// A FixedByteBuffer is for .... - /// - /// Todo: Seems to wrap a HeapByteBuffer and add more its method signature, other than that, seems pointless. Push down the extra methods - /// onto HeapByteBuffer and get rid of this altoghether? (Or pull heap byte buffer up into this class and get rid of it). - /// - /// Todo: Name methods using C# conventions. - /// - /// - public class FixedByteBuffer - { - private HeapByteBuffer _buf; - - /// - /// Creates a fixed - /// - /// - public FixedByteBuffer(int capacity) - { - _buf = new HeapByteBuffer(capacity); - } - - public FixedByteBuffer(byte[] bytes) - { - _buf = HeapByteBuffer.wrap(bytes); - } - - public static FixedByteBuffer wrap(byte[] array) - { - return new FixedByteBuffer(array); - } - - public static FixedByteBuffer wrap(byte[] array, int offset, int length) - { - throw new NotImplementedException(); - } - - public ByteOrder order() - { - return ByteOrder.LittleEndian; - } - - public void order(ByteOrder bo) - { - // Ignore endianess. - } - - public void compact() - { - _buf.Compact(); - } - - public char getChar() - { - throw new NotImplementedException(); - } - - public char getChar(int index) - { - throw new NotImplementedException(); - } - - public void putChar(char value) - { - throw new NotImplementedException(); - } - - public void putChar(int index, char value) - { - throw new NotImplementedException(); - } - - public bool isDirect() - { - return false; - } - - public bool isReadOnly() - { - throw new NotImplementedException(); - } - - public int capacity() - { - return _buf.Capacity; - } - - public int limit() - { - return _buf.Limit; - } - - public int limit(int limit) - { - int previousLimit = _buf.Limit; - _buf.Limit = limit; - return previousLimit; - } - - public int position() - { - return _buf.Position; - } - - public int position(int newPosition) - { - int prev = _buf.Position; - _buf.Position = newPosition; - return prev; - } - - public void mark() - { - throw new NotImplementedException(); - } - - public static FixedByteBuffer allocateDirect(int capacity) - { - throw new NotImplementedException(); - } - - public static FixedByteBuffer allocate(int capacity) - { - return new FixedByteBuffer(capacity); - } - - public void clear() - { - _buf.Clear(); - } - - public void put(byte b) - { - _buf.Put(b); - } - - public void put(int index, byte b) - { - throw new NotImplementedException(); - } - - public void put(FixedByteBuffer buf) - { - _buf.Put(buf.array(), buf.position(), buf.limit() - buf.position()); - } - - public FixedByteBuffer duplicate() - { - throw new NotImplementedException(); - } - - public FixedByteBuffer slice() - { - throw new NotImplementedException(); - } - - public FixedByteBuffer asReadOnlyBuffer() - { - throw new NotImplementedException(); - } - - /// - /// Returns backing array. - /// - /// - public byte[] array() - { - return _buf.array(); - } - - public int arrayOffset() - { - throw new NotImplementedException(); - } - - public void reset() - { - throw new NotImplementedException(); - } - - public void flip() - { - _buf.Flip(); - } - - public void rewind() - { - _buf.Rewind(); - } - - public byte get() - { - return _buf.Get(); - } - - public byte get(int index) - { - throw new NotImplementedException(); - } - - public short getShort() - { - return _buf.GetShort(); - } - - public short getShort(int index) - { - throw new NotImplementedException(); - } - - public void putShort(short value) - { - _buf.Put(value); - } - - public void putShort(int index, short value) - { - throw new NotImplementedException(); - } - - public int getInt() - { - return _buf.GetInt(); - } - - public int getInt(int index) - { - throw new NotImplementedException(); - } - - public void putInt(int value) - { - _buf.Put(value); - } - - public void putInt(int index, int value) - { - throw new NotImplementedException(); - } - - public ByteBuffer get(byte[] dst, int offset, int length) - { - throw new NotImplementedException(); - } - - public ByteBuffer put(byte[] src, int offset, int length) - { - throw new NotImplementedException(); - } - - public long getLong() - { - return _buf.GetLong(); - } - - public long getLong(int index) - { - throw new NotImplementedException(); - } - - public void putLong(long value) - { - _buf.Put(value); - } - - public void putLong(int index, long value) - { - throw new NotImplementedException(); - } - - public int remaining() - { - return _buf.Remaining; - } - - public float getFloat() - { - return _buf.GetFloat(); - } - - public float getFloat(int index) - { - throw new NotImplementedException(); - } - - public void putFloat(float value) - { - _buf.Put(value); - } - - public void putFloat(int index, float value) - { - throw new NotImplementedException(); - } - - public double getDouble() - { - return _buf.GetDouble(); - } - - public double getDouble(int index) - { - throw new NotImplementedException(); - } - - public void putDouble(double value) - { - _buf.Put(value); - } - - public void putDouble(int index, double value) - { - throw new NotImplementedException(); - } - - public ushort getUnsignedShort() - { - return _buf.GetUnsignedShort(); - } - - public uint getUnsignedInt() - { - return _buf.GetUnsignedInt(); - } - - public void get(byte[] dst) - { - _buf.Get(dst); - } - - public void put(ushort value) - { - _buf.Put(value); - } - - public void put(uint max) - { - _buf.Put(max); - } - - public void put(ulong tag) - { - _buf.Put(tag); - } - - public void put(byte[] src) - { - _buf.Put(src); - } - - public ulong getUnsignedLong() - { - return _buf.GetUnsignedLong(); - } - } -} diff --git a/qpid/dotnet/Qpid.Buffer/HeapByteBuffer.cs b/qpid/dotnet/Qpid.Buffer/HeapByteBuffer.cs deleted file mode 100644 index add8e2e80c..0000000000 --- a/qpid/dotnet/Qpid.Buffer/HeapByteBuffer.cs +++ /dev/null @@ -1,473 +0,0 @@ -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ -using System; -using System.Text; - -namespace Qpid.Buffer -{ - /// - /// - /// - public class HeapByteBuffer //: ByteBuffer - { - private byte[] _underlyingData; - - /// The current position within the buffer where the next value to be read or written will occurr. - private int _position; - - /// The index of the first element that should not be read or written. - private int _limit; - - public HeapByteBuffer(int size) : this(new byte[size], 0) - { - } - - private HeapByteBuffer(byte[] bytes, int length) - { - _underlyingData = bytes; - _limit = bytes.Length; - _position = length; - } - - public /*override*/ int Capacity - { - get - { - return _underlyingData.Length; - } - } - - public /*override*/ int Position - { - get - { - return _position; - } - set - { - _position = value; - } - } - - /// - /// Sets this buffer's limit. If the position is larger than the new limit then it is set to the new limit. - /// - /// The new limit value; must be non-negative and no larger than this buffer's capacity - public /*override*/ int Limit - { - get - { - return _limit; - } - set - { - if (value < 0) - { - throw new ArgumentException("Limit must not be negative"); - } - if (value > Capacity) - { - throw new ArgumentException("Limit must not be greater than Capacity"); - } - _limit = value; - if (_position > value) - { - _position = value; - } - } - } - - /// - /// Returns the number of elements between the current position and the limit - /// - /// The number of elements remaining in this buffer - public /*override*/ int Remaining - { - get - { - return (_limit - _position); - } - } - - public /*override*/ void Clear() - { - _position = 0; - _limit = Capacity; - } - - public /*override*/ void Flip() - { - _limit = _position; - _position = 0; - } - - public /*override*/ void Rewind() - { - _position = 0; - } - - public byte[] array() - { - return _underlyingData; - } - - public /*override*/ byte[] ToByteArray() - { - // Return copy of bytes remaining. - byte[] result = new byte[Remaining]; - Array.Copy(_underlyingData, _position, result, 0, Remaining); - return result; - } - - private void CheckSpace(int size) - { - if (_position + size > _limit) - { - throw new BufferOverflowException("Attempt to write " + size + " byte(s) to buffer where position is " + _position + - " and limit is " + _limit); - } - } - - private void CheckSpaceForReading(int size) - { - if (_position + size > _limit) - { - throw new BufferUnderflowException("Attempt to read " + size + " byte(s) to buffer where position is " + _position + - " and limit is " + _limit); - } - } - - /// - /// Writes the given byte into this buffer at the current position, and then increments the position. - /// - /// The byte to be written - /// If this buffer's current position is not smaller than its limit - public /*override*/ void Put(byte data) - { - CheckSpace(1); - _underlyingData[_position++] = data; - } - - /// - /// Writes all the data in the given byte array into this buffer at the current - /// position and then increments the position. - /// - /// The data to copy. - /// If this buffer's current position plus the array length is not smaller than its limit - public /*override*/ void Put(byte[] data) - { - Put(data, 0, data.Length); - } - - public /*override*/ void Put(byte[] data, int offset, int size) - { - if (data == null) - { - throw new ArgumentNullException("data"); - } - CheckSpace(size); - Array.Copy(data, offset, _underlyingData, _position, size); - _position += size; - } - - /// - /// Writes the given ushort into this buffer at the current position, and then increments the position. - /// - /// The ushort to be written - public /*override*/ void Put(ushort data) - { - CheckSpace(2); - _underlyingData[_position++] = (byte) (data >> 8); - _underlyingData[_position++] = (byte) data; - } - - public /*override*/ void Put(uint data) - { - CheckSpace(4); - _underlyingData[_position++] = (byte) (data >> 24); - _underlyingData[_position++] = (byte) (data >> 16); - _underlyingData[_position++] = (byte) (data >> 8); - _underlyingData[_position++] = (byte) data; - } - - public /*override*/ void Put(ulong data) - { - CheckSpace(8); - _underlyingData[_position++] = (byte) (data >> 56); - _underlyingData[_position++] = (byte) (data >> 48); - _underlyingData[_position++] = (byte) (data >> 40); - _underlyingData[_position++] = (byte) (data >> 32); - _underlyingData[_position++] = (byte) (data >> 24); - _underlyingData[_position++] = (byte) (data >> 16); - _underlyingData[_position++] = (byte) (data >> 8); - _underlyingData[_position++] = (byte) data; - } - - public void Put(short data) - { - Put((ushort)data); - } - - public void Put(int data) - { - Put((uint)data); - } - - public void Put(long data) - { - Put((ulong)data); - } - - public void Put(float data) - { - unsafe - { - uint val = *((uint*)&data); - Put(val); - } - } - - public void Put(double data) - { - unsafe - { - ulong val = *((ulong*)&data); - Put(val); - } - } - - - /// - /// Read the byte at the current position and increment the position - /// - /// a byte - /// if there are no bytes left to read - public /*override*/ byte Get() - { - CheckSpaceForReading(1); - return _underlyingData[_position++]; - } - - /// - /// Reads bytes from the buffer into the supplied array - /// - /// The destination array. The array must not - /// be bigger than the remaining space in the buffer, nor can it be null. - public /*override*/ void Get(byte[] destination) - { - if (destination == null) - { - throw new ArgumentNullException("destination"); - } - int len = destination.Length; - CheckSpaceForReading(len); - Array.Copy(_underlyingData, _position, destination, 0, len); - _position += len; - } - - /// - /// Reads and returns an unsigned short (two bytes, big endian) from this buffer - /// - /// an unsigned short - /// If there are fewer than two bytes remaining in this buffer - public /*override*/ ushort GetUnsignedShort() - { - CheckSpaceForReading(2); - byte upper = _underlyingData[_position++]; - byte lower = _underlyingData[_position++]; - return (ushort) ((upper << 8) + lower); - } - - /// - /// Reads and returns an unsigned int (four bytes, big endian) from this buffer - /// - /// an unsigned integer - /// If there are fewer than four bytes remaining in this buffer - public /*override*/ uint GetUnsignedInt() - { - CheckSpaceForReading(4); - byte b1 = _underlyingData[_position++]; - byte b2 = _underlyingData[_position++]; - byte b3 = _underlyingData[_position++]; - byte b4 = _underlyingData[_position++]; - return (uint) ((b1 << 24) + (b2 << 16) + (b3 << 8) + b4); - } - - public /*override*/ ulong GetUnsignedLong() - { - CheckSpaceForReading(8); - byte b1 = _underlyingData[_position++]; - byte b2 = _underlyingData[_position++]; - byte b3 = _underlyingData[_position++]; - byte b4 = _underlyingData[_position++]; - byte b5 = _underlyingData[_position++]; - byte b6 = _underlyingData[_position++]; - byte b7 = _underlyingData[_position++]; - byte b8 = _underlyingData[_position++]; - // all the casts necessary because otherwise each subexpression - // only gets promoted to uint and cause incorrect results - return (((ulong)b1 << 56) + ((ulong)b2 << 48) + ((ulong)b3 << 40) + - ((ulong)b4 << 32) + ((ulong)b5 << 24) + - ((ulong)b6 << 16) + ((ulong)b7 << 8) + b8); - } - - public short GetShort() - { - return (short) GetUnsignedShort(); - } - - public int GetInt() - { - return (int) GetUnsignedInt(); - } - - public long GetLong() - { - return (long) GetUnsignedLong(); - } - - public float GetFloat() - { - unsafe - { - uint val = GetUnsignedInt(); - return *((float*)&val); - } - } - - public double GetDouble() - { - unsafe - { - ulong val = GetUnsignedLong(); - return *((double*)&val); - } - } - - public /*override*/ string GetString(uint length, Encoding encoder) - { - CheckSpaceForReading((int)length); - string result = encoder.GetString(_underlyingData, _position, (int)length); - _position += (int)length; - return result; - } - - public /*override*/ void Acquire() - { - } - - public /*override*/ void Release() - { - } - - public /*override*/ bool IsAutoExpand - { - get { return false; } - set { } - } - - public /*override*/ void Expand(int expectedRemaining) - { - throw new NotImplementedException(); - } - - public /*override*/ void Expand(int pos, int expectedRemaining) - { - throw new NotImplementedException(); - } - - public /*override*/ bool Pooled - { - get { return false; } - set { } - } - - public void Mark() - { - throw new NotImplementedException(); - } - - public void Reset() - { - throw new NotImplementedException(); - } - - public /*override*/ byte Get(int index) - { - throw new NotImplementedException(); - } - -// public /*override*/ void Put(ByteBuffer src) -// { -// if (src == this) -// { -// throw new ArgumentException("Cannot copy self into self!"); -// } -// -// HeapByteBuffer sb; -// if (src is HeapByteBuffer) -// { -// sb = (HeapByteBuffer) src; -// } -// else -// { -// sb = (HeapByteBuffer)((RefCountingByteBuffer) src).Buf; -// } -// int n = sb.Remaining; -// if (n > Remaining) -// { -// throw new BufferOverflowException("Not enought capacity in this buffer for " + n + " elements - only " + Remaining + " remaining"); -// } -// Array.Copy(sb._underlyingData, sb._position, _underlyingData, _position, n); -// sb._position += n; -// _position += n; -// } - - public /*override*/ void Compact() - { - if (Remaining > 0) - { - if (_position > 0) - { - Array.Copy(_underlyingData, _position, _underlyingData, 0, Remaining); - } - _position = Remaining; - } - else - { - _position = 0; - } - _limit = Capacity; - } - - public static HeapByteBuffer wrap(byte[] bytes, int length) - { - return new HeapByteBuffer(bytes, length); - } - - public static HeapByteBuffer wrap(byte[] bytes) - { - return new HeapByteBuffer(bytes, bytes.Length); - } - } -} - - diff --git a/qpid/dotnet/Qpid.Buffer/Qpid.Buffer.csproj b/qpid/dotnet/Qpid.Buffer/Qpid.Buffer.csproj index a03bf348b2..97346bd9fd 100644 --- a/qpid/dotnet/Qpid.Buffer/Qpid.Buffer.csproj +++ b/qpid/dotnet/Qpid.Buffer/Qpid.Buffer.csproj @@ -17,7 +17,7 @@ true full false - bin\Debug\ + ..\bin\net-2.0\debug\ DEBUG;TRACE prompt 4 @@ -26,7 +26,7 @@ pdbonly true - bin\Release\ + ..\bin\net-2.0\release\ TRACE prompt 4 @@ -56,4 +56,4 @@ --> - + \ No newline at end of file diff --git a/qpid/dotnet/Qpid.Buffer/Qpid.Buffer.mdp b/qpid/dotnet/Qpid.Buffer/Qpid.Buffer.mdp deleted file mode 100644 index 8f2497e8b9..0000000000 --- a/qpid/dotnet/Qpid.Buffer/Qpid.Buffer.mdp +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/qpid/dotnet/Qpid.Buffer/default.build b/qpid/dotnet/Qpid.Buffer/default.build new file mode 100644 index 0000000000..e7002e7eb9 --- /dev/null +++ b/qpid/dotnet/Qpid.Buffer/default.build @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + diff --git a/qpid/dotnet/Qpid.Client.Tests/Qpid.Client.Tests.csproj b/qpid/dotnet/Qpid.Client.Tests/Qpid.Client.Tests.csproj index 21c6ff9ea2..819d43b5b0 100644 --- a/qpid/dotnet/Qpid.Client.Tests/Qpid.Client.Tests.csproj +++ b/qpid/dotnet/Qpid.Client.Tests/Qpid.Client.Tests.csproj @@ -16,7 +16,7 @@ true full false - bin\Debug\ + ..\bin\net-2.0\debug\ DEBUG;TRACE prompt 4 @@ -25,7 +25,7 @@ pdbonly true - bin\Release\ + ..\bin\net-2.0\release\ TRACE prompt 4 diff --git a/qpid/dotnet/Qpid.Client.Tests/Qpid.Client.Tests.mdp b/qpid/dotnet/Qpid.Client.Tests/Qpid.Client.Tests.mdp deleted file mode 100644 index 2fc9d7801c..0000000000 --- a/qpid/dotnet/Qpid.Client.Tests/Qpid.Client.Tests.mdp +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/qpid/dotnet/Qpid.Client.Tests/connection/SslConnectionTest.cs b/qpid/dotnet/Qpid.Client.Tests/connection/SslConnectionTest.cs index b8941c8459..c3e9affa29 100644 --- a/qpid/dotnet/Qpid.Client.Tests/connection/SslConnectionTest.cs +++ b/qpid/dotnet/Qpid.Client.Tests/connection/SslConnectionTest.cs @@ -79,7 +79,7 @@ namespace Qpid.Client.Tests.Connection // load a self-issued certificate from an embedded // resource const string name = "Qpid.Client.Tests.connection.QpidTestCert.pfx"; - Assembly assembly = Assembly.GetExecutingAssembly(); + Assembly assembly = typeof(SslConnectionTest).Assembly; Stream res = assembly.GetManifestResourceStream(name); byte[] buffer = new byte[res.Length]; diff --git a/qpid/dotnet/Qpid.Client.Tests/default.build b/qpid/dotnet/Qpid.Client.Tests/default.build index 36cdb612b5..3020f760b8 100644 --- a/qpid/dotnet/Qpid.Client.Tests/default.build +++ b/qpid/dotnet/Qpid.Client.Tests/default.build @@ -1,68 +1,41 @@ - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - + + + - - + - - - - - - - - - - - - - + + + + + + + + + - - - - - - - - - - + + + + + + + + + diff --git a/qpid/dotnet/Qpid.Client/Qpid.Client.csproj b/qpid/dotnet/Qpid.Client/Qpid.Client.csproj index 659dba5ecc..2bafeb23f6 100644 --- a/qpid/dotnet/Qpid.Client/Qpid.Client.csproj +++ b/qpid/dotnet/Qpid.Client/Qpid.Client.csproj @@ -14,7 +14,7 @@ true full false - bin\Debug\ + ..\bin\net-2.0\debug\ DEBUG;TRACE prompt 4 @@ -22,7 +22,7 @@ pdbonly true - bin\Release\ + ..\bin\net-2.0\release\ TRACE prompt 4 diff --git a/qpid/dotnet/Qpid.Client/Qpid.Client.mdp b/qpid/dotnet/Qpid.Client/Qpid.Client.mdp deleted file mode 100644 index f7cc1dd979..0000000000 --- a/qpid/dotnet/Qpid.Client/Qpid.Client.mdp +++ /dev/null @@ -1,95 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/qpid/dotnet/Qpid.Client/default.build b/qpid/dotnet/Qpid.Client/default.build index 00e2854326..5d09b3c011 100644 --- a/qpid/dotnet/Qpid.Client/default.build +++ b/qpid/dotnet/Qpid.Client/default.build @@ -1,52 +1,31 @@ - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - \ No newline at end of file + + diff --git a/qpid/dotnet/Qpid.Codec/Qpid.Codec.csproj b/qpid/dotnet/Qpid.Codec/Qpid.Codec.csproj index 581f68c5b4..a67d2d6a1b 100644 --- a/qpid/dotnet/Qpid.Codec/Qpid.Codec.csproj +++ b/qpid/dotnet/Qpid.Codec/Qpid.Codec.csproj @@ -14,7 +14,7 @@ true full false - bin\Debug\ + ..\bin\net-2.0\debug\ DEBUG;TRACE prompt 4 @@ -22,7 +22,7 @@ pdbonly true - bin\Release\ + ..\bin\net-2.0\release\ TRACE prompt 4 diff --git a/qpid/dotnet/Qpid.Codec/Qpid.Codec.mdp b/qpid/dotnet/Qpid.Codec/Qpid.Codec.mdp deleted file mode 100644 index ae92576662..0000000000 --- a/qpid/dotnet/Qpid.Codec/Qpid.Codec.mdp +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/qpid/dotnet/Qpid.Codec/default.build b/qpid/dotnet/Qpid.Codec/default.build new file mode 100644 index 0000000000..6b4decf1b7 --- /dev/null +++ b/qpid/dotnet/Qpid.Codec/default.build @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + diff --git a/qpid/dotnet/Qpid.Common.Tests/Qpid.Common.Tests.csproj b/qpid/dotnet/Qpid.Common.Tests/Qpid.Common.Tests.csproj index 7049e9b6bb..30cb56fba1 100644 --- a/qpid/dotnet/Qpid.Common.Tests/Qpid.Common.Tests.csproj +++ b/qpid/dotnet/Qpid.Common.Tests/Qpid.Common.Tests.csproj @@ -14,7 +14,7 @@ true full false - bin\Debug\ + ..\bin\net-2.0\debug\ DEBUG;TRACE prompt 4 @@ -23,7 +23,7 @@ pdbonly true - bin\Release\ + ..\bin\net-2.0\release\ TRACE prompt 4 @@ -62,4 +62,4 @@ --> - + \ No newline at end of file diff --git a/qpid/dotnet/Qpid.Common.Tests/Qpid.Common.Tests.mdp b/qpid/dotnet/Qpid.Common.Tests/Qpid.Common.Tests.mdp deleted file mode 100644 index e7b74c9756..0000000000 --- a/qpid/dotnet/Qpid.Common.Tests/Qpid.Common.Tests.mdp +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/qpid/dotnet/Qpid.Common.Tests/default.build b/qpid/dotnet/Qpid.Common.Tests/default.build new file mode 100644 index 0000000000..8a087b3ddb --- /dev/null +++ b/qpid/dotnet/Qpid.Common.Tests/default.build @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/qpid/dotnet/Qpid.Common/Qpid.Common.csproj b/qpid/dotnet/Qpid.Common/Qpid.Common.csproj index 944fe24677..9cce677d66 100644 --- a/qpid/dotnet/Qpid.Common/Qpid.Common.csproj +++ b/qpid/dotnet/Qpid.Common/Qpid.Common.csproj @@ -17,7 +17,7 @@ true full false - bin\Debug\ + ..\bin\net-2.0\debug\ DEBUG;TRACE prompt 4 @@ -25,7 +25,7 @@ pdbonly true - bin\Release\ + ..\bin\net-2.0\release\ TRACE prompt 4 diff --git a/qpid/dotnet/Qpid.Common/Qpid.Common.mdp b/qpid/dotnet/Qpid.Common/Qpid.Common.mdp deleted file mode 100644 index 310b063d63..0000000000 --- a/qpid/dotnet/Qpid.Common/Qpid.Common.mdp +++ /dev/null @@ -1,157 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/qpid/dotnet/Qpid.Common/default.build b/qpid/dotnet/Qpid.Common/default.build index 5e4a063a06..dd9ad20f62 100644 --- a/qpid/dotnet/Qpid.Common/default.build +++ b/qpid/dotnet/Qpid.Common/default.build @@ -1,48 +1,28 @@ - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + - \ No newline at end of file + + diff --git a/qpid/dotnet/Qpid.Messaging/Qpid.Messaging.csproj b/qpid/dotnet/Qpid.Messaging/Qpid.Messaging.csproj index b61d40e90a..207abe994e 100644 --- a/qpid/dotnet/Qpid.Messaging/Qpid.Messaging.csproj +++ b/qpid/dotnet/Qpid.Messaging/Qpid.Messaging.csproj @@ -15,7 +15,7 @@ true full false - bin\Debug\ + ..\bin\net-2.0\debug\ DEBUG;TRACE prompt 4 @@ -23,7 +23,7 @@ pdbonly true - bin\Release\ + ..\bin\net-2.0\release\ TRACE prompt 4 diff --git a/qpid/dotnet/Qpid.Messaging/Qpid.Messaging.mdp b/qpid/dotnet/Qpid.Messaging/Qpid.Messaging.mdp deleted file mode 100644 index 5293a6b2e6..0000000000 --- a/qpid/dotnet/Qpid.Messaging/Qpid.Messaging.mdp +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/qpid/dotnet/Qpid.Messaging/default.build b/qpid/dotnet/Qpid.Messaging/default.build new file mode 100644 index 0000000000..6a1433ac76 --- /dev/null +++ b/qpid/dotnet/Qpid.Messaging/default.build @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + diff --git a/qpid/dotnet/Qpid.Sasl.Tests/Mechanisms/DigestSaslClientTests.cs b/qpid/dotnet/Qpid.Sasl.Tests/Mechanisms/DigestSaslClientTests.cs index 4ed49d3806..58e90c29eb 100644 --- a/qpid/dotnet/Qpid.Sasl.Tests/Mechanisms/DigestSaslClientTests.cs +++ b/qpid/dotnet/Qpid.Sasl.Tests/Mechanisms/DigestSaslClientTests.cs @@ -210,7 +210,7 @@ namespace Qpid.Sasl.Tests.Mechanisms DigestSaslClient client = CreateClient(); byte[] bresp = client.EvaluateChallenge(Encoding.UTF8.GetBytes(challenge)); - string response = Encoding.UTF8.GetString(bresp); + Encoding.UTF8.GetString(bresp); // repeat challenge 1, which is incorrect client.EvaluateChallenge(Encoding.UTF8.GetBytes(challenge)); diff --git a/qpid/dotnet/Qpid.Sasl.Tests/Mechanisms/ExternalSaslClientTests.cs b/qpid/dotnet/Qpid.Sasl.Tests/Mechanisms/ExternalSaslClientTests.cs index 7b6ced9f03..1621f60c06 100644 --- a/qpid/dotnet/Qpid.Sasl.Tests/Mechanisms/ExternalSaslClientTests.cs +++ b/qpid/dotnet/Qpid.Sasl.Tests/Mechanisms/ExternalSaslClientTests.cs @@ -53,7 +53,6 @@ namespace Qpid.Sasl.Tests.Mechanisms [Test] public void CanEvaluateChallenge() { - Hashtable props = new Hashtable(); ISaslClient client = new ExternalSaslClient(AUTHID, new Hashtable(), this); Assert.IsFalse(client.IsComplete); diff --git a/qpid/dotnet/Qpid.Sasl.Tests/Qpid.Sasl.Tests.csproj b/qpid/dotnet/Qpid.Sasl.Tests/Qpid.Sasl.Tests.csproj index 374db4b490..b33174d2f0 100644 --- a/qpid/dotnet/Qpid.Sasl.Tests/Qpid.Sasl.Tests.csproj +++ b/qpid/dotnet/Qpid.Sasl.Tests/Qpid.Sasl.Tests.csproj @@ -14,7 +14,7 @@ true full false - bin\Debug\ + ..\bin\net-2.0\debug\ DEBUG;TRACE prompt 4 @@ -23,7 +23,7 @@ pdbonly true - bin\Release\ + ..\bin\net-2.0\release\ TRACE prompt 4 diff --git a/qpid/dotnet/Qpid.Sasl.Tests/default.build b/qpid/dotnet/Qpid.Sasl.Tests/default.build new file mode 100644 index 0000000000..272ccfe615 --- /dev/null +++ b/qpid/dotnet/Qpid.Sasl.Tests/default.build @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/qpid/dotnet/Qpid.Sasl/Qpid.Sasl.csproj b/qpid/dotnet/Qpid.Sasl/Qpid.Sasl.csproj index 41784a8413..ae8047fd45 100644 --- a/qpid/dotnet/Qpid.Sasl/Qpid.Sasl.csproj +++ b/qpid/dotnet/Qpid.Sasl/Qpid.Sasl.csproj @@ -14,7 +14,7 @@ true full false - bin\Debug\ + ..\bin\net-2.0\debug\ DEBUG;TRACE prompt 4 diff --git a/qpid/dotnet/Qpid.Sasl/default.build b/qpid/dotnet/Qpid.Sasl/default.build new file mode 100644 index 0000000000..ed648024d0 --- /dev/null +++ b/qpid/dotnet/Qpid.Sasl/default.build @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + diff --git a/qpid/dotnet/README.txt b/qpid/dotnet/README.txt index 10a755b9a7..1c0be05c11 100644 --- a/qpid/dotnet/README.txt +++ b/qpid/dotnet/README.txt @@ -9,11 +9,11 @@ Setup Install: Microsoft Visual Studio 2005 (VS2005) - MsBee 1.0 (Visual Studio plugin for targetting .NET 1.1) - only required if you want to build .NET 1.1. binaries. + NAnt 0.85 - only required for builds outside VS2005 (.net 1.1, .net 2.0, mono 2.0) Ant 1.6.5 Cygwin (or alternatively build via cmd but alter instructions below accordingly) -Set up PATH to include MSBuild.exe: +Set up PATH to include Nant.exe: $ PATH=/cygdrive/c/WINDOWS/Microsoft.NET/Framework/v2.0.50727:$PATH @@ -29,15 +29,21 @@ Generate framing from /Qpid.Common/amqp.xml specificiation file: $ build-framing -To build .NET 2.0 executables (to bin/Release): +Alternatively, just switch to /Qpid.Common and run "ant" there. - $ build +You can build from Visual Studio 2005 normally. Alternatively, you +can build debug releases for any supported framework from the +command line using Nant: -To build .NET 1.1 executables via MsBee (to bin/FX_1_1/Debug): +To build .NET 2.0 executables (to bin/net-2.0): + + $ build-dotnet20 + +To build .NET 1.1 executables (to bin/net-1.1): $ build-dotnet11 -To build for Mono on Linux (to build/mono20): +To build for Mono on Linux (to bin/mono-2.0): $ build-mono @@ -47,19 +53,19 @@ Releasing For .NET 1.1 - $ release dotnet11 1.0M1 + $ release net-1.1 -Generates ./build/release/Qpid.NET-1.0M1-dotnet11.zip +Generates ./bin/net-1.1/release/Qpid.NET-net-1.1-yyyyMMdd.zip For .NET 2.0 - $ release dotnet20 1.0M1 + $ release net-2.0 -Generates ./build/release/Qpid.NET-1.0M1-dotnet20.zip +Generates ./bin/net-2.0/release/Qpid.NET-net-2.0-yyyyMMdd.zip For Mono - $ release mono 1.0M1 + $ release mono-2.0 -Generates ./build/release/Qpid.NET-1.0M1-mono.zip +Generates ./bin/mono-2.0/release/Qpid.NET-mono-2.0-yyyyMMdd.zip diff --git a/qpid/dotnet/TODO.txt b/qpid/dotnet/TODO.txt index 90628d662d..d79fb8f5f7 100644 --- a/qpid/dotnet/TODO.txt +++ b/qpid/dotnet/TODO.txt @@ -1,9 +1,6 @@ * Implement durable subscriptions. - -* SSL. SSLStream composed over NetworkStream. - +* Implement prefetching * support multiple versions of AMQP from the same client. - -* Implement a Async IO socket transport. - Compare against blocking socket transport and configure default appropriately. +* Add new unit and integration tests +* Implement Transactions diff --git a/qpid/dotnet/TopicListener/TopicListener.csproj b/qpid/dotnet/TopicListener/TopicListener.csproj index e049688b77..5522ada191 100644 --- a/qpid/dotnet/TopicListener/TopicListener.csproj +++ b/qpid/dotnet/TopicListener/TopicListener.csproj @@ -14,7 +14,7 @@ true full false - bin\Debug\ + ..\bin\net-2.0\debug\ DEBUG;TRACE prompt 4 @@ -22,7 +22,7 @@ pdbonly true - bin\Release\ + ..\bin\net-2.0\release\ TRACE prompt 4 diff --git a/qpid/dotnet/TopicListener/default.build b/qpid/dotnet/TopicListener/default.build new file mode 100644 index 0000000000..7f49a6de13 --- /dev/null +++ b/qpid/dotnet/TopicListener/default.build @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + diff --git a/qpid/dotnet/TopicPublisher/TopicPublisher.csproj b/qpid/dotnet/TopicPublisher/TopicPublisher.csproj index 3d5350ca27..2e03ce858e 100644 --- a/qpid/dotnet/TopicPublisher/TopicPublisher.csproj +++ b/qpid/dotnet/TopicPublisher/TopicPublisher.csproj @@ -14,7 +14,7 @@ true full false - bin\Debug\ + ..\bin\net-2.0\debug\ DEBUG;TRACE prompt 4 @@ -22,7 +22,7 @@ pdbonly true - bin\Release\ + ..\bin\net-2.0\release\ TRACE prompt 4 diff --git a/qpid/dotnet/TopicPublisher/default.build b/qpid/dotnet/TopicPublisher/default.build new file mode 100644 index 0000000000..38ad896f34 --- /dev/null +++ b/qpid/dotnet/TopicPublisher/default.build @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + diff --git a/qpid/dotnet/build-dotnet11 b/qpid/dotnet/build-dotnet11 index 95471686f9..918010bf1f 100644 --- a/qpid/dotnet/build-dotnet11 +++ b/qpid/dotnet/build-dotnet11 @@ -1,7 +1 @@ -pfPath=$(cygpath -m "/cygdrive/c/Program Files") - -MSBuild.exe Qpid.NET.sln \ - /p:Configuration=Release \ - /t:rebuild \ - /p:TargetFX1_1=true \ - "/p:CustomAfterMicrosoftCommonTargets=${pfPath}\MSBuild\MSBee\MSBuildExtras.Fx1_1.CSharp.targets" +nant -t:net-1.1 diff --git a/qpid/dotnet/build-dotnet11.bat b/qpid/dotnet/build-dotnet11.bat index ae832ef043..4b58f13b2a 100644 --- a/qpid/dotnet/build-dotnet11.bat +++ b/qpid/dotnet/build-dotnet11.bat @@ -1 +1 @@ -MSBuild Qpid.NET.sln /p:Configuration=Release /t:rebuild /p:TargetFX1_1=true "/p:CustomAfterMicrosoftCommonTargets=%ProgramFiles%\MSBuild\MSBee\MSBuildExtras.Fx1_1.CSharp.targets" +nant -t:net-1.1 diff --git a/qpid/dotnet/build-mono b/qpid/dotnet/build-mono index 83a8198307..6f5cad5744 100755 --- a/qpid/dotnet/build-mono +++ b/qpid/dotnet/build-mono @@ -1,85 +1 @@ -#!/bin/bash -# -# Low brow build script for Mono 2.0. -# Uses metadata available in VS2005 project files. -# -# Replace with Mono's new XBuild when details are fully released. -# Note: XBuild is a clone of MSBuild. -# - -#MCS_FLAGS="-debug+" -MCS_FLAGS="-optimize" -outDir=$PWD/build/mono - -FindExternalReferences() -{ - assembly=$1 - grep HintPath $assembly.csproj | sed -e 's-.*\(.*\)-\1-' -e 's-\\-/-g' | - while read ref; do - echo $PWD/$ref - done -} - -Build() -{ - assembly=$1; shift - - echo "====================================================" - echo Building $assembly - references=$(grep 'tmp.build.sources - externalReferences=$(FindExternalReferences $assembly) - # Strip Control-M characters from external references... - externalReferences=$(echo $externalReferences | sed 's/\r//g') - echo "externalReferences = [$externalReferences]" - echo "regularRefs = [$regularRefs]" - echo PWD=$PWD - - # construct "-r" argument. - fullrefs="" - for ref in $regularRefs $externalReferences; do - if [[ -z $fullrefs ]]; then - fullrefs="-r:$ref" - else - fullrefs="$fullrefs,$ref" - fi - done - echo "fullrefs = [$fullrefs]" - - # Copy external references to output directory. - for ref in $externalReferences; do - cp $ref $outDir - done - - # Strip Control-M character here too. Not sure how they get there... - echo $fullrefs >tmp.references - mcs $MCS_FLAGS -out:$outDir/$assembly.dll -target:library @tmp.references @tmp.build.sources - ) -} - -mkdir -p $outDir - -# Tried to magically get projects from Qpid.NET.sln but wrong order for building.. -#for project in $(grep ^Project Qpid.NET.sln | sed 's/.*\\\(.*\).csproj.*/\1/'); do -# Build $project -#done - -Build Qpid.Messaging && - Build Qpid.Buffer && - Build Qpid.Codec && - Build Qpid.Common && - Build Qpid.Common.Tests && - Build Qpid.Client && - Build Qpid.Client.Transport.Socket.Blocking && - Build Qpid.Client.Tests +nant -t:mono-2.0 diff --git a/qpid/dotnet/default.build b/qpid/dotnet/default.build new file mode 100644 index 0000000000..89cb3209db --- /dev/null +++ b/qpid/dotnet/default.build @@ -0,0 +1,116 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/qpid/dotnet/dotnet.mds b/qpid/dotnet/dotnet.mds deleted file mode 100644 index c9520e7699..0000000000 --- a/qpid/dotnet/dotnet.mds +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/qpid/dotnet/release b/qpid/dotnet/release old mode 100644 new mode 100755 index c1e25df10f..11291e87d6 --- a/qpid/dotnet/release +++ b/qpid/dotnet/release @@ -2,50 +2,12 @@ Usage() { - echo "usage: $0 dotnet11|dotnet20|mono release-number (e.g. 2.0.1)" + echo "usage: $0 net-1.1|net-2.0|mono-2.0" exit 2 } -if [[ $# -ne 2 ]]; then +if [[ $# -ne 1 ]]; then Usage fi -dotNetVersion=$1 -releaseName=Qpid.NET-$2-$dotNetVersion - -if [[ $dotNetVersion == "dotnet11" ]]; then - binDir=Qpid.Client/bin/FX1_1/Release -elif [[ $dotNetVersion == "dotnet20" ]]; then - binDir=qpid.client/bin/Release -elif [[ $dotNetVersion == "mono" ]]; then - binDir=build/mono -else - Usage -fi - -binFilesToRelease=" - Qpid.Buffer.dll - Qpid.Client.dll - Qpid.Codec.dll - Qpid.Common.dll - Qpid.Messaging.dll - Qpid.Sasl.dll - log4net.dll" - -filesToRelease=" - LICENCE.txt - NOTICE.txt" - -releaseDir=build/release/$releaseName -mkdir -p $releaseDir - -for file in $binFilesToRelease; do - cp $binDir/$file $releaseDir -done - -for file in $filesToRelease; do - cp $file $releaseDir -done - -cd build/release -jar -cvMf $releaseName.zip $releaseName +nant -t:$1 release-pkg -D:build.config=release -- cgit v1.2.1