diff options
author | Tomas Restrepo <tomasr@apache.org> | 2007-05-14 14:06:40 +0000 |
---|---|---|
committer | Tomas Restrepo <tomasr@apache.org> | 2007-05-14 14:06:40 +0000 |
commit | dda84019faf93b56028fd0c67f646362a137f0d1 (patch) | |
tree | 611e2e525d8fab178bf05f229e58c6198578a396 | |
parent | c40d919a420b377608fce2fc35de7069f912cf84 (diff) | |
download | qpid-python-dda84019faf93b56028fd0c67f646362a137f0d1.tar.gz |
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
44 files changed, 494 insertions, 1673 deletions
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 @@ <DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
- <OutputPath>bin\Debug\</OutputPath>
+ <OutputPath>..\bin\net-2.0\debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
@@ -23,7 +23,7 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
- <OutputPath>bin\Release\</OutputPath>
+ <OutputPath>..\bin\net-2.0\release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
@@ -56,4 +56,4 @@ <Target Name="AfterBuild">
</Target>
-->
-</Project>
+</Project>
\ 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 @@ +<?xml version="1.0"?>
+<project name="Qpid.Buffer" default="test">
+
+ <target name="build">
+ <csc target="library"
+ define="${build.defines}"
+ warnaserror="true" debug="${build.debug}"
+ output="${build.dir}/${project::get-name()}.Tests.dll">
+
+ <sources>
+ <include name="**/*.cs" />
+ </sources>
+ <references>
+ <include name="${build.dir}/nunit.framework.dll" />
+ <include name="${build.dir}/${project::get-name()}.dll" />
+ </references>
+
+ </csc>
+ </target>
+ <target name="test" depends="build">
+ <nunit2>
+ <formatter type="${nant.formatter}" usefile="false" />
+ <test assemblyname="${build.dir}/${project::get-name()}.Tests.dll" />
+ </nunit2>
+ </target>
+</project>
+
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
-{
- /// <summary>
- /// A FixedByteBuffer is for ....
- ///
- /// <para/>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).
- ///
- /// <para/>Todo: Name methods using C# conventions.
- ///
- /// </summary>
- public class FixedByteBuffer
- {
- private HeapByteBuffer _buf;
-
- /// <summary>
- /// Creates a fixed
- /// </summary>
- /// <param name="capacity"></param>
- 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();
- }
-
- /// <summary>
- /// Returns backing array.
- /// </summary>
- /// <returns></returns>
- 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
-{
- /// <summary>
- ///
- /// </summary>
- public class HeapByteBuffer //: ByteBuffer
- {
- private byte[] _underlyingData;
-
- /// <summary> The current position within the buffer where the next value to be read or written will occurr. </summary>
- private int _position;
-
- /// <summary> The index of the first element that should not be read or written. </summary>
- 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;
- }
- }
-
- /// <summary>
- /// Sets this buffer's limit. If the position is larger than the new limit then it is set to the new limit.
- /// </summary>
- /// <value>The new limit value; must be non-negative and no larger than this buffer's capacity</value>
- 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;
- }
- }
- }
-
- /// <summary>
- /// Returns the number of elements between the current position and the limit
- /// </summary>
- /// <value>The number of elements remaining in this buffer</value>
- 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);
- }
- }
-
- /// <summary>
- /// Writes the given byte into this buffer at the current position, and then increments the position.
- /// </summary>
- /// <param name="data">The byte to be written</param>
- /// <exception cref="BufferOverflowException">If this buffer's current position is not smaller than its limit</exception>
- public /*override*/ void Put(byte data)
- {
- CheckSpace(1);
- _underlyingData[_position++] = data;
- }
-
- /// <summary>
- /// Writes all the data in the given byte array into this buffer at the current
- /// position and then increments the position.
- /// </summary>
- /// <param name="data">The data to copy.</param>
- /// <exception cref="BufferOverflowException">If this buffer's current position plus the array length is not smaller than its limit</exception>
- 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;
- }
-
- /// <summary>
- /// Writes the given ushort into this buffer at the current position, and then increments the position.
- /// </summary>
- /// <param name="data">The ushort to be written</param>
- 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);
- }
- }
-
-
- /// <summary>
- /// Read the byte at the current position and increment the position
- /// </summary>
- /// <returns>a byte</returns>
- /// <exception cref="BufferUnderflowException">if there are no bytes left to read</exception>
- public /*override*/ byte Get()
- {
- CheckSpaceForReading(1);
- return _underlyingData[_position++];
- }
-
- /// <summary>
- /// Reads bytes from the buffer into the supplied array
- /// </summary>
- /// <param name="destination">The destination array. The array must not
- /// be bigger than the remaining space in the buffer, nor can it be null.</param>
- 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;
- }
-
- /// <summary>
- /// Reads and returns an unsigned short (two bytes, big endian) from this buffer
- /// </summary>
- /// <returns>an unsigned short</returns>
- /// <exception cref="BufferUnderflowException">If there are fewer than two bytes remaining in this buffer</exception>
- public /*override*/ ushort GetUnsignedShort()
- {
- CheckSpaceForReading(2);
- byte upper = _underlyingData[_position++];
- byte lower = _underlyingData[_position++];
- return (ushort) ((upper << 8) + lower);
- }
-
- /// <summary>
- /// Reads and returns an unsigned int (four bytes, big endian) from this buffer
- /// </summary>
- /// <returns>an unsigned integer</returns>
- /// <exception cref="BufferUnderflowException">If there are fewer than four bytes remaining in this buffer</exception>
- 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 @@ <DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
- <OutputPath>bin\Debug\</OutputPath>
+ <OutputPath>..\bin\net-2.0\debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
@@ -26,7 +26,7 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
- <OutputPath>bin\Release\</OutputPath>
+ <OutputPath>..\bin\net-2.0\release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
@@ -56,4 +56,4 @@ <Target Name="AfterBuild">
</Target>
-->
-</Project>
+</Project>
\ 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 @@ -<Project name="Qpid.Buffer" fileversion="2.0" language="C#" clr-version="Net_1_1" ctype="DotNetProject"> - <Configurations active="Debug"> - <Configuration name="Debug" ctype="DotNetProjectConfiguration"> - <Output directory="./bin/Debug" assembly="Qpid.Buffer" /> - <Build debugmode="True" target="Library" /> - <Execution runwithwarnings="True" consolepause="False" runtime="MsNet" clr-version="Net_1_1" /> - <CodeGeneration compiler="Csc" warninglevel="4" optimize="True" unsafecodeallowed="True" generateoverflowchecks="True" generatexmldocumentation="False" ctype="CSharpCompilerParameters" /> - </Configuration> - <Configuration name="Release" ctype="DotNetProjectConfiguration"> - <Output directory="./bin/Release" assembly="Qpid.Buffer" /> - <Build debugmode="False" target="Library" /> - <Execution runwithwarnings="True" consolepause="False" runtime="MsNet" clr-version="Net_1_1" /> - <CodeGeneration compiler="Csc" warninglevel="4" optimize="True" unsafecodeallowed="True" generateoverflowchecks="True" generatexmldocumentation="False" ctype="CSharpCompilerParameters" /> - </Configuration> - </Configurations> - <DeployTargets /> - <Contents> - <File name="./" subtype="Directory" buildaction="Compile" /> - <File name="./Properties/AssemblyInfo.cs" subtype="Code" buildaction="Compile" /> - <File name="./BaseByteBuffer.cs" subtype="Code" buildaction="Compile" /> - <File name="./BufferDataException.cs" subtype="Code" buildaction="Compile" /> - <File name="./BufferOverflowException.cs" subtype="Code" buildaction="Compile" /> - <File name="./BufferUnderflowException.cs" subtype="Code" buildaction="Compile" /> - <File name="./ByteBuffer.cs" subtype="Code" buildaction="Compile" /> - <File name="./ByteBufferAllocator.cs" subtype="Code" buildaction="Compile" /> - <File name="./ByteBufferHexDumper.cs" subtype="Code" buildaction="Compile" /> - <File name="./ByteBufferProxy.cs" subtype="Code" buildaction="Compile" /> - <File name="./FixedByteBuffer.cs" subtype="Code" buildaction="Compile" /> - <File name="./HeapByteBuffer.cs" subtype="Code" buildaction="Compile" /> - <File name="./SimpleByteBufferAllocator.cs" subtype="Code" buildaction="Compile" /> - </Contents> - <References> - <ProjectReference type="Gac" localcopy="True" refto="System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> - </References> -</Project> 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 @@ +<?xml version="1.0"?>
+<project name="Qpid.Buffer" 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}"
+ unsafe="true"
+ output="${build.dir}/${project::get-name()}.dll">
+
+ <sources>
+ <include name="**/*.cs" />
+ </sources>
+ <references>
+ </references>
+ </csc>
+ </target>
+</project>
+
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 @@ <DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
- <OutputPath>bin\Debug\</OutputPath>
+ <OutputPath>..\bin\net-2.0\debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
@@ -25,7 +25,7 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
- <OutputPath>bin\Release\</OutputPath>
+ <OutputPath>..\bin\net-2.0\release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
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 @@ -<Project name="Qpid.Client.Tests" fileversion="2.0" language="C#" clr-version="Net_1_1" ctype="DotNetProject"> - <Configurations active="Debug"> - <Configuration name="Debug" ctype="DotNetProjectConfiguration"> - <Output directory="./bin/Debug" assembly="Qpid.Client.Tests" /> - <Build debugmode="True" target="Library" /> - <Execution runwithwarnings="True" consolepause="False" runtime="MsNet" clr-version="Net_1_1" /> - <CodeGeneration compiler="Csc" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" generatexmldocumentation="False" ctype="CSharpCompilerParameters" /> - </Configuration> - <Configuration name="Release" ctype="DotNetProjectConfiguration"> - <Output directory="./bin/Release" assembly="Qpid.Client.Tests" /> - <Build debugmode="False" target="Library" /> - <Execution runwithwarnings="True" consolepause="False" runtime="MsNet" clr-version="Net_1_1" /> - <CodeGeneration compiler="Csc" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" generatexmldocumentation="False" ctype="CSharpCompilerParameters" /> - </Configuration> - </Configurations> - <DeployTargets /> - <Contents> - <File name="./bio/BlockingIo.cs" subtype="Code" buildaction="Compile" /> - <File name="./Common/BaseMessagingTestFixture.cs" subtype="Code" buildaction="Compile" /> - <File name="./connection/ConnectionTest.cs" subtype="Code" buildaction="Compile" /> - <File name="./failover/FailoverTest.cs" subtype="Code" buildaction="Compile" /> - <File name="./failover/FailoverTxTest.cs" subtype="Code" buildaction="Compile" /> - <File name="./HeadersExchange/HeadersMatchingConsumer.cs" subtype="Code" buildaction="Compile" /> - <File name="./HeadersExchange/HeadersMatchingProducer.cs" subtype="Code" buildaction="Compile" /> - <File name="./MultiConsumer/ProducerMultiConsumer.cs" subtype="Code" buildaction="Compile" /> - <File name="./Properties/AssemblyInfo.cs" subtype="Code" buildaction="Compile" /> - <File name="./requestreply1/ServiceProvidingClient.cs" subtype="Code" buildaction="Compile" /> - <File name="./requestreply1/ServiceRequestingClient.cs" subtype="Code" buildaction="Compile" /> - <File name="./undeliverable/UndeliverableTest.cs" subtype="Code" buildaction="Compile" /> - <File name="./url/ConnectionUrlTest.cs" subtype="Code" buildaction="Compile" /> - <File name="./log4net.config" subtype="Code" buildaction="FileCopy" /> - </Contents> - <References> - <ProjectReference type="Gac" localcopy="True" refto="System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> - <ProjectReference type="Assembly" localcopy="True" refto="../Qpid.Common/lib/log4net/log4net.dll" /> - <ProjectReference type="Assembly" localcopy="True" refto="./lib/nunit/nunit.framework.dll" /> - <ProjectReference type="Project" localcopy="True" refto="Qpid.Client" /> - <ProjectReference type="Project" localcopy="True" refto="Qpid.Messaging" /> - <ProjectReference type="Project" localcopy="True" refto="Qpid.Common" /> - <ProjectReference type="Project" localcopy="True" refto="Qpid.Client.Transport.Socket.Blocking" /> - </References> -</Project>
\ 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 @@ <?xml version="1.0"?> -<project name="XMS.AMQ.ClientTests" default="build"> - <property name="nant.settings.currentframework" value="net-1.0" /> - <property name="basename" value="XMSClientTests"/> - <property name="debug" value="true"/> - <property name="MINADir" value="../minadotnet"/> - <property name="XMSCommonDir" value="../xmscommon"/> - <property name="XMSClientDir" value="../xmsclient"/> -<!-- - <property name="NunitDir" value="../build/nunit"/> - <property name="NunitDir" value="C:\Program Files\NUnit-Net-2.0 2.2.8"/> ---> - <property name="NunitDir" value="C:\Program Files\NUnit 2.2.8"/> +<project name="Qpid.Client" default="test"> - <if test="${debug}"> - <property name="targetdir" value="bin/${nant.settings.currentframework}/Debug"/> - </if> - <ifnot test="${debug}"> - <property name="targetdir" value="bin/${nant.settings.currentframework}/Release"/> - </ifnot> - - <target name="clean"> - <delete> - <fileset> - <include name="${targetdir}/${basename}.dll"/> - <include name="${targetdir}/${basename}.pdb"/> - </fileset> - </delete> - </target> - - <target name="init"> - <mkdir dir="${targetdir}"/> - </target> - - <target name="build" depends="init"> - <csc target="library" output="${targetdir}/${basename}.dll" debug="${debug}"> + <target name="build"> + <csc target="library" + define="${build.defines}" + warnaserror="false" debug="${build.debug}" + output="${build.dir}/${project::get-name()}.Tests.dll"> + <sources> - <include name="**/*.cs"/> - <exclude name="Properties/Settings.Designer.cs" /> + <include name="**/*.cs" /> </sources> <references> - <lib> - <include name="${MINADir}/${targetdir}" /> - <include name="${XMSCommonDir}/${targetdir}" /> - <include name="${XMSClientDir}/${targetdir}" /> - <include name="${XMSCommonDir}/lib/**" /> - <include name="${NunitDir}/bin" /> - </lib> - <include name="log4net.dll" /> - <include name="MINA.dll" /> - <include name="IBM.XMS.dll" /> - <include name="XMSCommon.dll" /> - <include name="XMSClient.dll" /> - <include name="nunit.framework.dll" /> + <include name="${build.dir}/log4net.dll" /> + <include name="${build.dir}/nunit.framework.dll" /> + <include name="${build.dir}/${project::get-name()}.dll" /> + <include name="${build.dir}/Qpid.Common.dll" /> + <include name="${build.dir}/Qpid.Messaging.dll" /> + <include name="${build.dir}/Qpid.Sasl.dll" /> </references> + <resources dynamicprefix="true" prefix="${project::get-name()}.Tests"> + <include name="connection/QpidTestCert.pfx"/> + </resources> </csc> - <copy todir="${targetdir}"> - <fileset> - <include name="*.config" /> - <include name="${MINADir}/${targetdir}/*.dll" /> - <include name="${XMSCommonDir}/${targetdir}/*.dll" /> - <include name="${XMSClientDir}/${targetdir}/*.dll" /> - <include name="${NunitDir}/bin/nunit.framework.dll" /> - <include name="${XMSCommonDir}/lib/xms/*.dll" /> - </fileset> - </copy> + <copy + tofile="${build.dir}/${project::get-name()}.Tests.dll.config" + file="App.config" + /> + <copy + todir="${build.dir}" + file="log4net.config" + /> + </target> + <target name="test" depends="build"> + <nunit2> + <formatter type="${nant.formatter}" usefile="false" /> + <test assemblyname="${build.dir}/${project::get-name()}.Tests.dll" /> + </nunit2> </target> </project> + 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 @@ <DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
- <OutputPath>bin\Debug\</OutputPath>
+ <OutputPath>..\bin\net-2.0\debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
@@ -22,7 +22,7 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
- <OutputPath>bin\Release\</OutputPath>
+ <OutputPath>..\bin\net-2.0\release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
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 @@ -<Project name="Qpid.Client" fileversion="2.0" language="C#" clr-version="Net_1_1" ctype="DotNetProject"> - <Configurations active="Debug"> - <Configuration name="Debug" ctype="DotNetProjectConfiguration"> - <Output directory="./bin/Debug" assembly="Qpid.Client" /> - <Build debugmode="True" target="Library" /> - <Execution runwithwarnings="True" consolepause="False" runtime="MsNet" clr-version="Net_1_1" /> - <CodeGeneration compiler="Csc" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" generatexmldocumentation="False" ctype="CSharpCompilerParameters" /> - </Configuration> - <Configuration name="Release" ctype="DotNetProjectConfiguration"> - <Output directory="./bin/Release" assembly="Qpid.Client" /> - <Build debugmode="False" target="Library" /> - <Execution runwithwarnings="True" consolepause="False" runtime="MsNet" clr-version="Net_1_1" /> - <CodeGeneration compiler="Csc" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" generatexmldocumentation="False" ctype="CSharpCompilerParameters" /> - </Configuration> - </Configurations> - <DeployTargets /> - <Contents> - <File name="./Properties/AssemblyInfo.cs" subtype="Code" buildaction="Compile" /> - <File name="./qms/failover/FailoverMethod.cs" subtype="Code" buildaction="Compile" /> - <File name="./qms/failover/FailoverRoundRobin.cs" subtype="Code" buildaction="Compile" /> - <File name="./qms/failover/FailoverSingleServer.cs" subtype="Code" buildaction="Compile" /> - <File name="./qms/BrokerInfo.cs" subtype="Code" buildaction="Compile" /> - <File name="./qms/ConnectionInfo.cs" subtype="Code" buildaction="Compile" /> - <File name="./qms/FailoverPolicy.cs" subtype="Code" buildaction="Compile" /> - <File name="./qms/UrlSyntaxException.cs" subtype="Code" buildaction="Compile" /> - <File name="./Client/Failover/FailoverException.cs" subtype="Code" buildaction="Compile" /> - <File name="./Client/Failover/FailoverHandler.cs" subtype="Code" buildaction="Compile" /> - <File name="./Client/Failover/FailoverState.cs" subtype="Code" buildaction="Compile" /> - <File name="./Client/Failover/FailoverSupport.cs" subtype="Code" buildaction="Compile" /> - <File name="./Client/Handler/BasicDeliverMethodHandler.cs" subtype="Code" buildaction="Compile" /> - <File name="./Client/Handler/BasicReturnMethodHandler.cs" subtype="Code" buildaction="Compile" /> - <File name="./Client/Handler/ChannelCloseMethodHandler.cs" subtype="Code" buildaction="Compile" /> - <File name="./Client/Handler/ConnectionCloseMethodHandler.cs" subtype="Code" buildaction="Compile" /> - <File name="./Client/Handler/ConnectionCloseOkHandler.cs" subtype="Code" buildaction="Compile" /> - <File name="./Client/Handler/ConnectionOpenOkMethodHandler.cs" subtype="Code" buildaction="Compile" /> - <File name="./Client/Handler/ConnectionRedirectMethodHandler.cs" subtype="Code" buildaction="Compile" /> - <File name="./Client/Handler/ConnectionSecureMethodHandler.cs" subtype="Code" buildaction="Compile" /> - <File name="./Client/Handler/ConnectionStartMethodHandler.cs" subtype="Code" buildaction="Compile" /> - <File name="./Client/Handler/ConnectionTuneMethodHandler.cs" subtype="Code" buildaction="Compile" /> - <File name="./Client/Message/AbstractQmsMessage.cs" subtype="Code" buildaction="Compile" /> - <File name="./Client/Message/AMQMessage.cs" subtype="Code" buildaction="Compile" /> - <File name="./Client/Message/AMQMessageFactory.cs" subtype="Code" buildaction="Compile" /> - <File name="./Client/Message/IMessageFactory.cs" subtype="Code" buildaction="Compile" /> - <File name="./Client/Message/MessageFactoryRegistry.cs" subtype="Code" buildaction="Compile" /> - <File name="./Client/Message/QpidBytesMessage.cs" subtype="Code" buildaction="Compile" /> - <File name="./Client/Message/QpidBytesMessageFactory.cs" subtype="Code" buildaction="Compile" /> - <File name="./Client/Message/QpidHeaders.cs" subtype="Code" buildaction="Compile" /> - <File name="./Client/Message/QpidTextMessage.cs" subtype="Code" buildaction="Compile" /> - <File name="./Client/Message/QpidTextMessageFactory.cs" subtype="Code" buildaction="Compile" /> - <File name="./Client/Message/UnexpectedBodyReceivedException.cs" subtype="Code" buildaction="Compile" /> - <File name="./Client/Message/UnprocessedMessage.cs" subtype="Code" buildaction="Compile" /> - <File name="./Client/Protocol/Listener/BlockingMethodFrameListener.cs" subtype="Code" buildaction="Compile" /> - <File name="./Client/Protocol/Listener/IAMQMethodListener.cs" subtype="Code" buildaction="Compile" /> - <File name="./Client/Protocol/Listener/SpecificMethodFrameListener.cs" subtype="Code" buildaction="Compile" /> - <File name="./Client/Protocol/AMQMethodEvent.cs" subtype="Code" buildaction="Compile" /> - <File name="./Client/Protocol/AMQProtocolListener.cs" subtype="Code" buildaction="Compile" /> - <File name="./Client/Protocol/AMQProtocolSession.cs" subtype="Code" buildaction="Compile" /> - <File name="./Client/Protocol/IConnectionCloser.cs" subtype="Code" buildaction="Compile" /> - <File name="./Client/Protocol/IProtocolListener.cs" subtype="Code" buildaction="Compile" /> - <File name="./Client/Protocol/ProtocolWriter.cs" subtype="Code" buildaction="Compile" /> - <File name="./Client/State/AMQState.cs" subtype="Code" buildaction="Compile" /> - <File name="./Client/State/AMQStateChangedEvent.cs" subtype="Code" buildaction="Compile" /> - <File name="./Client/State/AMQStateManager.cs" subtype="Code" buildaction="Compile" /> - <File name="./Client/State/IAMQStateListener.cs" subtype="Code" buildaction="Compile" /> - <File name="./Client/State/IllegalStateTransitionException.cs" subtype="Code" buildaction="Compile" /> - <File name="./Client/State/IStateAwareMethodListener.cs" subtype="Code" buildaction="Compile" /> - <File name="./Client/State/IStateListener.cs" subtype="Code" buildaction="Compile" /> - <File name="./Client/State/StateWaiter.cs" subtype="Code" buildaction="Compile" /> - <File name="./Client/Transport/AmqpChannel.cs" subtype="Code" buildaction="Compile" /> - <File name="./Client/Transport/AMQProtocolProvider.cs" subtype="Code" buildaction="Compile" /> - <File name="./Client/Transport/IByteChannel.cs" subtype="Code" buildaction="Compile" /> - <File name="./Client/Transport/IProtocolChannel.cs" subtype="Code" buildaction="Compile" /> - <File name="./Client/Transport/IProtocolWriter.cs" subtype="Code" buildaction="Compile" /> - <File name="./Client/Transport/ITransport.cs" subtype="Code" buildaction="Compile" /> - <File name="./Client/Transport/SingleProtocolEncoderOutput.cs" subtype="Code" buildaction="Compile" /> - <File name="./Client/AmqBrokerInfo.cs" subtype="Code" buildaction="Compile" /> - <File name="./Client/AmqChannel.cs" subtype="Code" buildaction="Compile" /> - <File name="./Client/AMQConnection.cs" subtype="Code" buildaction="Compile" /> - <File name="./Client/AMQConnectionException.cs" subtype="Code" buildaction="Compile" /> - <File name="./Client/AMQDestination.cs" subtype="Code" buildaction="Compile" /> - <File name="./Client/BasicMessageConsumer.cs" subtype="Code" buildaction="Compile" /> - <File name="./Client/BasicMessageProducer.cs" subtype="Code" buildaction="Compile" /> - <File name="./Client/Closeable.cs" subtype="Code" buildaction="Compile" /> - <File name="./Client/ConnectionTuneParameters.cs" subtype="Code" buildaction="Compile" /> - <File name="./Client/QpidConnectionInfo.cs" subtype="Code" buildaction="Compile" /> - </Contents> - <References> - <ProjectReference type="Gac" localcopy="True" refto="System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> - <ProjectReference type="Project" localcopy="True" refto="Qpid.Common" /> - <ProjectReference type="Project" localcopy="True" refto="Qpid.Messaging" /> - <ProjectReference type="Assembly" localcopy="True" refto="../Qpid.Common/lib/log4net/log4net.dll" /> - <ProjectReference type="Project" localcopy="True" refto="Qpid.Buffer" /> - <ProjectReference type="Project" localcopy="True" refto="Qpid.Codec" /> - </References> -</Project>
\ 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 @@ <?xml version="1.0"?> -<project name="XMS.AMQ.Client" default="build"> - <property name="nant.settings.currentframework" value="net-1.0" /> - <property name="basename" value="XMSClient"/> - <property name="debug" value="true"/> - <property name="CommonCollectionsDir" value="../CommonCollections"/> - <property name="MINADir" value="../minadotnet"/> - <property name="XMSCommonDir" value="../xmscommon"/> +<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 + --> - <if test="${debug}"> - <property name="targetdir" value="bin/${nant.settings.currentframework}/Debug"/> - </if> - <ifnot test="${debug}"> - <property name="targetdir" value="bin/${nant.settings.currentframework}/Release"/> - </ifnot> - - <target name="clean"> - <delete> - <fileset> - <include name="${targetdir}/${basename}.dll"/> - <include name="${targetdir}/${basename}.pdb"/> - </fileset> - </delete> - </target> - - <target name="init"> - <mkdir dir="${targetdir}"/> - </target> - - <target name="build" depends="init"> - <csc target="library" output="${targetdir}/${basename}.dll" debug="${debug}"> - <sources> - <include name="**/*.cs"/> - <exclude name="Properties/Settings.Designer.cs" /> - </sources> - <references> - <lib> - <include name="${CommonCollectionsDir}/${targetdir}" /> - <include name="${MINADir}/${targetdir}" /> - <include name="${XMSCommonDir}/${targetdir}" /> - <include name="${XMSCommonDir}/lib/**" /> - <include name="lib/**" /> - </lib> - <include name="CommonCollections.dll" /> - <include name="log4net.dll" /> - <include name="MINA.dll" /> - <include name="IBM.XMS.dll" /> - <include name="XMSCommon.dll" /> - </references> + <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" /> + <include name="${build.dir}/Qpid.Buffer.dll" /> + <include name="${build.dir}/Qpid.Sasl.dll" /> + <include name="${build.dir}/Qpid.Codec.dll" /> + <include name="${build.dir}/Qpid.Common.dll" /> + <include name="${build.dir}/Qpid.Messaging.dll" /> + <include name="${build.dir}/Org.Mentalis.Security.dll" /> + </references> </csc> </target> -</project>
\ No newline at end of file +</project> + 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 @@ <DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
- <OutputPath>bin\Debug\</OutputPath>
+ <OutputPath>..\bin\net-2.0\debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
@@ -22,7 +22,7 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
- <OutputPath>bin\Release\</OutputPath>
+ <OutputPath>..\bin\net-2.0\release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
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 @@ -<Project name="Qpid.Codec" fileversion="2.0" language="C#" clr-version="Net_1_1" ctype="DotNetProject"> - <Configurations active="Debug"> - <Configuration name="Debug" ctype="DotNetProjectConfiguration"> - <Output directory="./bin/Debug" assembly="Qpid.Codec" /> - <Build debugmode="True" target="Library" /> - <Execution runwithwarnings="True" consolepause="False" runtime="MsNet" clr-version="Net_1_1" /> - <CodeGeneration compiler="Csc" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" generatexmldocumentation="False" ctype="CSharpCompilerParameters" /> - </Configuration> - <Configuration name="Release" ctype="DotNetProjectConfiguration"> - <Output directory="./bin/Release" assembly="Qpid.Codec" /> - <Build debugmode="False" target="Library" /> - <Execution runwithwarnings="True" consolepause="False" runtime="MsNet" clr-version="Net_1_1" /> - <CodeGeneration compiler="Csc" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" generatexmldocumentation="False" ctype="CSharpCompilerParameters" /> - </Configuration> - </Configurations> - <DeployTargets /> - <Contents> - <File name="./Demux/DemuxingProtocolCodecFactory.cs" subtype="Code" buildaction="Compile" /> - <File name="./Demux/IMessageDecoder.cs" subtype="Code" buildaction="Compile" /> - <File name="./Demux/IMessageDecoderFactory.cs" subtype="Code" buildaction="Compile" /> - <File name="./Demux/IMessageEncoder.cs" subtype="Code" buildaction="Compile" /> - <File name="./Demux/IMessageEncoderFactory.cs" subtype="Code" buildaction="Compile" /> - <File name="./Demux/MessageDecoderResult.cs" subtype="Code" buildaction="Compile" /> - <File name="./Properties/AssemblyInfo.cs" subtype="Code" buildaction="Compile" /> - <File name="./Support/SimpleProtocolDecoderOutput.cs" subtype="Code" buildaction="Compile" /> - <File name="./Support/SimpleProtocolEncoderOutput.cs" subtype="Code" buildaction="Compile" /> - <File name="./CumulativeProtocolDecoder.cs" subtype="Code" buildaction="Compile" /> - <File name="./IProtocolCodecFactory.cs" subtype="Code" buildaction="Compile" /> - <File name="./IProtocolDecoder.cs" subtype="Code" buildaction="Compile" /> - <File name="./IProtocolDecoderOutput.cs" subtype="Code" buildaction="Compile" /> - <File name="./IProtocolEncoder.cs" subtype="Code" buildaction="Compile" /> - <File name="./IProtocolEncoderOutput.cs" subtype="Code" buildaction="Compile" /> - <File name="./ProtocolCodecException.cs" subtype="Code" buildaction="Compile" /> - <File name="./ProtocolDecoderException.cs" subtype="Code" buildaction="Compile" /> - <File name="./ProtocolEncoderException.cs" subtype="Code" buildaction="Compile" /> - </Contents> - <References> - <ProjectReference type="Gac" localcopy="True" refto="System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> - <ProjectReference type="Project" localcopy="True" refto="Qpid.Buffer" /> - </References> -</Project>
\ 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 @@ +<?xml version="1.0"?>
+<project name="Qpid.Codec" 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" />
+ <include name="${build.dir}/Qpid.Buffer.dll" />
+ </references>
+ </csc>
+ </target>
+</project>
+
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 @@ <DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
- <OutputPath>bin\Debug\</OutputPath>
+ <OutputPath>..\bin\net-2.0\debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
@@ -23,7 +23,7 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
- <OutputPath>bin\Release\</OutputPath>
+ <OutputPath>..\bin\net-2.0\release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
@@ -62,4 +62,4 @@ <Target Name="AfterBuild">
</Target>
-->
-</Project>
+</Project>
\ 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 @@ -<Project name="Qpid.Common.Tests" fileversion="2.0" language="C#" clr-version="Net_1_1" ctype="DotNetProject"> - <Configurations active="Debug"> - <Configuration name="Debug" ctype="DotNetProjectConfiguration"> - <Output directory="./bin/Debug" assembly="Qpid.Common.Tests" /> - <Build debugmode="True" target="Library" /> - <Execution runwithwarnings="True" consolepause="False" runtime="MsNet" clr-version="Net_1_1" /> - <CodeGeneration compiler="Csc" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" generatexmldocumentation="False" ctype="CSharpCompilerParameters" /> - </Configuration> - <Configuration name="Release" ctype="DotNetProjectConfiguration"> - <Output directory="./bin/Release" assembly="Qpid.Common.Tests" /> - <Build debugmode="False" target="Library" /> - <Execution runwithwarnings="True" consolepause="False" runtime="MsNet" clr-version="Net_1_1" /> - <CodeGeneration compiler="Csc" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" generatexmldocumentation="False" ctype="CSharpCompilerParameters" /> - </Configuration> - </Configurations> - <DeployTargets /> - <Contents> - <File name="./Properties/AssemblyInfo.cs" subtype="Code" buildaction="Compile" /> - <File name="./Qpid/Collections/TestLinkedHashtable.cs" subtype="Code" buildaction="Compile" /> - <File name="./Qpid/Framing/TestAMQType.cs" subtype="Code" buildaction="Compile" /> - </Contents> - <References> - <ProjectReference type="Gac" localcopy="True" refto="System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> - <ProjectReference type="Assembly" localcopy="True" refto="../Qpid.Client.Tests/lib/nunit/nunit.framework.dll" /> - <ProjectReference type="Project" localcopy="True" refto="Qpid.Buffer" /> - <ProjectReference type="Project" localcopy="True" refto="Qpid.Common" /> - </References> -</Project> 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 @@ +<?xml version="1.0"?>
+<project name="Qpid.Common" default="test">
+
+ <target name="build">
+ <csc target="library"
+ define="${build.defines}"
+ warnaserror="true" debug="${build.debug}"
+ output="${build.dir}/${project::get-name()}.Tests.dll">
+
+ <sources>
+ <include name="**/*.cs" />
+ </sources>
+ <references>
+ <include name="${build.dir}/log4net.dll" />
+ <include name="${build.dir}/nunit.framework.dll" />
+ <include name="${build.dir}/${project::get-name()}.dll" />
+ <include name="${build.dir}/Qpid.Codec.dll" />
+ <include name="${build.dir}/Qpid.Messaging.dll" />
+ <include name="${build.dir}/Qpid.Buffer.dll" />
+ </references>
+
+ </csc>
+ </target>
+ <target name="test" depends="build">
+ <nunit2>
+ <formatter type="${nant.formatter}" usefile="false" />
+ <test assemblyname="${build.dir}/${project::get-name()}.Tests.dll" />
+ </nunit2>
+ </target>
+</project>
+
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 @@ <DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
- <OutputPath>bin\Debug\</OutputPath>
+ <OutputPath>..\bin\net-2.0\debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
@@ -25,7 +25,7 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
- <OutputPath>bin\Release\</OutputPath>
+ <OutputPath>..\bin\net-2.0\release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
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 @@ -<Project name="Qpid.Common" fileversion="2.0" language="C#" clr-version="Net_1_1" ctype="DotNetProject"> - <Configurations active="Debug"> - <Configuration name="Debug" ctype="DotNetProjectConfiguration"> - <Output directory="./bin/Debug" assembly="Qpid.Common" /> - <Build debugmode="True" target="Library" /> - <Execution runwithwarnings="True" consolepause="False" runtime="MsNet" clr-version="Net_1_1" /> - <CodeGeneration compiler="Csc" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" generatexmldocumentation="False" ctype="CSharpCompilerParameters" /> - </Configuration> - <Configuration name="Release" ctype="DotNetProjectConfiguration"> - <Output directory="./bin/Release" assembly="Qpid.Common" /> - <Build debugmode="False" target="Library" /> - <Execution runwithwarnings="True" consolepause="False" runtime="MsNet" clr-version="Net_1_1" /> - <CodeGeneration compiler="Csc" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" generatexmldocumentation="False" ctype="CSharpCompilerParameters" /> - </Configuration> - </Configurations> - <DeployTargets /> - <Contents> - <File name="./" subtype="Directory" buildaction="Compile" /> - <File name="./Collections/BlockingQueue.cs" subtype="Code" buildaction="Compile" /> - <File name="./Collections/LinkedBlockingQueue.cs" subtype="Code" buildaction="Compile" /> - <File name="./Collections/LinkedHashtable.cs" subtype="Code" buildaction="Compile" /> - <File name="./Collections/SynchronousQueue.cs" subtype="Code" buildaction="Compile" /> - <File name="./Framing/AMQDataBlockDecoder.cs" subtype="Code" buildaction="Compile" /> - <File name="./Framing/AMQDataBlockEncoder.cs" subtype="Code" buildaction="Compile" /> - <File name="./Framing/AMQFrame.cs" subtype="Code" buildaction="Compile" /> - <File name="./Framing/AMQFrameDecodingException.cs" subtype="Code" buildaction="Compile" /> - <File name="./Framing/AMQMethodBody.cs" subtype="Code" buildaction="Compile" /> - <File name="./Framing/AMQMethodBodyFactory.cs" subtype="Code" buildaction="Compile" /> - <File name="./Framing/AMQProtocolHeaderException.cs" subtype="Code" buildaction="Compile" /> - <File name="./Framing/AMQType.cs" subtype="Code" buildaction="Compile" /> - <File name="./Framing/AMQTypedValue.cs" subtype="Code" buildaction="Compile" /> - <File name="./Framing/AMQTypeMap.cs" subtype="Code" buildaction="Compile" /> - <File name="./Framing/BasicContentHeaderProperties.cs" subtype="Code" buildaction="Compile" /> - <File name="./Framing/CompositeAMQDataBlock.cs" subtype="Code" buildaction="Compile" /> - <File name="./Framing/ContentBody.cs" subtype="Code" buildaction="Compile" /> - <File name="./Framing/ContentBodyFactory.cs" subtype="Code" buildaction="Compile" /> - <File name="./Framing/ContentHeaderBody.cs" subtype="Code" buildaction="Compile" /> - <File name="./Framing/ContentHeaderBodyFactory.cs" subtype="Code" buildaction="Compile" /> - <File name="./Framing/ContentHeaderPropertiesFactory.cs" subtype="Code" buildaction="Compile" /> - <File name="./Framing/EncodingUtils.cs" subtype="Code" buildaction="Compile" /> - <File name="./Framing/FieldTable.cs" subtype="Code" buildaction="Compile" /> - <File name="./Framing/HeartbeatBody.cs" subtype="Code" buildaction="Compile" /> - <File name="./Framing/HeartbeatBodyFactory.cs" subtype="Code" buildaction="Compile" /> - <File name="./Framing/IBody.cs" subtype="Code" buildaction="Compile" /> - <File name="./Framing/IBodyFactory.cs" subtype="Code" buildaction="Compile" /> - <File name="./Framing/IContentHeaderProperties.cs" subtype="Code" buildaction="Compile" /> - <File name="./Framing/IDataBlock.cs" subtype="Code" buildaction="Compile" /> - <File name="./Framing/IEncodableAMQDataBlock.cs" subtype="Code" buildaction="Compile" /> - <File name="./Framing/ProtocolInitiation.cs" subtype="Code" buildaction="Compile" /> - <File name="./generated/AccessRequestBody.cs" subtype="Code" buildaction="Compile" /> - <File name="./generated/AccessRequestOkBody.cs" subtype="Code" buildaction="Compile" /> - <File name="./generated/BasicAckBody.cs" subtype="Code" buildaction="Compile" /> - <File name="./generated/BasicCancelBody.cs" subtype="Code" buildaction="Compile" /> - <File name="./generated/BasicCancelOkBody.cs" subtype="Code" buildaction="Compile" /> - <File name="./generated/BasicConsumeBody.cs" subtype="Code" buildaction="Compile" /> - <File name="./generated/BasicConsumeOkBody.cs" subtype="Code" buildaction="Compile" /> - <File name="./generated/BasicDeliverBody.cs" subtype="Code" buildaction="Compile" /> - <File name="./generated/BasicGetBody.cs" subtype="Code" buildaction="Compile" /> - <File name="./generated/BasicGetEmptyBody.cs" subtype="Code" buildaction="Compile" /> - <File name="./generated/BasicGetOkBody.cs" subtype="Code" buildaction="Compile" /> - <File name="./generated/BasicPublishBody.cs" subtype="Code" buildaction="Compile" /> - <File name="./generated/BasicQosBody.cs" subtype="Code" buildaction="Compile" /> - <File name="./generated/BasicQosOkBody.cs" subtype="Code" buildaction="Compile" /> - <File name="./generated/BasicRecoverBody.cs" subtype="Code" buildaction="Compile" /> - <File name="./generated/BasicRejectBody.cs" subtype="Code" buildaction="Compile" /> - <File name="./generated/BasicReturnBody.cs" subtype="Code" buildaction="Compile" /> - <File name="./generated/ChannelAlertBody.cs" subtype="Code" buildaction="Compile" /> - <File name="./generated/ChannelCloseBody.cs" subtype="Code" buildaction="Compile" /> - <File name="./generated/ChannelCloseOkBody.cs" subtype="Code" buildaction="Compile" /> - <File name="./generated/ChannelFlowBody.cs" subtype="Code" buildaction="Compile" /> - <File name="./generated/ChannelFlowOkBody.cs" subtype="Code" buildaction="Compile" /> - <File name="./generated/ChannelOpenBody.cs" subtype="Code" buildaction="Compile" /> - <File name="./generated/ChannelOpenOkBody.cs" subtype="Code" buildaction="Compile" /> - <File name="./generated/ConnectionCloseBody.cs" subtype="Code" buildaction="Compile" /> - <File name="./generated/ConnectionCloseOkBody.cs" subtype="Code" buildaction="Compile" /> - <File name="./generated/ConnectionOpenBody.cs" subtype="Code" buildaction="Compile" /> - <File name="./generated/ConnectionOpenOkBody.cs" subtype="Code" buildaction="Compile" /> - <File name="./generated/ConnectionRedirectBody.cs" subtype="Code" buildaction="Compile" /> - <File name="./generated/ConnectionSecureBody.cs" subtype="Code" buildaction="Compile" /> - <File name="./generated/ConnectionSecureOkBody.cs" subtype="Code" buildaction="Compile" /> - <File name="./generated/ConnectionStartBody.cs" subtype="Code" buildaction="Compile" /> - <File name="./generated/ConnectionStartOkBody.cs" subtype="Code" buildaction="Compile" /> - <File name="./generated/ConnectionTuneBody.cs" subtype="Code" buildaction="Compile" /> - <File name="./generated/ConnectionTuneOkBody.cs" subtype="Code" buildaction="Compile" /> - <File name="./generated/DtxSelectBody.cs" subtype="Code" buildaction="Compile" /> - <File name="./generated/DtxSelectOkBody.cs" subtype="Code" buildaction="Compile" /> - <File name="./generated/DtxStartBody.cs" subtype="Code" buildaction="Compile" /> - <File name="./generated/DtxStartOkBody.cs" subtype="Code" buildaction="Compile" /> - <File name="./generated/ExchangeDeclareBody.cs" subtype="Code" buildaction="Compile" /> - <File name="./generated/ExchangeDeclareOkBody.cs" subtype="Code" buildaction="Compile" /> - <File name="./generated/ExchangeDeleteBody.cs" subtype="Code" buildaction="Compile" /> - <File name="./generated/ExchangeDeleteOkBody.cs" subtype="Code" buildaction="Compile" /> - <File name="./generated/FileAckBody.cs" subtype="Code" buildaction="Compile" /> - <File name="./generated/FileCancelBody.cs" subtype="Code" buildaction="Compile" /> - <File name="./generated/FileCancelOkBody.cs" subtype="Code" buildaction="Compile" /> - <File name="./generated/FileConsumeBody.cs" subtype="Code" buildaction="Compile" /> - <File name="./generated/FileConsumeOkBody.cs" subtype="Code" buildaction="Compile" /> - <File name="./generated/FileDeliverBody.cs" subtype="Code" buildaction="Compile" /> - <File name="./generated/FileOpenBody.cs" subtype="Code" buildaction="Compile" /> - <File name="./generated/FileOpenOkBody.cs" subtype="Code" buildaction="Compile" /> - <File name="./generated/FilePublishBody.cs" subtype="Code" buildaction="Compile" /> - <File name="./generated/FileQosBody.cs" subtype="Code" buildaction="Compile" /> - <File name="./generated/FileQosOkBody.cs" subtype="Code" buildaction="Compile" /> - <File name="./generated/FileRejectBody.cs" subtype="Code" buildaction="Compile" /> - <File name="./generated/FileReturnBody.cs" subtype="Code" buildaction="Compile" /> - <File name="./generated/FileStageBody.cs" subtype="Code" buildaction="Compile" /> - <File name="./generated/MainRegistry.cs" subtype="Code" buildaction="Compile" /> - <File name="./generated/MethodBodyDecoderRegistry.cs" subtype="Code" buildaction="Compile" /> - <File name="./generated/QueueBindBody.cs" subtype="Code" buildaction="Compile" /> - <File name="./generated/QueueBindOkBody.cs" subtype="Code" buildaction="Compile" /> - <File name="./generated/QueueDeclareBody.cs" subtype="Code" buildaction="Compile" /> - <File name="./generated/QueueDeclareOkBody.cs" subtype="Code" buildaction="Compile" /> - <File name="./generated/QueueDeleteBody.cs" subtype="Code" buildaction="Compile" /> - <File name="./generated/QueueDeleteOkBody.cs" subtype="Code" buildaction="Compile" /> - <File name="./generated/QueuePurgeBody.cs" subtype="Code" buildaction="Compile" /> - <File name="./generated/QueuePurgeOkBody.cs" subtype="Code" buildaction="Compile" /> - <File name="./generated/StreamCancelBody.cs" subtype="Code" buildaction="Compile" /> - <File name="./generated/StreamCancelOkBody.cs" subtype="Code" buildaction="Compile" /> - <File name="./generated/StreamConsumeBody.cs" subtype="Code" buildaction="Compile" /> - <File name="./generated/StreamConsumeOkBody.cs" subtype="Code" buildaction="Compile" /> - <File name="./generated/StreamDeliverBody.cs" subtype="Code" buildaction="Compile" /> - <File name="./generated/StreamPublishBody.cs" subtype="Code" buildaction="Compile" /> - <File name="./generated/StreamQosBody.cs" subtype="Code" buildaction="Compile" /> - <File name="./generated/StreamQosOkBody.cs" subtype="Code" buildaction="Compile" /> - <File name="./generated/StreamReturnBody.cs" subtype="Code" buildaction="Compile" /> - <File name="./generated/TestContentBody.cs" subtype="Code" buildaction="Compile" /> - <File name="./generated/TestContentOkBody.cs" subtype="Code" buildaction="Compile" /> - <File name="./generated/TestIntegerBody.cs" subtype="Code" buildaction="Compile" /> - <File name="./generated/TestIntegerOkBody.cs" subtype="Code" buildaction="Compile" /> - <File name="./generated/TestStringBody.cs" subtype="Code" buildaction="Compile" /> - <File name="./generated/TestStringOkBody.cs" subtype="Code" buildaction="Compile" /> - <File name="./generated/TestTableBody.cs" subtype="Code" buildaction="Compile" /> - <File name="./generated/TestTableOkBody.cs" subtype="Code" buildaction="Compile" /> - <File name="./generated/TunnelRequestBody.cs" subtype="Code" buildaction="Compile" /> - <File name="./generated/TxCommitBody.cs" subtype="Code" buildaction="Compile" /> - <File name="./generated/TxCommitOkBody.cs" subtype="Code" buildaction="Compile" /> - <File name="./generated/TxRollbackBody.cs" subtype="Code" buildaction="Compile" /> - <File name="./generated/TxRollbackOkBody.cs" subtype="Code" buildaction="Compile" /> - <File name="./generated/TxSelectBody.cs" subtype="Code" buildaction="Compile" /> - <File name="./generated/TxSelectOkBody.cs" subtype="Code" buildaction="Compile" /> - <File name="./Properties/AssemblyInfo.cs" subtype="Code" buildaction="Compile" /> - <File name="./AMQChannelClosedException.cs" subtype="Code" buildaction="Compile" /> - <File name="./AMQConnectionClosedException.cs" subtype="Code" buildaction="Compile" /> - <File name="./AMQDisconnectedException.cs" subtype="Code" buildaction="Compile" /> - <File name="./AMQException.cs" subtype="Code" buildaction="Compile" /> - <File name="./AMQUndeliveredException.cs" subtype="Code" buildaction="Compile" /> - <File name="./AssemblySettings.cs" subtype="Code" buildaction="Compile" /> - </Contents> - <References> - <ProjectReference type="Gac" localcopy="True" refto="System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> - <ProjectReference type="Assembly" localcopy="True" refto="./lib/log4net/log4net.dll" /> - <ProjectReference type="Project" localcopy="True" refto="Qpid.Buffer" /> - <ProjectReference type="Project" localcopy="True" refto="Qpid.Codec" /> - <ProjectReference type="Project" localcopy="True" refto="Qpid.Messaging" /> - <ProjectReference type="Gac" localcopy="True" refto="System.Xml, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> - </References> -</Project> 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 @@ <?xml version="1.0"?> -<project name="XMS.AMQ.Common" default="build"> - <property name="nant.settings.currentframework" value="net-1.0" /> - <property name="basename" value="XMSCommon"/> - <property name="debug" value="true"/> - <property name="CommonCollectionsDir" value="../CommonCollections"/> - <property name="MINADir" value="../minadotnet"/> +<project name="Qpid.Common" 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 + --> - <if test="${debug}"> - <property name="targetdir" value="bin/${nant.settings.currentframework}/Debug"/> - </if> - <ifnot test="${debug}"> - <property name="targetdir" value="bin/${nant.settings.currentframework}/Release"/> - </ifnot> - - <target name="clean"> - <delete> - <fileset> - <include name="${targetdir}/${basename}.dll"/> - <include name="${targetdir}/${basename}.pdb"/> - </fileset> - </delete> - </target> - - <target name="init"> - <mkdir dir="${targetdir}"/> - </target> - - <target name="build" depends="init"> - <csc target="library" output="${targetdir}/${basename}.dll" debug="${debug}"> - <sources> - <include name="**/*.cs"/> - <exclude name="Properties/Settings.Designer.cs" /> - </sources> - <references> - <lib> - <include name="${CommonCollectionsDir}/${targetdir}" /> - <include name="${MINADir}/${targetdir}" /> - <include name="lib/**" /> - </lib> - <include name="CommonCollections.dll" /> - <include name="log4net.dll" /> - <include name="MINA.dll" /> - <include name="IBM.XMS.dll" /> - </references> + <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" /> + <include name="${build.dir}/Qpid.Buffer.dll" /> + <include name="${build.dir}/Qpid.Messaging.dll" /> + <include name="${build.dir}/Qpid.Codec.dll" /> + </references> </csc> </target> -</project>
\ No newline at end of file +</project> + 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 @@ <DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
- <OutputPath>bin\Debug\</OutputPath>
+ <OutputPath>..\bin\net-2.0\debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
@@ -23,7 +23,7 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
- <OutputPath>bin\Release\</OutputPath>
+ <OutputPath>..\bin\net-2.0\release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
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 @@ -<Project name="Qpid.Messaging" fileversion="2.0" language="C#" clr-version="Net_1_1" ctype="DotNetProject"> - <Configurations active="Debug"> - <Configuration name="Debug" ctype="DotNetProjectConfiguration"> - <Output directory="./bin/Debug" assembly="Qpid.Messaging" /> - <Build debugmode="True" target="Library" /> - <Execution runwithwarnings="True" consolepause="False" runtime="MsNet" clr-version="Net_1_1" /> - <CodeGeneration compiler="Csc" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" generatexmldocumentation="False" ctype="CSharpCompilerParameters" /> - </Configuration> - <Configuration name="Release" ctype="DotNetProjectConfiguration"> - <Output directory="./bin/Release" assembly="Qpid.Messaging" /> - <Build debugmode="False" target="Library" /> - <Execution runwithwarnings="True" consolepause="False" runtime="MsNet" clr-version="Net_1_1" /> - <CodeGeneration compiler="Csc" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" generatexmldocumentation="False" ctype="CSharpCompilerParameters" /> - </Configuration> - </Configurations> - <DeployTargets /> - <Contents> - <File name="./Properties/AssemblyInfo.cs" subtype="Code" buildaction="Compile" /> - <File name="./AcknowledgeMode.cs" subtype="Code" buildaction="Compile" /> - <File name="./ChannelLimitReachedException.cs" subtype="Code" buildaction="Compile" /> - <File name="./DeliveryMode.cs" subtype="Code" buildaction="Compile" /> - <File name="./ExchangeClassConstants.cs" subtype="Code" buildaction="Compile" /> - <File name="./ExchangeNameDefaults.cs" subtype="Code" buildaction="Compile" /> - <File name="./IBytesMessage.cs" subtype="Code" buildaction="Compile" /> - <File name="./IChannel.cs" subtype="Code" buildaction="Compile" /> - <File name="./IConnection.cs" subtype="Code" buildaction="Compile" /> - <File name="./IConnectionFactory.cs" subtype="Code" buildaction="Compile" /> - <File name="./IConnectionListener.cs" subtype="Code" buildaction="Compile" /> - <File name="./IFieldTable.cs" subtype="Code" buildaction="Compile" /> - <File name="./IHeaders.cs" subtype="Code" buildaction="Compile" /> - <File name="./IMessage.cs" subtype="Code" buildaction="Compile" /> - <File name="./IMessageConsumer.cs" subtype="Code" buildaction="Compile" /> - <File name="./IMessagePublisher.cs" subtype="Code" buildaction="Compile" /> - <File name="./ITextMessage.cs" subtype="Code" buildaction="Compile" /> - <File name="./MessageConsumerBuilder.cs" subtype="Code" buildaction="Compile" /> - <File name="./MessageNotReadableException.cs" subtype="Code" buildaction="Compile" /> - <File name="./MessageNotWritableException.cs" subtype="Code" buildaction="Compile" /> - <File name="./MessagePublisherBuilder.cs" subtype="Code" buildaction="Compile" /> - <File name="./QpidException.cs" subtype="Code" buildaction="Compile" /> - <File name="./ResourceAllocationException.cs" subtype="Code" buildaction="Compile" /> - </Contents> - <References> - <ProjectReference type="Gac" localcopy="True" refto="System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> - </References> -</Project>
\ 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 @@ +<?xml version="1.0"?>
+<project name="Qpid.Messaging" 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>
+ </references>
+ </csc>
+ </target>
+</project>
+
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 @@ <DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
- <OutputPath>bin\Debug\</OutputPath>
+ <OutputPath>..\bin\net-2.0\debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
@@ -23,7 +23,7 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
- <OutputPath>bin\Release\</OutputPath>
+ <OutputPath>..\bin\net-2.0\release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
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 @@ +<?xml version="1.0"?>
+<project name="Qpid.Sasl" default="test">
+
+ <target name="build">
+ <csc target="library"
+ define="${build.defines}"
+ warnaserror="true" debug="${build.debug}"
+ output="${build.dir}/${project::get-name()}.Tests.dll">
+
+ <sources>
+ <include name="**/*.cs" />
+ </sources>
+ <references>
+ <include name="${build.dir}/nunit.framework.dll" />
+ <include name="${build.dir}/${project::get-name()}.dll" />
+ </references>
+
+ </csc>
+ <copy
+ tofile="${build.dir}/${project::get-name()}.Tests.dll.config"
+ file="App.config"
+ />
+ </target>
+ <target name="test" depends="build">
+ <nunit2>
+ <formatter type="${nant.formatter}" usefile="false" />
+ <test assemblyname="${build.dir}/${project::get-name()}.Tests.dll" />
+ </nunit2>
+ </target>
+</project>
+
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 @@ <DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
- <OutputPath>bin\Debug\</OutputPath>
+ <OutputPath>..\bin\net-2.0\debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
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 @@ +<?xml version="1.0"?>
+<project name="Qpid.Sasl" 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>
+ </references>
+ </csc>
+ </target>
+</project>
+
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 @@ <DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
- <OutputPath>bin\Debug\</OutputPath>
+ <OutputPath>..\bin\net-2.0\debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
@@ -22,7 +22,7 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
- <OutputPath>bin\Release\</OutputPath>
+ <OutputPath>..\bin\net-2.0\release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
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 @@ +<?xml version="1.0"?>
+<project name="TopicListener" 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="exe"
+ define="${build.defines}"
+ debug="${build.debug}"
+ unsafe="true"
+ output="${build.dir}/${project::get-name()}.exe">
+
+ <sources>
+ <include name="**/*.cs" />
+ </sources>
+ <references>
+ <include name="${build.dir}\Qpid.Client.Tests.dll"/>
+ </references>
+ </csc>
+ </target>
+</project>
+
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 @@ <DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
- <OutputPath>bin\Debug\</OutputPath>
+ <OutputPath>..\bin\net-2.0\debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
@@ -22,7 +22,7 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
- <OutputPath>bin\Release\</OutputPath>
+ <OutputPath>..\bin\net-2.0\release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
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 @@ +<?xml version="1.0"?>
+<project name="TopicPublisher" 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="exe"
+ define="${build.defines}"
+ debug="${build.debug}"
+ unsafe="true"
+ output="${build.dir}/${project::get-name()}.exe">
+
+ <sources>
+ <include name="**/*.cs" />
+ </sources>
+ <references>
+ <include name="${build.dir}\Qpid.Client.Tests.dll"/>
+ </references>
+ </csc>
+ </target>
+</project>
+
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-.*<HintPath>\(.*\)</HintPath>-\1-' -e 's-\\-/-g' | - while read ref; do - echo $PWD/$ref - done -} - -Build() -{ - assembly=$1; shift - - echo "====================================================" - echo Building $assembly - references=$(grep '<ProjectReference' $assembly/$assembly.csproj | sed -e 's-.*"\(.*\)".*-\1-' -e 's-\\-/-g' | - while read file; do - echo $(basename $file .csproj); - done) - references=$(echo $references) - echo "Projects referenced = [$references]" - ( - regularRefs="" - for ref in $references; do - regularRefs="$regularRefs $outDir/$ref.dll" - done - cd $assembly - find . -name \*.cs >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 @@ +<?xml version="1.0"?>
+<project name="Qpid.NET" default="build">
+ <property name="nant.formatter" value="Plain" />
+ <!--
+ Build debug or release build?
+ -->
+ <property name="build.config" value="debug" />
+
+ <!--
+ Fileset with build files for each core assembly
+ -->
+ <fileset id="src.builds">
+ <include name="Qpid.Buffer/default.build" />
+ <include name="Qpid.Sasl/default.build" />
+ <include name="Qpid.Messaging/default.build" />
+ <include name="Qpid.Codec/default.build" />
+ <include name="Qpid.Common/default.build" />
+ <include name="Qpid.Client/default.build" />
+ </fileset>
+
+ <!--
+ Fileset with build files for test assemblies
+ -->
+ <fileset id="tests.builds">
+ <include name="Qpid.Buffer.Tess/default.build" />
+ <include name="Qpid.Sasl.Tests/default.build" />
+ <include name="Qpid.Common.Tests/default.build" />
+ <include name="Qpid.Client.Tests/default.build" />
+ <include name="TopicListener/default.build" />
+ <include name="TopicPublisher/default.build" />
+ </fileset>
+
+ <!--
+ Prepare environment for a debug build
+ -->
+ <target name="debug">
+ <property name="build.debug" value="true" />
+ <property name="build.defines" value="DEBUG;TRACE"/>
+ </target>
+ <!--
+ Prepare environment for a release build
+ -->
+ <target name="release">
+ <property name="build.debug" value="false" />
+ <property name="build.defines" value=""/>
+ </target>
+
+ <!--
+ prepare environment for build
+ -->
+ <target name="init">
+ <property name="base.dir" value="${project::get-base-directory()}" />
+ <property name="build.dir" value="${base.dir}/bin/${framework::get-target-framework()}/${build.config}" />
+ <call target="${build.config}" />
+ </target>
+
+ <target name="clean" depends="init">
+ <delete dir="${build.dir}" failonerror="false" />
+ </target>
+
+ <!--
+ Do the build
+ -->
+ <target name="build" depends="init">
+ <!-- make sure output folder exists -->
+ <mkdir dir="${build.dir}" />
+ <!-- copy reference assemblies over to the output dir -->
+ <copy todir="${build.dir}" file="Qpid.Common/lib/seclib-1.0.0/Org.Mentalis.Security.dll"/>
+ <copy todir="${build.dir}" file="Qpid.Common/lib/log4net/log4net.dll"/>
+ <copy todir="${build.dir}" file="Qpid.Client.Tests/lib/nunit/nunit.framework.dll"/>
+ <!--
+ Compile assemblies
+ -->
+ <nant target="build">
+ <buildfiles refid="src.builds" />
+ </nant>
+ <!--
+ Compile test assemblies
+ -->
+ <nant target="build">
+ <buildfiles refid="tests.builds" />
+ </nant>
+ -->
+ </target>
+
+ <!--
+ Execute unit tests
+ -->
+ <target name="test" depends="build">
+ <echo message="Running unit tests for the project." />
+ <nant target="test">
+ <buildfiles refid="tests.builds" />
+ </nant>
+ </target>
+
+ <!--
+ Make a release package
+ -->
+ <target name="release-pkg">
+ <echo message="building and packing a release"/>
+ <call target="clean"/>
+ <call target="build"/>
+ <property name="build.date" value="${datetime::now()}"/>
+
+ <zip zipfile="${build.dir}/Qpid.NET-${framework::get-target-framework()}-${datetime::get-year(build.date)}${datetime::get-month(build.date)}${datetime::get-day(build.date)}.zip">
+ <fileset basedir="${build.dir}">
+ <include name="**/*.*"/>
+ <exclude name="**/*.Tests.*"/>
+ <exclude name="**/nunit.framework.dll"/>
+ <exclude name="**/*.exe"/>
+ </fileset>
+ </zip>
+ </target>
+
+</project>
+
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 @@ -<Combine name="dotnet" fileversion="2.0"> - <Configurations active="Debug"> - <Configuration name="Debug" ctype="CombineConfiguration"> - <Entry build="True" name="Qpid.Messaging" configuration="Debug" /> - <Entry build="True" name="Qpid.Common" configuration="Debug" /> - <Entry build="True" name="Qpid.Buffer" configuration="Debug" /> - <Entry build="True" name="Qpid.Codec" configuration="Debug" /> - <Entry build="True" name="Qpid.Client" configuration="Debug" /> - <Entry build="True" name="Qpid.Client.Tests" configuration="Debug" /> - <Entry build="True" name="Qpid.Common.Tests" configuration="Debug" /> - <Entry build="True" name="Qpid.Client.Transport.Socket.Blocking" configuration="Debug" /> - </Configuration> - <Configuration name="Release" ctype="CombineConfiguration"> - <Entry build="True" name="Qpid.Messaging" configuration="Release" /> - <Entry build="True" name="Qpid.Common" configuration="Release" /> - <Entry build="True" name="Qpid.Buffer" configuration="Release" /> - <Entry build="True" name="Qpid.Codec" configuration="Release" /> - <Entry build="True" name="Qpid.Client" configuration="Release" /> - <Entry build="True" name="Qpid.Client.Tests" configuration="Release" /> - <Entry build="True" name="Qpid.Common.Tests" configuration="Release" /> - <Entry build="True" name="Qpid.Client.Transport.Socket.Blocking" configuration="Release" /> - </Configuration> - </Configurations> - <DeployTargets /> - <StartMode startupentry="Qpid.Client.Tests" single="True"> - <Execute type="None" entry="Qpid.Messaging" /> - <Execute type="None" entry="Qpid.Common" /> - <Execute type="None" entry="Qpid.Buffer" /> - <Execute type="None" entry="Qpid.Codec" /> - <Execute type="None" entry="Qpid.Client" /> - <Execute type="None" entry="Qpid.Client.Tests" /> - <Execute type="None" entry="Qpid.Common.Tests" /> - <Execute type="None" entry="Qpid.Client.Transport.Socket.Blocking" /> - </StartMode> - <Entries> - <Entry filename="./Qpid.Messaging/Qpid.Messaging.mdp" /> - <Entry filename="./Qpid.Common/Qpid.Common.mdp" /> - <Entry filename="./Qpid.Buffer/Qpid.Buffer.mdp" /> - <Entry filename="./Qpid.Codec/Qpid.Codec.mdp" /> - <Entry filename="./Qpid.Client/Qpid.Client.mdp" /> - <Entry filename="./Qpid.Client.Tests/Qpid.Client.Tests.mdp" /> - <Entry filename="./Qpid.Common.Tests/Qpid.Common.Tests.mdp" /> - <Entry filename="./Qpid.Client.Transport.Socket.Blocking/Qpid.Client.Transport.Socket.Blocking.mdp" /> - </Entries> -</Combine>
\ No newline at end of file diff --git a/qpid/dotnet/release b/qpid/dotnet/release index c1e25df10f..11291e87d6 100644..100755 --- 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 |