Author: rupertlssmith
Date: Tue Jan 15 09:28:33 2008
New Revision: 612164
URL: http://svn.apache.org/viewvc?rev=612164&view=rev
Log:
Qpid-491 Integration and pure unit test types have been split into seperate
modules. Executable for integration style tests not created, and may not be,
but seperate target in the nant build has been created, so there is at least a
way to run all integration style tests from one place.
Removed:
incubator/qpid/branches/M2.1/dotnet/Qpid.Client.Tests/Channel/ChannelQueueTest.cs
incubator/qpid/branches/M2.1/dotnet/Qpid.Client.Tests/Common/BaseMessagingTestFixture.cs
incubator/qpid/branches/M2.1/dotnet/Qpid.Client.Tests/HeadersExchange/HeadersExchangeTest.cs
incubator/qpid/branches/M2.1/dotnet/Qpid.Client.Tests/MultiConsumer/ProducerMultiConsumer.cs
incubator/qpid/branches/M2.1/dotnet/Qpid.Client.Tests/SimpleConsumer/TestSyncConsumer.cs
incubator/qpid/branches/M2.1/dotnet/Qpid.Client.Tests/connection/ConnectionTest.cs
incubator/qpid/branches/M2.1/dotnet/Qpid.Client.Tests/connection/SslConnectionTest.cs
incubator/qpid/branches/M2.1/dotnet/Qpid.Client.Tests/failover/FailoverTest.cs
incubator/qpid/branches/M2.1/dotnet/Qpid.Client.Tests/interop/InteropClientTestCase.cs
incubator/qpid/branches/M2.1/dotnet/Qpid.Client.Tests/interop/TestCases/
incubator/qpid/branches/M2.1/dotnet/Qpid.Client.Tests/interop/TestClient.cs
incubator/qpid/branches/M2.1/dotnet/Qpid.Client.Tests/requestreply1/ServiceProvidingClient.cs
incubator/qpid/branches/M2.1/dotnet/Qpid.Client.Tests/requestreply1/ServiceRequestingClient.cs
incubator/qpid/branches/M2.1/dotnet/Qpid.Client.Tests/undeliverable/UndeliverableTest.cs
Modified:
incubator/qpid/branches/M2.1/dotnet/Qpid.Buffer.Tests/Properties/AssemblyInfo.cs
incubator/qpid/branches/M2.1/dotnet/Qpid.Buffer/Properties/AssemblyInfo.cs
incubator/qpid/branches/M2.1/dotnet/Qpid.Client.Tests/Properties/AssemblyInfo.cs
incubator/qpid/branches/M2.1/dotnet/Qpid.Client.Tests/default.build
incubator/qpid/branches/M2.1/dotnet/Qpid.Client.Transport.Socket.Blocking/Properties/AssemblyInfo.cs
incubator/qpid/branches/M2.1/dotnet/Qpid.Client/Properties/AssemblyInfo.cs
incubator/qpid/branches/M2.1/dotnet/Qpid.Codec/Properties/AssemblyInfo.cs
incubator/qpid/branches/M2.1/dotnet/Qpid.Common.Tests/Properties/AssemblyInfo.cs
incubator/qpid/branches/M2.1/dotnet/Qpid.Common/Properties/AssemblyInfo.cs
incubator/qpid/branches/M2.1/dotnet/Qpid.Messaging/Properties/AssemblyInfo.cs
incubator/qpid/branches/M2.1/dotnet/Qpid.Sasl.Tests/Properties/AssemblyInfo.cs
incubator/qpid/branches/M2.1/dotnet/Qpid.Sasl/Properties/AssemblyInfo.cs
incubator/qpid/branches/M2.1/dotnet/TestClient/Program.cs
incubator/qpid/branches/M2.1/dotnet/TestClient/Properties/AssemblyInfo.cs
incubator/qpid/branches/M2.1/dotnet/TestClient/default.build
incubator/qpid/branches/M2.1/dotnet/TopicListener/Properties/AssemblyInfo.cs
incubator/qpid/branches/M2.1/dotnet/TopicPublisher/Properties/AssemblyInfo.cs
incubator/qpid/branches/M2.1/dotnet/default.build
Modified:
incubator/qpid/branches/M2.1/dotnet/Qpid.Buffer.Tests/Properties/AssemblyInfo.cs
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1/dotnet/Qpid.Buffer.Tests/Properties/AssemblyInfo.cs?rev=612164&r1=612163&r2=612164&view=diff
==============================================================================
---
incubator/qpid/branches/M2.1/dotnet/Qpid.Buffer.Tests/Properties/AssemblyInfo.cs
(original)
+++
incubator/qpid/branches/M2.1/dotnet/Qpid.Buffer.Tests/Properties/AssemblyInfo.cs
Tue Jan 15 09:28:33 2008
@@ -6,9 +6,9 @@
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("Apache.Qpid.Buffer.Tests")]
-[assembly: AssemblyDescription("Built from svn revision number:
611749:611758M")]
+[assembly: AssemblyDescription("Built from svn revision number: 612131M")]
[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Apache")]
+[assembly: AssemblyCompany("Apache Software Foundation")]
[assembly: AssemblyProduct("Apache.Qpid.Buffer.Tests")]
[assembly: AssemblyCopyright("Apache Software Foundation")]
[assembly: AssemblyTrademark("")]
@@ -31,5 +31,5 @@
//
// You can specify all the values or you can default the Revision and Build
Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("0.2.1.0")]
+[assembly: AssemblyVersion("2.1.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
Modified:
incubator/qpid/branches/M2.1/dotnet/Qpid.Buffer/Properties/AssemblyInfo.cs
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1/dotnet/Qpid.Buffer/Properties/AssemblyInfo.cs?rev=612164&r1=612163&r2=612164&view=diff
==============================================================================
--- incubator/qpid/branches/M2.1/dotnet/Qpid.Buffer/Properties/AssemblyInfo.cs
(original)
+++ incubator/qpid/branches/M2.1/dotnet/Qpid.Buffer/Properties/AssemblyInfo.cs
Tue Jan 15 09:28:33 2008
@@ -24,9 +24,9 @@
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("Apache.Qpid.ByteBuffer")]
-[assembly: AssemblyDescription("Built from svn revision number:
611749:611758M")]
+[assembly: AssemblyDescription("Built from svn revision number: 612131M")]
[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Apache")]
+[assembly: AssemblyCompany("Apache Software Foundation")]
[assembly: AssemblyProduct("Apache.Qpid.ByteBuffer")]
[assembly: AssemblyCopyright("Apache Software Foundation")]
[assembly: AssemblyTrademark("")]
@@ -49,5 +49,5 @@
//
// You can specify all the values or you can default the Revision and Build
Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("0.2.1.0")]
+[assembly: AssemblyVersion("2.1.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
Modified:
incubator/qpid/branches/M2.1/dotnet/Qpid.Client.Tests/Properties/AssemblyInfo.cs
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1/dotnet/Qpid.Client.Tests/Properties/AssemblyInfo.cs?rev=612164&r1=612163&r2=612164&view=diff
==============================================================================
---
incubator/qpid/branches/M2.1/dotnet/Qpid.Client.Tests/Properties/AssemblyInfo.cs
(original)
+++
incubator/qpid/branches/M2.1/dotnet/Qpid.Client.Tests/Properties/AssemblyInfo.cs
Tue Jan 15 09:28:33 2008
@@ -27,9 +27,9 @@
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("Apache.Qpid.Client.Tests")]
-[assembly: AssemblyDescription("Built from svn revision number:
611749:611758M")]
+[assembly: AssemblyDescription("Built from svn revision number: 612131M")]
[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Apache")]
+[assembly: AssemblyCompany("Apache Software Foundation")]
[assembly: AssemblyProduct("Apache.Qpid.Client.Tests")]
[assembly: AssemblyCopyright("Apache Software Foundation")]
[assembly: AssemblyTrademark("")]
@@ -50,4 +50,4 @@
// Build Number
// Revision
//
-[assembly: AssemblyVersion("0.2.1.0")]
+[assembly: AssemblyVersion("2.1.0.0")]
Modified: incubator/qpid/branches/M2.1/dotnet/Qpid.Client.Tests/default.build
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1/dotnet/Qpid.Client.Tests/default.build?rev=612164&r1=612163&r2=612164&view=diff
==============================================================================
--- incubator/qpid/branches/M2.1/dotnet/Qpid.Client.Tests/default.build
(original)
+++ incubator/qpid/branches/M2.1/dotnet/Qpid.Client.Tests/default.build Tue Jan
15 09:28:33 2008
@@ -24,7 +24,7 @@
</target>
<target name="test" depends="build">
- <nunit2>
+ <nunit2 verbose="true">
<formatter type="${nant.formatter}" usefile="false" />
<test>
<assemblies>
@@ -32,7 +32,7 @@
</assemblies>
<categories>
<!-- The fail-over tests are interactive so should not be
run as part of the build. -->
- <exclude name="Failover"/>
+ <exclude name="Integration"/>
<exclude name="SSL"
if="${framework::get-target-framework() == 'mono-2.0'}"/>
</categories>
</test>
Modified:
incubator/qpid/branches/M2.1/dotnet/Qpid.Client.Transport.Socket.Blocking/Properties/AssemblyInfo.cs
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1/dotnet/Qpid.Client.Transport.Socket.Blocking/Properties/AssemblyInfo.cs?rev=612164&r1=612163&r2=612164&view=diff
==============================================================================
---
incubator/qpid/branches/M2.1/dotnet/Qpid.Client.Transport.Socket.Blocking/Properties/AssemblyInfo.cs
(original)
+++
incubator/qpid/branches/M2.1/dotnet/Qpid.Client.Transport.Socket.Blocking/Properties/AssemblyInfo.cs
Tue Jan 15 09:28:33 2008
@@ -24,9 +24,9 @@
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("Apache.Qpid.Transport.Blocking")]
-[assembly: AssemblyDescription("Built from svn revision number:
611749:611758M")]
+[assembly: AssemblyDescription("Built from svn revision number: 612131M")]
[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Apache")]
+[assembly: AssemblyCompany("Apache Software Foundation")]
[assembly: AssemblyProduct("Apache.Qpid.Transport.Blocking")]
[assembly: AssemblyCopyright("Apache Software Foundation")]
[assembly: AssemblyTrademark("")]
@@ -49,5 +49,5 @@
//
// You can specify all the values or you can default the Revision and Build
Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("0.2.1.0")]
+[assembly: AssemblyVersion("2.1.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
Modified:
incubator/qpid/branches/M2.1/dotnet/Qpid.Client/Properties/AssemblyInfo.cs
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1/dotnet/Qpid.Client/Properties/AssemblyInfo.cs?rev=612164&r1=612163&r2=612164&view=diff
==============================================================================
--- incubator/qpid/branches/M2.1/dotnet/Qpid.Client/Properties/AssemblyInfo.cs
(original)
+++ incubator/qpid/branches/M2.1/dotnet/Qpid.Client/Properties/AssemblyInfo.cs
Tue Jan 15 09:28:33 2008
@@ -24,9 +24,9 @@
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("Apache.Qpid.Client")]
-[assembly: AssemblyDescription("Built from svn revision number:
611749:611758M")]
+[assembly: AssemblyDescription("Built from svn revision number: 612131M")]
[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Apache")]
+[assembly: AssemblyCompany("Apache Software Foundation")]
[assembly: AssemblyProduct("Apache.Qpid.Client")]
[assembly: AssemblyCopyright("Apache Software Foundation")]
[assembly: AssemblyTrademark("")]
@@ -49,4 +49,4 @@
//
// You can specify all the values or you can default the Revision and Build
Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("0.2.1.0")]
+[assembly: AssemblyVersion("2.1.0.0")]
Modified:
incubator/qpid/branches/M2.1/dotnet/Qpid.Codec/Properties/AssemblyInfo.cs
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1/dotnet/Qpid.Codec/Properties/AssemblyInfo.cs?rev=612164&r1=612163&r2=612164&view=diff
==============================================================================
--- incubator/qpid/branches/M2.1/dotnet/Qpid.Codec/Properties/AssemblyInfo.cs
(original)
+++ incubator/qpid/branches/M2.1/dotnet/Qpid.Codec/Properties/AssemblyInfo.cs
Tue Jan 15 09:28:33 2008
@@ -24,9 +24,9 @@
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("Apache.Qpid.Codec")]
-[assembly: AssemblyDescription("Built from svn revision number:
611749:611758M")]
+[assembly: AssemblyDescription("Built from svn revision number: 612131M")]
[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Apache")]
+[assembly: AssemblyCompany("Apache Software Foundation")]
[assembly: AssemblyProduct("Apache.Qpid.Codec")]
[assembly: AssemblyCopyright("Apache Software Foundation")]
[assembly: AssemblyTrademark("")]
@@ -49,5 +49,5 @@
//
// You can specify all the values or you can default the Revision and Build
Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("0.2.1.0")]
+[assembly: AssemblyVersion("2.1.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
Modified:
incubator/qpid/branches/M2.1/dotnet/Qpid.Common.Tests/Properties/AssemblyInfo.cs
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1/dotnet/Qpid.Common.Tests/Properties/AssemblyInfo.cs?rev=612164&r1=612163&r2=612164&view=diff
==============================================================================
---
incubator/qpid/branches/M2.1/dotnet/Qpid.Common.Tests/Properties/AssemblyInfo.cs
(original)
+++
incubator/qpid/branches/M2.1/dotnet/Qpid.Common.Tests/Properties/AssemblyInfo.cs
Tue Jan 15 09:28:33 2008
@@ -4,9 +4,9 @@
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("Apache.Qpid.Common.Tests")]
-[assembly: AssemblyDescription("Built from svn revision number:
611749:611758M")]
+[assembly: AssemblyDescription("Built from svn revision number: 612131M")]
[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Apache")]
+[assembly: AssemblyCompany("Apache Software Foundation")]
[assembly: AssemblyProduct("Apache.Qpid.Common.Tests")]
[assembly: AssemblyCopyright("Apache Software Foundation")]
[assembly: AssemblyTrademark("")]
@@ -29,5 +29,5 @@
//
// You can specify all the values or you can default the Revision and Build
Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("0.2.1.0")]
+[assembly: AssemblyVersion("2.1.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
Modified:
incubator/qpid/branches/M2.1/dotnet/Qpid.Common/Properties/AssemblyInfo.cs
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1/dotnet/Qpid.Common/Properties/AssemblyInfo.cs?rev=612164&r1=612163&r2=612164&view=diff
==============================================================================
--- incubator/qpid/branches/M2.1/dotnet/Qpid.Common/Properties/AssemblyInfo.cs
(original)
+++ incubator/qpid/branches/M2.1/dotnet/Qpid.Common/Properties/AssemblyInfo.cs
Tue Jan 15 09:28:33 2008
@@ -24,9 +24,9 @@
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("Apache.Qpid.Common")]
-[assembly: AssemblyDescription("Built from svn revision number:
611749:611758M")]
+[assembly: AssemblyDescription("Built from svn revision number: 612131M")]
[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Apache")]
+[assembly: AssemblyCompany("Apache Software Foundation")]
[assembly: AssemblyProduct("Apache.Qpid.Common")]
[assembly: AssemblyCopyright("Apache Software Foundation")]
[assembly: AssemblyTrademark("")]
@@ -49,4 +49,4 @@
//
// You can specify all the values or you can default the Revision and Build
Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("0.2.1.0")]
+[assembly: AssemblyVersion("2.1.0.0")]
Modified:
incubator/qpid/branches/M2.1/dotnet/Qpid.Messaging/Properties/AssemblyInfo.cs
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1/dotnet/Qpid.Messaging/Properties/AssemblyInfo.cs?rev=612164&r1=612163&r2=612164&view=diff
==============================================================================
---
incubator/qpid/branches/M2.1/dotnet/Qpid.Messaging/Properties/AssemblyInfo.cs
(original)
+++
incubator/qpid/branches/M2.1/dotnet/Qpid.Messaging/Properties/AssemblyInfo.cs
Tue Jan 15 09:28:33 2008
@@ -25,9 +25,9 @@
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("Apache.Qpid.Messaging")]
-[assembly: AssemblyDescription("Built from svn revision number:
611749:611758M")]
+[assembly: AssemblyDescription("Built from svn revision number: 612131M")]
[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Apache")]
+[assembly: AssemblyCompany("Apache Software Foundation")]
[assembly: AssemblyProduct("Apache.Qpid.Messaging")]
[assembly: AssemblyCopyright("Apache Software Foundation")]
[assembly: AssemblyTrademark("")]
@@ -50,7 +50,7 @@
//
// You can specify all the values or you can default the Revision and Build
Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("0.2.1.0")]
+[assembly: AssemblyVersion("2.1.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
[assembly: CLSCompliant(true)]
Modified:
incubator/qpid/branches/M2.1/dotnet/Qpid.Sasl.Tests/Properties/AssemblyInfo.cs
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1/dotnet/Qpid.Sasl.Tests/Properties/AssemblyInfo.cs?rev=612164&r1=612163&r2=612164&view=diff
==============================================================================
---
incubator/qpid/branches/M2.1/dotnet/Qpid.Sasl.Tests/Properties/AssemblyInfo.cs
(original)
+++
incubator/qpid/branches/M2.1/dotnet/Qpid.Sasl.Tests/Properties/AssemblyInfo.cs
Tue Jan 15 09:28:33 2008
@@ -6,9 +6,9 @@
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("Apache.Qpid.Sasl.Tests")]
-[assembly: AssemblyDescription("Built from svn revision number:
611749:611758M")]
+[assembly: AssemblyDescription("Built from svn revision number: 612131M")]
[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Apache")]
+[assembly: AssemblyCompany("Apache Software Foundation")]
[assembly: AssemblyProduct("Apache.Qpid.Sasl.Tests")]
[assembly: AssemblyCopyright("Apache Software Foundation")]
[assembly: AssemblyTrademark("")]
@@ -31,5 +31,5 @@
//
// You can specify all the values or you can default the Revision and Build
Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("0.2.1.0")]
+[assembly: AssemblyVersion("2.1.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
Modified:
incubator/qpid/branches/M2.1/dotnet/Qpid.Sasl/Properties/AssemblyInfo.cs
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1/dotnet/Qpid.Sasl/Properties/AssemblyInfo.cs?rev=612164&r1=612163&r2=612164&view=diff
==============================================================================
--- incubator/qpid/branches/M2.1/dotnet/Qpid.Sasl/Properties/AssemblyInfo.cs
(original)
+++ incubator/qpid/branches/M2.1/dotnet/Qpid.Sasl/Properties/AssemblyInfo.cs
Tue Jan 15 09:28:33 2008
@@ -7,9 +7,9 @@
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("Apache.Qpid.Sasl")]
-[assembly: AssemblyDescription("Built from svn revision number:
611749:611758M")]
+[assembly: AssemblyDescription("Built from svn revision number: 612131M")]
[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Apache")]
+[assembly: AssemblyCompany("Apache Software Foundation")]
[assembly: AssemblyProduct("Apache.Qpid.Sasl")]
[assembly: AssemblyCopyright("Apache Software Foundation")]
[assembly: AssemblyTrademark("")]
@@ -32,6 +32,6 @@
//
// You can specify all the values or you can default the Revision and Build
Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("0.2.1.0")]
+[assembly: AssemblyVersion("2.1.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
[assembly: CLSCompliant(true)]
Modified: incubator/qpid/branches/M2.1/dotnet/TestClient/Program.cs
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1/dotnet/TestClient/Program.cs?rev=612164&r1=612163&r2=612164&view=diff
==============================================================================
--- incubator/qpid/branches/M2.1/dotnet/TestClient/Program.cs (original)
+++ incubator/qpid/branches/M2.1/dotnet/TestClient/Program.cs Tue Jan 15
09:28:33 2008
@@ -4,7 +4,7 @@
{
static void Main(string[] args)
{
- Apache.Qpid.Client.Tests.interop.TestClient.Main(args);
+ Apache.Qpid.Integration.Tests.interop.TestClient.Main(args);
}
}
}
Modified:
incubator/qpid/branches/M2.1/dotnet/TestClient/Properties/AssemblyInfo.cs
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1/dotnet/TestClient/Properties/AssemblyInfo.cs?rev=612164&r1=612163&r2=612164&view=diff
==============================================================================
--- incubator/qpid/branches/M2.1/dotnet/TestClient/Properties/AssemblyInfo.cs
(original)
+++ incubator/qpid/branches/M2.1/dotnet/TestClient/Properties/AssemblyInfo.cs
Tue Jan 15 09:28:33 2008
@@ -6,9 +6,9 @@
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("TestClient")]
-[assembly: AssemblyDescription("Built from svn revision number:
611749:611758M")]
+[assembly: AssemblyDescription("Built from svn revision number: 612131M")]
[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Apache")]
+[assembly: AssemblyCompany("Apache Software Foundation")]
[assembly: AssemblyProduct("TestClient")]
[assembly: AssemblyCopyright("Apache Software Foundation")]
[assembly: AssemblyTrademark("")]
@@ -29,5 +29,5 @@
// Build Number
// Revision
//
-[assembly: AssemblyVersion("0.2.1.0")]
+[assembly: AssemblyVersion("2.1.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
Modified: incubator/qpid/branches/M2.1/dotnet/TestClient/default.build
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1/dotnet/TestClient/default.build?rev=612164&r1=612163&r2=612164&view=diff
==============================================================================
--- incubator/qpid/branches/M2.1/dotnet/TestClient/default.build (original)
+++ incubator/qpid/branches/M2.1/dotnet/TestClient/default.build Tue Jan 15
09:28:33 2008
@@ -18,7 +18,7 @@
<include name="**/*.cs" />
</sources>
<references>
- <include name="${build.dir}\Apache.Qpid.Client.Tests.dll"/>
+ <include name="${build.dir}\Apache.Qpid.Integration.Tests.dll"/>
</references>
</csc>
</target>
Modified:
incubator/qpid/branches/M2.1/dotnet/TopicListener/Properties/AssemblyInfo.cs
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1/dotnet/TopicListener/Properties/AssemblyInfo.cs?rev=612164&r1=612163&r2=612164&view=diff
==============================================================================
---
incubator/qpid/branches/M2.1/dotnet/TopicListener/Properties/AssemblyInfo.cs
(original)
+++
incubator/qpid/branches/M2.1/dotnet/TopicListener/Properties/AssemblyInfo.cs
Tue Jan 15 09:28:33 2008
@@ -6,9 +6,9 @@
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("TopicListener")]
-[assembly: AssemblyDescription("Built from svn revision number:
611749:611758M")]
+[assembly: AssemblyDescription("Built from svn revision number: 612131M")]
[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Apache")]
+[assembly: AssemblyCompany("Apache Software Foundation")]
[assembly: AssemblyProduct("TopicListener")]
[assembly: AssemblyCopyright("Apache Software Foundation")]
[assembly: AssemblyTrademark("")]
@@ -29,5 +29,5 @@
// Build Number
// Revision
//
-[assembly: AssemblyVersion("0.2.1.0")]
+[assembly: AssemblyVersion("2.1.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
Modified:
incubator/qpid/branches/M2.1/dotnet/TopicPublisher/Properties/AssemblyInfo.cs
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1/dotnet/TopicPublisher/Properties/AssemblyInfo.cs?rev=612164&r1=612163&r2=612164&view=diff
==============================================================================
---
incubator/qpid/branches/M2.1/dotnet/TopicPublisher/Properties/AssemblyInfo.cs
(original)
+++
incubator/qpid/branches/M2.1/dotnet/TopicPublisher/Properties/AssemblyInfo.cs
Tue Jan 15 09:28:33 2008
@@ -6,9 +6,9 @@
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("TopicPublisher")]
-[assembly: AssemblyDescription("Built from svn revision number:
611749:611758M")]
+[assembly: AssemblyDescription("Built from svn revision number: 612131M")]
[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Apache")]
+[assembly: AssemblyCompany("Apache Software Foundation")]
[assembly: AssemblyProduct("TopicPublisher")]
[assembly: AssemblyCopyright("Apache Software Foundation")]
[assembly: AssemblyTrademark("")]
@@ -29,5 +29,5 @@
// Build Number
// Revision
//
-[assembly: AssemblyVersion("0.2.1.0")]
+[assembly: AssemblyVersion("2.1.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
Modified: incubator/qpid/branches/M2.1/dotnet/default.build
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1/dotnet/default.build?rev=612164&r1=612163&r2=612164&view=diff
==============================================================================
--- incubator/qpid/branches/M2.1/dotnet/default.build (original)
+++ incubator/qpid/branches/M2.1/dotnet/default.build Tue Jan 15 09:28:33 2008
@@ -7,16 +7,16 @@
<!-- Determines whether a 'debug' or 'release' build is to be done.
Defaults to 'debug' -->
<property name="build.config" value="debug" />
- <!-- Sets the build version accross all assemblies in the project. -->
+ <!-- Sets build properties consistently accross all assemblies in the
project. -->
<property name="build.version.major" value="2"/>
<property name="build.version.minor" value="1"/>
<property name="build.version.build" value="0"/>
<property name="build.version.revision" value="0"/>
- <property name="build.company" value="Apache"/>
+ <property name="build.company" value="Apache Software Foundation"/>
<property name="build.copyright" value="Apache Software Foundation"/>
<property name="build.description" value="Built from svn revision number:
"/>
- <!-- Fileset with build files for each core assembly. -->
+ <!-- Fileset with build files for each 'core' assembly. -->
<fileset id="src.builds">
<include name="Qpid.Buffer/default.build" />
<include name="Qpid.Sasl/default.build" />
@@ -26,14 +26,19 @@
<include name="Qpid.Client/default.build" />
</fileset>
- <!-- Fileset with build files for test assemblies. -->
- <fileset id="tests.builds">
+ <!-- Fileset with build files for 'pure unit' test assemblies. -->
+ <fileset id="tests.pure.builds">
<include name="Qpid.Buffer.Tests/default.build" />
<include name="Qpid.Sasl.Tests/default.build" />
<include name="Qpid.Common.Tests/default.build" />
<include name="Qpid.Client.Tests/default.build" />
</fileset>
+ <!-- Fileset with build files for 'integration' test assemblies. -->
+ <fileset id="tests.integration.builds">
+ <include name="Qpid.Integration.Tests/default.build" />
+ </fileset>
+
<!-- Other test or utility assemblies. -->
<fileset id='other.builds'>
<include name="TopicListener/default.build" />
@@ -41,6 +46,30 @@
<include name="TestClient/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>
+
+ <!-- Cleans up the build output directory. -->
+ <target name="clean" depends="init">
+ <delete dir="${build.dir}" failonerror="false" />
+ </target>
+
<!-- Runs 'svnversion' to get the repository revision into the build
property 'build.svnversion'. -->
<target name="svnversion" description="Runs svnversion to get the current
repository version into a build script property.">
<exec program="svnversion.exe" output="svnversion_tmp.txt">
@@ -64,7 +93,7 @@
</target>
- <!-- Performs a regex find-and-replace on assembly info files,
substituting in a version number. -->
+ <!-- Performs a regex find-and-replace on assembly info files,
substituting fields defined as build properties. -->
<target name="setversion" description="Stamp the version info onto
assemblyinfo.cs files" depends="svnversion">
<echo>build.svnversion = ${build.svnversion}</echo>
@@ -128,33 +157,13 @@
</foreach>
</target>
- <!-- 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, setversion">
- <!-- make sure output folder exists -->
+ <echo message="Building all modules including tests."/>
+
+ <!-- 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"/>
@@ -167,7 +176,10 @@
<!-- Compile test assemblies. -->
<nant target="build">
- <buildfiles refid="tests.builds" />
+ <buildfiles refid="tests.pure.builds" />
+ </nant>
+ <nant target="build">
+ <buildfiles refid="tests.integration.builds" />
</nant>
<!-- Compile test assemblies. -->
@@ -176,19 +188,29 @@
</nant>
</target>
- <!-- Execute unit tests. -->
+ <!-- Runs all 'pure unit' tests. -->
<target name="test" depends="build">
- <echo message="Running unit tests for the project." />
+ <echo message="Running all pure unit tests."/>
<nant target="test">
- <buildfiles refid="tests.builds" />
+ <buildfiles refid="tests.pure.builds" />
</nant>
</target>
- <!-- Make a release package. -->
+ <!-- Runs all 'integration' tests. -->
+ <target name="integrationtest" depends="build">
+ <echo message="Running all integration tests."/>
+ <nant target="test">
+ <buildfiles refid="tests.integration.builds" />
+ </nant>
+ </target>
+
+ <!-- Creates a release package. -->
<target name="release-pkg">
- <echo message="building and packing a release"/>
+ <echo message="Building and packaging 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">
