Skip to content

Commit

Permalink
Upgraded to raven427 to resolve the dtc bug that prevents the gateway…
Browse files Browse the repository at this point in the history
… to function correctly
  • Loading branch information
andreasohlund committed Aug 8, 2011
1 parent f4d46eb commit 94ff8a6
Show file tree
Hide file tree
Showing 28 changed files with 273 additions and 49 deletions.
1 change: 0 additions & 1 deletion UnsupportedBuildCoreOnly.bat

This file was deleted.

3 changes: 3 additions & 0 deletions build-coreonly.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
powershell .\install-packages.ps1

.\tools\nant\NAnt -D:include.dependencies=false %1
4 changes: 3 additions & 1 deletion build-net3.5.bat
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
.\tools\nant\nant.exe -D:targetframework=net-3.5
powershell .\install-packages.ps1

.\tools\nant\nant.exe -D:targetframework=net-3.5 %1
1 change: 1 addition & 0 deletions build.bat
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
powershell .\install-packages.ps1
.\tools\nant\nant %1
8 changes: 8 additions & 0 deletions install-packages.ps1
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
dir -recurse -include ('packages.config') |ForEach-Object {
$packageconfig = [io.path]::Combine($_.directory,$_.name)

write-host $packageconfig

.\tools\NuGet\NuGet.exe install $packageconfig -o packages
}

5 changes: 1 addition & 4 deletions nant.build
Original file line number Diff line number Diff line change
Expand Up @@ -102,10 +102,6 @@
<formatter property="datetime.buildtime" pattern="yyyy-MM-dd, HH:mm:ss" />
</tstamp>

<echo message="Downloading dependencies from NuGet..."/>
<exec program=".\tools\NuGet\NuGet.exe"
commandline="install packages.config -o packages"
workingdir="."/>
<echo message="Creating build dir: ${build.base}"/>
<delete dir="${build.base}"/>
<mkdir dir="${build.base}"/>
Expand Down Expand Up @@ -239,6 +235,7 @@
<include name="${core.build.dir}\Interop.MSMQ.dll" />
<include name="${core.build.dir}\AutoFac.dll"/>
<include name="${core.build.dir}\Raven*.dll" />
<include name="${core.build.dir}\NLog.dll" />
<include name="${core.build.dir}\rhino.licensing.dll" />
<include name="${core.build.dir}\MissingBitsFromClientProfile.dll" />
<include name="${core.build.dir}\Newtonsoft.Json.dll" />
Expand Down
7 changes: 0 additions & 7 deletions packages.config

This file was deleted.

9 changes: 9 additions & 0 deletions packages/repositories.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<repositories>
<repository path="..\src\gateway\NServiceBus.Gateway.Tests\packages.config" />
<repository path="..\src\gateway\NServiceBus.Gateway\packages.config" />
<repository path="..\src\impl\Persistence\RavenPersistence\NServiceBus.Persistence.Raven\packages.config" />
<repository path="..\src\impl\Persistence\RavenPersistence\NServiceBus.Persistence.Raven.Tests\packages.config" />
<repository path="..\src\impl\SagaPersisters\RavenSagaPersister\NServiceBus.SagaPersisters.Raven.Tests\packages.config" />
<repository path="..\src\impl\ObjectBuilder\ObjectBuilder.StructureMap\packages.config" />
</repositories>
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
using System.Collections.Generic;
using System.IO;
using System.Messaging;
using System.Threading;
using System.Transactions;
using NUnit.Framework;
using Persistence.Raven;
Expand Down Expand Up @@ -51,7 +52,6 @@ public void Should_mark_the_message_as_acked()
}

[Test]
[Explicit("Until Ayende fixes the issue")]
public void Raven_dtc_bug()
{
new MessageQueue(QueueAddress, QueueAccessMode.ReceiveAndAdmin)
Expand All @@ -77,6 +77,7 @@ public void Raven_dtc_bug()
//when we complete raven commits it tx but the DTC tx is never commited and eventually times out
tx.Complete();
}
Thread.Sleep(1000);

Assert.AreEqual(1,new MessageQueue(QueueAddress, QueueAccessMode.ReceiveAndAdmin)
.GetAllMessages().Length);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
using NUnit.Framework;
using Persistence;
using Persistence.Raven;
using global::Raven.Client.Embedded;

public class in_the_raven_storage
{
Expand All @@ -18,11 +19,9 @@ public class in_the_raven_storage
[SetUp]
public void SetUp()
{
store = new DocumentStore
{
Url = "http://localhost:8080",
};

//store = new EmbeddableDocumentStore { RunInMemory = true };
store = new DocumentStore { Url = "http://localhost:8080" };

store.Initialize();

ravenPersister = new RavenDBPersistence(store);
Expand All @@ -40,6 +39,7 @@ protected bool Store(TestMessage message)
using (var msgStream = new MemoryStream(message.OriginalMessage))
{
var result = ravenPersister.InsertMessage(message.ClientId, message.TimeReceived, msgStream, message.Headers);

scope.Complete();

return result;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,24 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="Newtonsoft.Json">
<Reference Include="AsyncCtpLibrary, Version=1.0.4107.18181, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\RavenDB.1.0.0.427\lib\net40\AsyncCtpLibrary.dll</HintPath>
</Reference>
<Reference Include="Esent.Interop">
<HintPath>..\..\..\packages\RavenDB-Embedded.1.0.0.427\lib\net40\Esent.Interop.dll</HintPath>
</Reference>
<Reference Include="ICSharpCode.NRefactory, Version=3.0.0.3800, Culture=neutral, PublicKeyToken=efe927acf176eea2, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\RavenDB-Embedded.1.0.0.427\lib\net40\ICSharpCode.NRefactory.dll</HintPath>
</Reference>
<Reference Include="Lucene.Net, Version=2.9.2.1, Culture=neutral, PublicKeyToken=02f879aa45933051, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\RavenDB-Embedded.1.0.0.427\lib\net40\Lucene.Net.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=4.0.2.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Newtonsoft.Json.4.0.2\lib\net40\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="NLog, Version=2.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\RavenDB.1.0.0.427\lib\net40\NLog.dll</HintPath>
</Reference>
<Reference Include="NServiceBus">
<HintPath>..\..\..\build\output\NServiceBus.dll</HintPath>
</Reference>
Expand Down Expand Up @@ -75,15 +90,48 @@
<Reference Include="nunit.framework">
<HintPath>..\..\..\tools\NUnit\nunit.framework.dll</HintPath>
</Reference>
<Reference Include="Raven.Abstractions">
<HintPath>..\..\..\packages\RavenDB.1.0.0.397\lib\net40\Raven.Abstractions.dll</HintPath>
<Reference Include="Raven.Abstractions, Version=1.0.0.0, Culture=neutral, PublicKeyToken=37f41c7f99471593, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\RavenDB.1.0.0.427\lib\net40\Raven.Abstractions.dll</HintPath>
</Reference>
<Reference Include="Raven.Client.Debug">
<HintPath>..\..\..\packages\RavenDB.1.0.0.427\lib\net40\Raven.Client.Debug.dll</HintPath>
</Reference>
<Reference Include="Raven.Client.Embedded, Version=1.0.0.0, Culture=neutral, PublicKeyToken=37f41c7f99471593, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\RavenDB-Embedded.1.0.0.427\lib\net40\Raven.Client.Embedded.dll</HintPath>
</Reference>
<Reference Include="Raven.Client.Lightweight, Version=1.0.0.0, Culture=neutral, PublicKeyToken=37f41c7f99471593, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\RavenDB.1.0.0.427\lib\net40\Raven.Client.Lightweight.dll</HintPath>
</Reference>
<Reference Include="Raven.Client.Lightweight">
<HintPath>..\..\..\packages\RavenDB.1.0.0.397\lib\net40\Raven.Client.Lightweight.dll</HintPath>
<Reference Include="Raven.Client.MvcIntegration">
<HintPath>..\..\..\packages\RavenDB.1.0.0.427\lib\net40\Raven.Client.MvcIntegration.dll</HintPath>
</Reference>
<Reference Include="Raven.Database, Version=1.0.0.0, Culture=neutral, PublicKeyToken=37f41c7f99471593, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\RavenDB-Embedded.1.0.0.427\lib\net40\Raven.Database.dll</HintPath>
</Reference>
<Reference Include="Raven.Http, Version=1.0.0.0, Culture=neutral, PublicKeyToken=37f41c7f99471593, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\RavenDB-Embedded.1.0.0.427\lib\net40\Raven.Http.dll</HintPath>
</Reference>
<Reference Include="Raven.Json, Version=1.0.0.0, Culture=neutral, PublicKeyToken=37f41c7f99471593, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\RavenDB.1.0.0.427\lib\net40\Raven.Json.dll</HintPath>
</Reference>
<Reference Include="Raven.Munin">
<HintPath>..\..\..\packages\RavenDB-Embedded.1.0.0.427\lib\net40\Raven.Munin.dll</HintPath>
</Reference>
<Reference Include="Raven.Storage.Esent">
<HintPath>..\..\..\packages\RavenDB-Embedded.1.0.0.427\lib\net40\Raven.Storage.Esent.dll</HintPath>
</Reference>
<Reference Include="Raven.Storage.Managed">
<HintPath>..\..\..\packages\RavenDB-Embedded.1.0.0.427\lib\net40\Raven.Storage.Managed.dll</HintPath>
</Reference>
<Reference Include="Rhino.Mocks">
<HintPath>..\..\..\lib\rhino.mocks\Rhino.Mocks.dll</HintPath>
</Reference>
<Reference Include="Spatial.Net, Version=2.9.1.2, Culture=neutral, PublicKeyToken=02f879aa45933051, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\RavenDB-Embedded.1.0.0.427\lib\net40\Spatial.Net.dll</HintPath>
</Reference>
<Reference Include="SpellChecker.Net, Version=2.9.2.1, Culture=neutral, PublicKeyToken=36573b2a49807bd1, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\RavenDB-Embedded.1.0.0.427\lib\net40\SpellChecker.Net.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.configuration" />
<Reference Include="System.Core" />
Expand Down Expand Up @@ -125,6 +173,7 @@
<None Include="App.config">
<SubType>Designer</SubType>
</None>
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Expand Down
7 changes: 7 additions & 0 deletions src/gateway/NServiceBus.Gateway.Tests/packages.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="NLog" version="2.0.0.2000" />
<package id="Newtonsoft.Json" version="4.0.2" />
<package id="RavenDB-Embedded" version="1.0.0.427" />
<package id="RavenDB" version="1.0.0.427" />
</packages>
28 changes: 23 additions & 5 deletions src/gateway/NServiceBus.Gateway/NServiceBus.Gateway.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,19 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="AsyncCtpLibrary, Version=1.0.4107.18181, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\RavenDB.1.0.0.427\lib\net40\AsyncCtpLibrary.dll</HintPath>
</Reference>
<Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\lib\log4net.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json">
<Reference Include="Newtonsoft.Json, Version=4.0.2.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Newtonsoft.Json.4.0.2\lib\net40\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="NLog">
<HintPath>..\..\..\packages\RavenDB.1.0.0.427\lib\net40\NLog.dll</HintPath>
</Reference>
<Reference Include="NServiceBus, Version=2.7.6.2, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\build\output\NServiceBus.dll</HintPath>
Expand Down Expand Up @@ -93,11 +99,20 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\build\nservicebus.core\NServiceBus.Utils.dll</HintPath>
</Reference>
<Reference Include="Raven.Abstractions">
<HintPath>..\..\..\packages\RavenDB.1.0.0.397\lib\net40\Raven.Abstractions.dll</HintPath>
<Reference Include="Raven.Abstractions, Version=1.0.0.0, Culture=neutral, PublicKeyToken=37f41c7f99471593, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\RavenDB.1.0.0.427\lib\net40\Raven.Abstractions.dll</HintPath>
</Reference>
<Reference Include="Raven.Client.Debug">
<HintPath>..\..\..\packages\RavenDB.1.0.0.427\lib\net40\Raven.Client.Debug.dll</HintPath>
</Reference>
<Reference Include="Raven.Client.Lightweight, Version=1.0.0.0, Culture=neutral, PublicKeyToken=37f41c7f99471593, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\RavenDB.1.0.0.427\lib\net40\Raven.Client.Lightweight.dll</HintPath>
</Reference>
<Reference Include="Raven.Client.Lightweight">
<HintPath>..\..\..\packages\RavenDB.1.0.0.397\lib\net40\Raven.Client.Lightweight.dll</HintPath>
<Reference Include="Raven.Client.MvcIntegration">
<HintPath>..\..\..\packages\RavenDB.1.0.0.427\lib\net40\Raven.Client.MvcIntegration.dll</HintPath>
</Reference>
<Reference Include="Raven.Json, Version=1.0.0.0, Culture=neutral, PublicKeyToken=37f41c7f99471593, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\RavenDB.1.0.0.427\lib\net40\Raven.Json.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.configuration" />
Expand Down Expand Up @@ -175,5 +190,8 @@
<Name>NServiceBus.Persistence.Raven</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
6 changes: 6 additions & 0 deletions src/gateway/NServiceBus.Gateway/packages.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="NLog" version="2.0.0.2000" />
<package id="Newtonsoft.Json" version="4.0.2" />
<package id="RavenDB" version="1.0.0.427" />
</packages>
4 changes: 4 additions & 0 deletions src/gateway/nuget.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8" ?>
<settings>
<repositoryPath>../../packages</repositoryPath>
</settings>
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,7 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\build\output\NServiceBus.Core.dll</HintPath>
</Reference>
<Reference Include="StructureMap, Version=2.5.3.0, Culture=neutral, PublicKeyToken=e60ad81abae3c223, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<Reference Include="StructureMap">
<HintPath>..\..\..\..\packages\structuremap.2.6.2\lib\StructureMap.dll</HintPath>
</Reference>
<Reference Include="System" />
Expand Down Expand Up @@ -98,6 +97,9 @@
<Install>true</Install>
</BootstrapperPackage>
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="structuremap" version="2.6.2" />
</packages>
4 changes: 4 additions & 0 deletions src/impl/ObjectBuilder/nuget.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8" ?>
<settings>
<repositoryPath>../../../packages</repositoryPath>
</settings>
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,15 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="AsyncCtpLibrary">
<HintPath>..\..\..\..\..\packages\RavenDB.1.0.0.427\lib\net40\AsyncCtpLibrary.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json">
<HintPath>..\..\..\..\..\packages\Newtonsoft.Json.4.0.2\lib\net40\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="NLog">
<HintPath>..\..\..\..\..\packages\RavenDB.1.0.0.427\lib\net40\NLog.dll</HintPath>
</Reference>
<Reference Include="NServiceBus.Config">
<HintPath>..\..\..\..\..\build\nservicebus.core\NServiceBus.Config.dll</HintPath>
</Reference>
Expand All @@ -43,26 +52,38 @@
<Reference Include="nunit.framework">
<HintPath>..\..\..\..\..\tools\NUnit\nunit.framework.dll</HintPath>
</Reference>
<Reference Include="Raven.Abstractions">
<HintPath>..\..\..\..\..\packages\RavenDB.1.0.0.427\lib\net40\Raven.Abstractions.dll</HintPath>
</Reference>
<Reference Include="Raven.Client.Debug">
<HintPath>..\..\..\..\..\packages\RavenDB.1.0.0.427\lib\net40\Raven.Client.Debug.dll</HintPath>
</Reference>
<Reference Include="Raven.Client.Embedded">
<HintPath>..\..\..\..\..\packages\RavenDB-Embedded.1.0.0.397\lib\net40\Raven.Client.Embedded.dll</HintPath>
</Reference>
<Reference Include="Raven.Client.Lightweight">
<HintPath>..\..\..\..\..\packages\RavenDB.1.0.0.397\lib\net40\Raven.Client.Lightweight.dll</HintPath>
<HintPath>..\..\..\..\..\packages\RavenDB.1.0.0.427\lib\net40\Raven.Client.Lightweight.dll</HintPath>
</Reference>
<Reference Include="Raven.Client.MvcIntegration">
<HintPath>..\..\..\..\..\packages\RavenDB.1.0.0.427\lib\net40\Raven.Client.MvcIntegration.dll</HintPath>
</Reference>
<Reference Include="Raven.Database">
<HintPath>..\..\..\..\..\packages\RavenDB-Embedded.1.0.0.397\lib\net40\Raven.Database.dll</HintPath>
</Reference>
<Reference Include="Raven.Http, Version=1.0.0.0, Culture=neutral, PublicKeyToken=37f41c7f99471593, processorArchitecture=MSIL">
<HintPath>..\..\..\..\..\packages\RavenDB.1.0.0.397\server\Raven.Http.dll</HintPath>
<HintPath>..\..\..\..\..\packages\RavenDB.1.0.0.427\server\Raven.Http.dll</HintPath>
</Reference>
<Reference Include="Raven.Json">
<HintPath>..\..\..\..\..\packages\RavenDB.1.0.0.427\lib\net40\Raven.Json.dll</HintPath>
</Reference>
<Reference Include="Raven.Server">
<HintPath>..\..\..\..\..\packages\RavenDB.1.0.0.397\server\Raven.Server.exe</HintPath>
<HintPath>..\..\..\..\..\packages\RavenDB.1.0.0.427\server\Raven.Server.exe</HintPath>
</Reference>
<Reference Include="Raven.Storage.Esent">
<HintPath>..\..\..\..\..\packages\RavenDB-Embedded.1.0.0.397\lib\net40\Raven.Storage.Esent.dll</HintPath>
</Reference>
<Reference Include="Raven.Storage.Managed">
<HintPath>..\..\..\..\..\packages\RavenDB.1.0.0.397\server\Raven.Storage.Managed.dll</HintPath>
<HintPath>..\..\..\..\..\packages\RavenDB.1.0.0.427\server\Raven.Storage.Managed.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
Expand All @@ -89,6 +110,7 @@
</ItemGroup>
<ItemGroup>
<None Include="App.config" />
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="NLog" version="2.0.0.2000" />
<package id="Newtonsoft.Json" version="4.0.2" />
<package id="RavenDB" version="1.0.0.427" />
</packages>
Loading

0 comments on commit 94ff8a6

Please sign in to comment.