Author: tomasr
Date: Mon May 14 07:06:40 2007
New Revision: 537848
URL: http://svn.apache.org/viewvc?view=rev&rev=537848
Log:
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
........
Added:
incubator/qpid/trunk/qpid/dotnet/Qpid.Buffer.Tests/default.build
- copied unchanged from r537845,
incubator/qpid/branches/M2/dotnet/Qpid.Buffer.Tests/default.build
incubator/qpid/trunk/qpid/dotnet/Qpid.Buffer/default.build
- copied unchanged from r537845,
incubator/qpid/branches/M2/dotnet/Qpid.Buffer/default.build
incubator/qpid/trunk/qpid/dotnet/Qpid.Codec/default.build
- copied unchanged from r537845,
incubator/qpid/branches/M2/dotnet/Qpid.Codec/default.build
incubator/qpid/trunk/qpid/dotnet/Qpid.Common.Tests/default.build
- copied unchanged from r537845,
incubator/qpid/branches/M2/dotnet/Qpid.Common.Tests/default.build
incubator/qpid/trunk/qpid/dotnet/Qpid.Messaging/default.build
- copied unchanged from r537845,
incubator/qpid/branches/M2/dotnet/Qpid.Messaging/default.build
incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl.Tests/default.build
- copied unchanged from r537845,
incubator/qpid/branches/M2/dotnet/Qpid.Sasl.Tests/default.build
incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl/default.build
- copied unchanged from r537845,
incubator/qpid/branches/M2/dotnet/Qpid.Sasl/default.build
incubator/qpid/trunk/qpid/dotnet/TopicListener/default.build
- copied unchanged from r537845,
incubator/qpid/branches/M2/dotnet/TopicListener/default.build
incubator/qpid/trunk/qpid/dotnet/TopicPublisher/default.build
- copied unchanged from r537845,
incubator/qpid/branches/M2/dotnet/TopicPublisher/default.build
incubator/qpid/trunk/qpid/dotnet/default.build
- copied unchanged from r537845,
incubator/qpid/branches/M2/dotnet/default.build
Removed:
incubator/qpid/trunk/qpid/dotnet/Qpid.Buffer/FixedByteBuffer.cs
incubator/qpid/trunk/qpid/dotnet/Qpid.Buffer/HeapByteBuffer.cs
incubator/qpid/trunk/qpid/dotnet/Qpid.Buffer/Qpid.Buffer.mdp
incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/Qpid.Client.Tests.mdp
incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Qpid.Client.mdp
incubator/qpid/trunk/qpid/dotnet/Qpid.Codec/Qpid.Codec.mdp
incubator/qpid/trunk/qpid/dotnet/Qpid.Common.Tests/Qpid.Common.Tests.mdp
incubator/qpid/trunk/qpid/dotnet/Qpid.Common/Qpid.Common.mdp
incubator/qpid/trunk/qpid/dotnet/Qpid.Messaging/Qpid.Messaging.mdp
incubator/qpid/trunk/qpid/dotnet/dotnet.mds
Modified:
incubator/qpid/trunk/qpid/ (props changed)
incubator/qpid/trunk/qpid/dotnet/Qpid.Buffer.Tests/Qpid.Buffer.Tests.csproj
incubator/qpid/trunk/qpid/dotnet/Qpid.Buffer/Qpid.Buffer.csproj
incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/Qpid.Client.Tests.csproj
incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/connection/SslConnectionTest.cs
incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/default.build
incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Qpid.Client.csproj
incubator/qpid/trunk/qpid/dotnet/Qpid.Client/default.build
incubator/qpid/trunk/qpid/dotnet/Qpid.Codec/Qpid.Codec.csproj
incubator/qpid/trunk/qpid/dotnet/Qpid.Common.Tests/Qpid.Common.Tests.csproj
incubator/qpid/trunk/qpid/dotnet/Qpid.Common/Qpid.Common.csproj
incubator/qpid/trunk/qpid/dotnet/Qpid.Common/default.build
incubator/qpid/trunk/qpid/dotnet/Qpid.Messaging/Qpid.Messaging.csproj
incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl.Tests/Mechanisms/DigestSaslClientTests.cs
incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl.Tests/Mechanisms/ExternalSaslClientTests.cs
incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl.Tests/Qpid.Sasl.Tests.csproj
incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl/Qpid.Sasl.csproj
incubator/qpid/trunk/qpid/dotnet/README.txt
incubator/qpid/trunk/qpid/dotnet/TODO.txt
incubator/qpid/trunk/qpid/dotnet/TopicListener/TopicListener.csproj
incubator/qpid/trunk/qpid/dotnet/TopicPublisher/TopicPublisher.csproj
incubator/qpid/trunk/qpid/dotnet/build-dotnet11
incubator/qpid/trunk/qpid/dotnet/build-dotnet11.bat
incubator/qpid/trunk/qpid/dotnet/build-mono
incubator/qpid/trunk/qpid/dotnet/release (contents, props changed)
Propchange: incubator/qpid/trunk/qpid/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
incubator/qpid/trunk/qpid/dotnet/Qpid.Buffer.Tests/Qpid.Buffer.Tests.csproj
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Buffer.Tests/Qpid.Buffer.Tests.csproj?view=diff&rev=537848&r1=537847&r2=537848
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Buffer.Tests/Qpid.Buffer.Tests.csproj
(original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Buffer.Tests/Qpid.Buffer.Tests.csproj
Mon May 14 07:06:40 2007
@@ -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
Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Buffer/Qpid.Buffer.csproj
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Buffer/Qpid.Buffer.csproj?view=diff&rev=537848&r1=537847&r2=537848
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Buffer/Qpid.Buffer.csproj (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Buffer/Qpid.Buffer.csproj Mon May 14
07:06:40 2007
@@ -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
Modified:
incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/Qpid.Client.Tests.csproj
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/Qpid.Client.Tests.csproj?view=diff&rev=537848&r1=537847&r2=537848
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/Qpid.Client.Tests.csproj
(original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/Qpid.Client.Tests.csproj
Mon May 14 07:06:40 2007
@@ -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>
Modified:
incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/connection/SslConnectionTest.cs
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/connection/SslConnectionTest.cs?view=diff&rev=537848&r1=537847&r2=537848
==============================================================================
---
incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/connection/SslConnectionTest.cs
(original)
+++
incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/connection/SslConnectionTest.cs
Mon May 14 07:06:40 2007
@@ -79,7 +79,7 @@
// 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];
Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/default.build
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/default.build?view=diff&rev=537848&r1=537847&r2=537848
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/default.build (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Client.Tests/default.build Mon May 14
07:06:40 2007
@@ -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>
+
Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Qpid.Client.csproj
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Qpid.Client.csproj?view=diff&rev=537848&r1=537847&r2=537848
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Qpid.Client.csproj (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Qpid.Client.csproj Mon May 14
07:06:40 2007
@@ -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>
Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Client/default.build
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Client/default.build?view=diff&rev=537848&r1=537847&r2=537848
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Client/default.build (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Client/default.build Mon May 14
07:06:40 2007
@@ -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>
+
Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Codec/Qpid.Codec.csproj
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Codec/Qpid.Codec.csproj?view=diff&rev=537848&r1=537847&r2=537848
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Codec/Qpid.Codec.csproj (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Codec/Qpid.Codec.csproj Mon May 14
07:06:40 2007
@@ -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>
Modified:
incubator/qpid/trunk/qpid/dotnet/Qpid.Common.Tests/Qpid.Common.Tests.csproj
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Common.Tests/Qpid.Common.Tests.csproj?view=diff&rev=537848&r1=537847&r2=537848
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Common.Tests/Qpid.Common.Tests.csproj
(original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Common.Tests/Qpid.Common.Tests.csproj
Mon May 14 07:06:40 2007
@@ -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
Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Common/Qpid.Common.csproj
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Common/Qpid.Common.csproj?view=diff&rev=537848&r1=537847&r2=537848
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Common/Qpid.Common.csproj (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Common/Qpid.Common.csproj Mon May 14
07:06:40 2007
@@ -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>
Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Common/default.build
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Common/default.build?view=diff&rev=537848&r1=537847&r2=537848
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Common/default.build (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Common/default.build Mon May 14
07:06:40 2007
@@ -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>
+
Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Messaging/Qpid.Messaging.csproj
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Messaging/Qpid.Messaging.csproj?view=diff&rev=537848&r1=537847&r2=537848
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Messaging/Qpid.Messaging.csproj
(original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Messaging/Qpid.Messaging.csproj Mon
May 14 07:06:40 2007
@@ -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>
Modified:
incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl.Tests/Mechanisms/DigestSaslClientTests.cs
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl.Tests/Mechanisms/DigestSaslClientTests.cs?view=diff&rev=537848&r1=537847&r2=537848
==============================================================================
---
incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl.Tests/Mechanisms/DigestSaslClientTests.cs
(original)
+++
incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl.Tests/Mechanisms/DigestSaslClientTests.cs
Mon May 14 07:06:40 2007
@@ -210,7 +210,7 @@
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));
Modified:
incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl.Tests/Mechanisms/ExternalSaslClientTests.cs
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl.Tests/Mechanisms/ExternalSaslClientTests.cs?view=diff&rev=537848&r1=537847&r2=537848
==============================================================================
---
incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl.Tests/Mechanisms/ExternalSaslClientTests.cs
(original)
+++
incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl.Tests/Mechanisms/ExternalSaslClientTests.cs
Mon May 14 07:06:40 2007
@@ -53,7 +53,6 @@
[Test]
public void CanEvaluateChallenge()
{
- Hashtable props = new Hashtable();
ISaslClient client = new ExternalSaslClient(AUTHID, new Hashtable(),
this);
Assert.IsFalse(client.IsComplete);
Modified:
incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl.Tests/Qpid.Sasl.Tests.csproj
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl.Tests/Qpid.Sasl.Tests.csproj?view=diff&rev=537848&r1=537847&r2=537848
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl.Tests/Qpid.Sasl.Tests.csproj
(original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl.Tests/Qpid.Sasl.Tests.csproj Mon
May 14 07:06:40 2007
@@ -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>
Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl/Qpid.Sasl.csproj
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl/Qpid.Sasl.csproj?view=diff&rev=537848&r1=537847&r2=537848
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl/Qpid.Sasl.csproj (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Sasl/Qpid.Sasl.csproj Mon May 14
07:06:40 2007
@@ -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>
Modified: incubator/qpid/trunk/qpid/dotnet/README.txt
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/README.txt?view=diff&rev=537848&r1=537847&r2=537848
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/README.txt (original)
+++ incubator/qpid/trunk/qpid/dotnet/README.txt Mon May 14 07:06:40 2007
@@ -9,11 +9,11 @@
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 @@
$ 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 @@
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
Modified: incubator/qpid/trunk/qpid/dotnet/TODO.txt
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/TODO.txt?view=diff&rev=537848&r1=537847&r2=537848
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/TODO.txt (original)
+++ incubator/qpid/trunk/qpid/dotnet/TODO.txt Mon May 14 07:06:40 2007
@@ -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
Modified: incubator/qpid/trunk/qpid/dotnet/TopicListener/TopicListener.csproj
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/TopicListener/TopicListener.csproj?view=diff&rev=537848&r1=537847&r2=537848
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/TopicListener/TopicListener.csproj
(original)
+++ incubator/qpid/trunk/qpid/dotnet/TopicListener/TopicListener.csproj Mon May
14 07:06:40 2007
@@ -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>
Modified: incubator/qpid/trunk/qpid/dotnet/TopicPublisher/TopicPublisher.csproj
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/TopicPublisher/TopicPublisher.csproj?view=diff&rev=537848&r1=537847&r2=537848
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/TopicPublisher/TopicPublisher.csproj
(original)
+++ incubator/qpid/trunk/qpid/dotnet/TopicPublisher/TopicPublisher.csproj Mon
May 14 07:06:40 2007
@@ -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>
Modified: incubator/qpid/trunk/qpid/dotnet/build-dotnet11
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/build-dotnet11?view=diff&rev=537848&r1=537847&r2=537848
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/build-dotnet11 (original)
+++ incubator/qpid/trunk/qpid/dotnet/build-dotnet11 Mon May 14 07:06:40 2007
@@ -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
Modified: incubator/qpid/trunk/qpid/dotnet/build-dotnet11.bat
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/build-dotnet11.bat?view=diff&rev=537848&r1=537847&r2=537848
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/build-dotnet11.bat (original)
+++ incubator/qpid/trunk/qpid/dotnet/build-dotnet11.bat Mon May 14 07:06:40 2007
@@ -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
Modified: incubator/qpid/trunk/qpid/dotnet/build-mono
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/build-mono?view=diff&rev=537848&r1=537847&r2=537848
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/build-mono (original)
+++ incubator/qpid/trunk/qpid/dotnet/build-mono Mon May 14 07:06:40 2007
@@ -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
Modified: incubator/qpid/trunk/qpid/dotnet/release
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/release?view=diff&rev=537848&r1=537847&r2=537848
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/release (original)
+++ incubator/qpid/trunk/qpid/dotnet/release Mon May 14 07:06:40 2007
@@ -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
Propchange: incubator/qpid/trunk/qpid/dotnet/release
------------------------------------------------------------------------------
svn:executable = *
