diff --git a/MSI.ps1 b/MSI.ps1 index 2829d28e935..025979e5c82 100644 --- a/MSI.ps1 +++ b/MSI.ps1 @@ -49,6 +49,6 @@ task Build -depends Clean, Init { task Sign -depends Init { if($SignFile -ne "") { - exec { &$script:signTool sign /f "$SignFile" /p "$env:SIGN_CER_PASSWORD" /d "NServiceBus Installer" /du "http://www.nservicebus.com" /q $packageOutPutDir\*.msi } + exec { &$script:signTool sign /f "$SignFile" /p "$env:SIGN_CER_PASSWORD" /d "NServiceBus Installer" /du "http://particular.net" /q $packageOutPutDir\*.msi } } } \ No newline at end of file diff --git a/NuGet/NServiceBus.Autofac/NServiceBus.Autofac.nuspec b/NuGet/NServiceBus.Autofac/NServiceBus.Autofac.nuspec index f5d88901305..7cd0e771b2c 100644 --- a/NuGet/NServiceBus.Autofac/NServiceBus.Autofac.nuspec +++ b/NuGet/NServiceBus.Autofac/NServiceBus.Autofac.nuspec @@ -4,10 +4,10 @@ NServiceBus Autofac 4.0.0-alpha0 NServiceBus Ltd - Udi Dahan, Andreas Ohlund, Jonathan Matheus, Shlomi Izikovich et al - http://nservicebus.com/license.aspx - http://nservicebus.com/ - http://a2.twimg.com/profile_images/1203939022/nServiceBus_Twitter_Logo_reasonably_small.png + Udi Dahan, Andreas Ohlund, John Simons, Jonathan Matheus et al + http://particular.net/licensing + http://particular.net/ + http://particular.blob.core.windows.net/media/Default/images/ProductLogos/icons/NServiceBus_32.png true The Autofac Container for the nservicebus diff --git a/NuGet/NServiceBus.Azure/NServiceBus.Azure.nuspec b/NuGet/NServiceBus.Azure/NServiceBus.Azure.nuspec index 2a426f5e72b..a83304c1f0a 100644 --- a/NuGet/NServiceBus.Azure/NServiceBus.Azure.nuspec +++ b/NuGet/NServiceBus.Azure/NServiceBus.Azure.nuspec @@ -4,10 +4,10 @@ NServiceBus Azure 4.0.0-alpha0 NServiceBus Ltd - Udi Dahan, Andreas Ohlund, Jonathan Matheus, Shlomi Izikovich et al - http://nservicebus.com/license.aspx - http://nservicebus.com/ - http://a2.twimg.com/profile_images/1203939022/nServiceBus_Twitter_Logo_reasonably_small.png + Udi Dahan, Andreas Ohlund, John Simons, Jonathan Matheus et al + http://particular.net/licensing + http://particular.net/ + http://particular.blob.core.windows.net/media/Default/images/ProductLogos/icons/NServiceBus_32.png true Azure support for NServicebus diff --git a/NuGet/NServiceBus.CastleWindsor/NServiceBus.CastleWindsor.nuspec b/NuGet/NServiceBus.CastleWindsor/NServiceBus.CastleWindsor.nuspec index 0c1d17ee53c..d3b8f8109c3 100644 --- a/NuGet/NServiceBus.CastleWindsor/NServiceBus.CastleWindsor.nuspec +++ b/NuGet/NServiceBus.CastleWindsor/NServiceBus.CastleWindsor.nuspec @@ -4,10 +4,10 @@ NServiceBus CastleWindsor 4.0.0-alpha0 NServiceBus Ltd - Udi Dahan, Andreas Ohlund, Jonathan Matheus, Shlomi Izikovich et al - http://nservicebus.com/license.aspx - http://nservicebus.com/ - http://a2.twimg.com/profile_images/1203939022/nServiceBus_Twitter_Logo_reasonably_small.png + Udi Dahan, Andreas Ohlund, John Simons, Jonathan Matheus et al + http://particular.net/licensing + http://particular.net/ + http://particular.blob.core.windows.net/media/Default/images/ProductLogos/icons/NServiceBus_32.png true The CastleWindsor Container for the nservicebus diff --git a/NuGet/NServiceBus.Host/NServiceBus.Host.nuspec b/NuGet/NServiceBus.Host/NServiceBus.Host.nuspec index 6485d7e5cca..3958a5c4997 100644 --- a/NuGet/NServiceBus.Host/NServiceBus.Host.nuspec +++ b/NuGet/NServiceBus.Host/NServiceBus.Host.nuspec @@ -4,10 +4,10 @@ NServiceBus Host 4.0.0-alpha0 NServiceBus Ltd - Udi Dahan, Andreas Ohlund, Jonathan Matheus, Shlomi Izikovich et al - http://nservicebus.com/license.aspx - http://nservicebus.com/ - http://a2.twimg.com/profile_images/1203939022/nServiceBus_Twitter_Logo_reasonably_small.png + Udi Dahan, Andreas Ohlund, John Simons, Jonathan Matheus et al + http://particular.net/licensing + http://particular.net/ + http://particular.blob.core.windows.net/media/Default/images/ProductLogos/icons/NServiceBus_32.png true The hosting template for the nservicebus, The most popular open-source service bus for .net diff --git a/NuGet/NServiceBus.Host/content/EndpointConfig.cs.pp b/NuGet/NServiceBus.Host/content/EndpointConfig.cs.pp index 7f82678e521..087216d9f76 100644 --- a/NuGet/NServiceBus.Host/content/EndpointConfig.cs.pp +++ b/NuGet/NServiceBus.Host/content/EndpointConfig.cs.pp @@ -4,7 +4,7 @@ /* This class configures this endpoint as a Server. More information about how to configure the NServiceBus host - can be found here: http://nservicebus.com/GenericHost.aspx + can be found here: http://particular.net/articles/profiles-for-nservicebus-host */ public class EndpointConfig : IConfigureThisEndpoint, AsA_Server { diff --git a/NuGet/NServiceBus.Host32/NServiceBus.Host32.nuspec b/NuGet/NServiceBus.Host32/NServiceBus.Host32.nuspec index da70ebb0f39..a88555014d7 100644 --- a/NuGet/NServiceBus.Host32/NServiceBus.Host32.nuspec +++ b/NuGet/NServiceBus.Host32/NServiceBus.Host32.nuspec @@ -4,10 +4,10 @@ NServiceBus Host32 4.0.0-alpha0 NServiceBus Ltd - Udi Dahan, Andreas Ohlund, Jonathan Matheus, Shlomi Izikovich et al - http://nservicebus.com/license.aspx - http://nservicebus.com/ - http://a2.twimg.com/profile_images/1203939022/nServiceBus_Twitter_Logo_reasonably_small.png + Udi Dahan, Andreas Ohlund, John Simons, Jonathan Matheus et al + http://particular.net/licensing + http://particular.net/ + http://particular.blob.core.windows.net/media/Default/images/ProductLogos/icons/NServiceBus_32.png true The hosting template for the nservicebus, The most popular open-source service bus for .net diff --git a/NuGet/NServiceBus.Host32/content/EndpointConfig.cs.pp b/NuGet/NServiceBus.Host32/content/EndpointConfig.cs.pp index 7f82678e521..087216d9f76 100644 --- a/NuGet/NServiceBus.Host32/content/EndpointConfig.cs.pp +++ b/NuGet/NServiceBus.Host32/content/EndpointConfig.cs.pp @@ -4,7 +4,7 @@ /* This class configures this endpoint as a Server. More information about how to configure the NServiceBus host - can be found here: http://nservicebus.com/GenericHost.aspx + can be found here: http://particular.net/articles/profiles-for-nservicebus-host */ public class EndpointConfig : IConfigureThisEndpoint, AsA_Server { diff --git a/NuGet/NServiceBus.Hosting.Azure.HostProcess/NServiceBus.Hosting.Azure.HostProcess.nuspec b/NuGet/NServiceBus.Hosting.Azure.HostProcess/NServiceBus.Hosting.Azure.HostProcess.nuspec index c3930a536a6..f2cb0dc8d78 100644 --- a/NuGet/NServiceBus.Hosting.Azure.HostProcess/NServiceBus.Hosting.Azure.HostProcess.nuspec +++ b/NuGet/NServiceBus.Hosting.Azure.HostProcess/NServiceBus.Hosting.Azure.HostProcess.nuspec @@ -4,10 +4,10 @@ NServiceBus Hosting Azure HostProcess 4.0.0-alpha0 NServiceBus Ltd - Udi Dahan, Andreas Ohlund, Jonathan Matheus, Shlomi Izikovich et al - http://nservicebus.com/license.aspx - http://nservicebus.com/ - http://a2.twimg.com/profile_images/1203939022/nServiceBus_Twitter_Logo_reasonably_small.png + Udi Dahan, Andreas Ohlund, John Simons, Jonathan Matheus et al + http://particular.net/licensing + http://particular.net/ + http://particular.blob.core.windows.net/media/Default/images/ProductLogos/icons/NServiceBus_32.png true The process used when sharing an azure instance between multiple NServicebus endpoints diff --git a/NuGet/NServiceBus.Hosting.Azure/NServiceBus.Hosting.Azure.nuspec b/NuGet/NServiceBus.Hosting.Azure/NServiceBus.Hosting.Azure.nuspec index d2a288c25fd..6ff2495e294 100644 --- a/NuGet/NServiceBus.Hosting.Azure/NServiceBus.Hosting.Azure.nuspec +++ b/NuGet/NServiceBus.Hosting.Azure/NServiceBus.Hosting.Azure.nuspec @@ -4,10 +4,10 @@ NServiceBus Hosting Azure 4.0.0-alpha0 NServiceBus Ltd - Udi Dahan, Andreas Ohlund, Jonathan Matheus, Shlomi Izikovich et al - http://nservicebus.com/license.aspx - http://nservicebus.com/ - http://a2.twimg.com/profile_images/1203939022/nServiceBus_Twitter_Logo_reasonably_small.png + Udi Dahan, Andreas Ohlund, John Simons, Jonathan Matheus et al + http://particular.net/licensing + http://particular.net/ + http://particular.blob.core.windows.net/media/Default/images/ProductLogos/icons/NServiceBus_32.png true The Azure Host for NServicebus diff --git a/NuGet/NServiceBus.Integration.WebServices/NServiceBus.Integration.WebServices.nuspec b/NuGet/NServiceBus.Integration.WebServices/NServiceBus.Integration.WebServices.nuspec index abe499975fe..035ed6282ad 100644 --- a/NuGet/NServiceBus.Integration.WebServices/NServiceBus.Integration.WebServices.nuspec +++ b/NuGet/NServiceBus.Integration.WebServices/NServiceBus.Integration.WebServices.nuspec @@ -4,10 +4,10 @@ NServiceBus Integration WebServices 4.0.0-alpha0 NServiceBus Ltd - Udi Dahan, Andreas Ohlund, Jonathan Matheus, Shlomi Izikovich et al - http://nservicebus.com/license.aspx - http://nservicebus.com/ - http://a2.twimg.com/profile_images/1203939022/nServiceBus_Twitter_Logo_reasonably_small.png + Udi Dahan, Andreas Ohlund, John Simons, Jonathan Matheus et al + http://particular.net/licensing + http://particular.net/ + http://particular.blob.core.windows.net/media/Default/images/ProductLogos/icons/NServiceBus_32.png true The WebServices Integration for the nservicebus, The most popular open-source service bus for .net diff --git a/NuGet/NServiceBus.Interfaces/NServiceBus.Interfaces.nuspec b/NuGet/NServiceBus.Interfaces/NServiceBus.Interfaces.nuspec index 6f765f57921..db1c29f336f 100644 --- a/NuGet/NServiceBus.Interfaces/NServiceBus.Interfaces.nuspec +++ b/NuGet/NServiceBus.Interfaces/NServiceBus.Interfaces.nuspec @@ -4,10 +4,10 @@ NServiceBus Interfaces 4.0.0-alpha0 NServiceBus Ltd - Udi Dahan, Andreas Ohlund, Jonathan Matheus, Shlomi Izikovich et al - http://nservicebus.com/license.aspx - http://nservicebus.com/ - http://a2.twimg.com/profile_images/1203939022/nServiceBus_Twitter_Logo_reasonably_small.png + Udi Dahan, Andreas Ohlund, John Simons, Jonathan Matheus et al + http://particular.net/licensing + http://particular.net/ + http://particular.blob.core.windows.net/media/Default/images/ProductLogos/icons/NServiceBus_32.png true The Interfaces for NServiceBus Implementation diff --git a/NuGet/NServiceBus.NHibernate/NServiceBus.NHibernate.nuspec b/NuGet/NServiceBus.NHibernate/NServiceBus.NHibernate.nuspec index c09c56ec31f..f667bcf0e96 100644 --- a/NuGet/NServiceBus.NHibernate/NServiceBus.NHibernate.nuspec +++ b/NuGet/NServiceBus.NHibernate/NServiceBus.NHibernate.nuspec @@ -4,10 +4,10 @@ NServiceBus NHibernate 4.0.0-alpha0 NServiceBus Ltd - Udi Dahan, Andreas Ohlund, Jonathan Matheus, Shlomi Izikovich et al - http://nservicebus.com/license.aspx - http://nservicebus.com/ - http://a2.twimg.com/profile_images/1203939022/nServiceBus_Twitter_Logo_reasonably_small.png + Udi Dahan, Andreas Ohlund, John Simons, Jonathan Matheus et al + http://particular.net/licensing + http://particular.net/ + http://particular.blob.core.windows.net/media/Default/images/ProductLogos/icons/NServiceBus_32.png true The NHibernate for the NServicebus diff --git a/NuGet/NServiceBus.Ninject/NServiceBus.Ninject.nuspec b/NuGet/NServiceBus.Ninject/NServiceBus.Ninject.nuspec index 01aff8fcd10..684d65777eb 100644 --- a/NuGet/NServiceBus.Ninject/NServiceBus.Ninject.nuspec +++ b/NuGet/NServiceBus.Ninject/NServiceBus.Ninject.nuspec @@ -4,10 +4,10 @@ NServiceBus Ninject 4.0.0-alpha0 NServiceBus Ltd - Udi Dahan, Andreas Ohlund, Jonathan Matheus, Shlomi Izikovich et al - http://nservicebus.com/license.aspx - http://nservicebus.com/ - http://a2.twimg.com/profile_images/1203939022/nServiceBus_Twitter_Logo_reasonably_small.png + Udi Dahan, Andreas Ohlund, John Simons, Jonathan Matheus et al + http://particular.net/licensing + http://particular.net/ + http://particular.blob.core.windows.net/media/Default/images/ProductLogos/icons/NServiceBus_32.png true The Ninject Container for the nservicebus diff --git a/NuGet/NServiceBus.Spring/NServiceBus.Spring.nuspec b/NuGet/NServiceBus.Spring/NServiceBus.Spring.nuspec index 0f793d9e73d..02b4f156e62 100644 --- a/NuGet/NServiceBus.Spring/NServiceBus.Spring.nuspec +++ b/NuGet/NServiceBus.Spring/NServiceBus.Spring.nuspec @@ -4,10 +4,10 @@ NServiceBus Spring 4.0.0-alpha0 NServiceBus Ltd - Udi Dahan, Andreas Ohlund, Jonathan Matheus, Shlomi Izikovich et al - http://nservicebus.com/license.aspx - http://nservicebus.com/ - http://a2.twimg.com/profile_images/1203939022/nServiceBus_Twitter_Logo_reasonably_small.png + Udi Dahan, Andreas Ohlund, John Simons, Jonathan Matheus et al + http://particular.net/licensing + http://particular.net/ + http://particular.blob.core.windows.net/media/Default/images/ProductLogos/icons/NServiceBus_32.png true The Spring Container for the nservicebus diff --git a/NuGet/NServiceBus.StructureMap/NServiceBus.StructureMap.nuspec b/NuGet/NServiceBus.StructureMap/NServiceBus.StructureMap.nuspec index b72a35b7311..f473f5352ea 100644 --- a/NuGet/NServiceBus.StructureMap/NServiceBus.StructureMap.nuspec +++ b/NuGet/NServiceBus.StructureMap/NServiceBus.StructureMap.nuspec @@ -4,10 +4,10 @@ NServiceBus StructureMap 4.0.0-alpha0 NServiceBus Ltd - Udi Dahan, Andreas Ohlund, Jonathan Matheus, Shlomi Izikovich et al - http://nservicebus.com/license.aspx - http://nservicebus.com/ - http://a2.twimg.com/profile_images/1203939022/nServiceBus_Twitter_Logo_reasonably_small.png + Udi Dahan, Andreas Ohlund, John Simons, Jonathan Matheus et al + http://particular.net/licensing + http://particular.net/ + http://particular.blob.core.windows.net/media/Default/images/ProductLogos/icons/NServiceBus_32.png true The StructureMap Container for the nservicebus diff --git a/NuGet/NServiceBus.Testing/NServiceBus.Testing.nuspec b/NuGet/NServiceBus.Testing/NServiceBus.Testing.nuspec index 4f16d40448d..1280aa98c08 100644 --- a/NuGet/NServiceBus.Testing/NServiceBus.Testing.nuspec +++ b/NuGet/NServiceBus.Testing/NServiceBus.Testing.nuspec @@ -4,10 +4,10 @@ NServiceBus Testing 4.0.0-alpha0 NServiceBus Ltd - Udi Dahan, Andreas Ohlund, Jonathan Matheus, Shlomi Izikovich et al - http://nservicebus.com/license.aspx - http://nservicebus.com/ - http://a2.twimg.com/profile_images/1203939022/nServiceBus_Twitter_Logo_reasonably_small.png + Udi Dahan, Andreas Ohlund, John Simons, Jonathan Matheus et al + http://particular.net/licensing + http://particular.net/ + http://particular.blob.core.windows.net/media/Default/images/ProductLogos/icons/NServiceBus_32.png true The testing for the nservicebus, The most popular open-source service bus for .net diff --git a/NuGet/NServiceBus.Timeout.Hosting.Azure/NServiceBus.Timeout.Hosting.Azure.nuspec b/NuGet/NServiceBus.Timeout.Hosting.Azure/NServiceBus.Timeout.Hosting.Azure.nuspec index cc8be430619..3e19f3a05ba 100644 --- a/NuGet/NServiceBus.Timeout.Hosting.Azure/NServiceBus.Timeout.Hosting.Azure.nuspec +++ b/NuGet/NServiceBus.Timeout.Hosting.Azure/NServiceBus.Timeout.Hosting.Azure.nuspec @@ -4,10 +4,10 @@ NServiceBus Timeout Hosting Azure 4.0.0-alpha0 NServiceBus Ltd - Udi Dahan, Andreas Ohlund, Jonathan Matheus, Shlomi Izikovich et al - http://nservicebus.com/license.aspx - http://nservicebus.com/ - http://a2.twimg.com/profile_images/1203939022/nServiceBus_Twitter_Logo_reasonably_small.png + Udi Dahan, Andreas Ohlund, John Simons, Jonathan Matheus et al + http://particular.net/licensing + http://particular.net/ + http://particular.blob.core.windows.net/media/Default/images/ProductLogos/icons/NServiceBus_32.png true The Azure Host for the timeout manager on NServicebus diff --git a/NuGet/NServiceBus.Unity/NServiceBus.Unity.nuspec b/NuGet/NServiceBus.Unity/NServiceBus.Unity.nuspec index 4f3fb792c48..91e8f70bbef 100644 --- a/NuGet/NServiceBus.Unity/NServiceBus.Unity.nuspec +++ b/NuGet/NServiceBus.Unity/NServiceBus.Unity.nuspec @@ -4,10 +4,10 @@ NServiceBus Unity 4.0.0-alpha0 NServiceBus Ltd - Udi Dahan, Andreas Ohlund, Jonathan Matheus, Shlomi Izikovich et al - http://nservicebus.com/license.aspx - http://nservicebus.com/ - http://a2.twimg.com/profile_images/1203939022/nServiceBus_Twitter_Logo_reasonably_small.png + Udi Dahan, Andreas Ohlund, John Simons, Jonathan Matheus et al + http://particular.net/licensing + http://particular.net/ + http://particular.blob.core.windows.net/media/Default/images/ProductLogos/icons/NServiceBus_32.png true The Unity Container for the nservicebus diff --git a/NuGet/NServiceBus/NServiceBus.nuspec b/NuGet/NServiceBus/NServiceBus.nuspec index 0ba30116305..ba2ed73a0e2 100644 --- a/NuGet/NServiceBus/NServiceBus.nuspec +++ b/NuGet/NServiceBus/NServiceBus.nuspec @@ -4,10 +4,10 @@ NServiceBus 4.0.0-alpha0 NServiceBus Ltd - Udi Dahan, Andreas Ohlund, Jonathan Matheus, Shlomi Izikovich et al - http://nservicebus.com/license.aspx - http://nservicebus.com/ - http://a2.twimg.com/profile_images/1203939022/nServiceBus_Twitter_Logo_reasonably_small.png + Udi Dahan, Andreas Ohlund, John Simons, Jonathan Matheus et al + http://particular.net/licensing + http://particular.net/ + http://particular.blob.core.windows.net/media/Default/images/ProductLogos/icons/NServiceBus_32.png true The most popular open-source service bus for .net diff --git a/NuGet/NServiceBus/tools/init.ps1 b/NuGet/NServiceBus/tools/init.ps1 index d21b5eed992..d60dcca88c7 100644 --- a/NuGet/NServiceBus/tools/init.ps1 +++ b/NuGet/NServiceBus/tools/init.ps1 @@ -56,4 +56,4 @@ if($perfCountersInstalled -and $msmqInstalled -and $dtcInstalled -and $ravenDBIn exit } -$dte.ExecuteCommand("View.URL", "http://www.nservicebus.com/RequiredInfrastructure/Windows/Setup?dtc=" + $dtcInstalled + "&msmq=" + $msmqInstalled + "&raven=" + $ravenDBInstalled + "&perfcounter=" + $perfCountersInstalled) \ No newline at end of file +$dte.ExecuteCommand("View.URL", "http://particular.net/articles/preparing-your-machine-to-run-nservicebus?dtc=" + $dtcInstalled + "&msmq=" + $msmqInstalled + "&raven=" + $ravenDBInstalled + "&perfcounter=" + $perfCountersInstalled) \ No newline at end of file diff --git a/Samples/Manufacturing/OrderService/OrderService.Tests/OrderSagaTests.cs b/Samples/Manufacturing/OrderService/OrderService.Tests/OrderSagaTests.cs index af5b5a4af93..46d1942970a 100644 --- a/Samples/Manufacturing/OrderService/OrderService.Tests/OrderSagaTests.cs +++ b/Samples/Manufacturing/OrderService/OrderService.Tests/OrderSagaTests.cs @@ -47,7 +47,7 @@ public void OrderSagaTest() Test.Saga(sagaId).WhenReceivesMessageFrom(partnerAddress) .ExpectReplyToOrginator(m => (Check(m, OrderStatusEnum.Recieved))) .ExpectPublish(m => Check(m, OrderStatusEnum.Recieved)) - .ExpectSend(Check) + .ExpectSend(m=>Check(m)) .ExpectTimeoutToBeSetAt((state, at) => at == order.ProvideBy - TimeSpan.FromSeconds(2) && state == "state") .When(os => os.Handle(order)) @@ -65,7 +65,7 @@ public void TimeoutTest() Test.Saga(sagaId).WhenReceivesMessageFrom(partnerAddress) .ExpectReplyToOrginator(m => (Check(m, OrderStatusEnum.Recieved))) .ExpectPublish(m => Check(m, OrderStatusEnum.Recieved)) - .ExpectSend(Check) + .ExpectSend(m => Check(m)) .ExpectTimeoutToBeSetAt((state, at) => { st = state; return true; }) .When(os => os.Handle(CreateRequest())) diff --git a/readme.txt b/readme.txt index 2a96db5916d..9605fbf4c71 100644 --- a/readme.txt +++ b/readme.txt @@ -11,7 +11,7 @@ http://www.opensource.org/licenses/rpl1.5.txt If you do not wish to release the source of software you build using NServiceBus, you may use NServiceBus source and/or binaries under the NServiceBus Express End User License Agreement as described here: -http://www.nservicebus.com/EULA.aspx +http://particular.net/LicenseAgreement ============ @@ -19,7 +19,7 @@ http://www.nservicebus.com/EULA.aspx ============ The following web page contains information about how to build NServiceBus form source files: -http://nservicebus.com/BuildingNServiceBusFromSource.aspxIn order to build the source, run the build.ps1 powershell script. +http://particular.net/SourceCode In order to build the source, run the build.ps1 powershell script. You'll find the built assemblies in /build/binaries. diff --git a/src/config/NServiceBus.Config/ConfigureSettingLocalAddressNameAction.cs b/src/config/NServiceBus.Config/ConfigureSettingLocalAddressNameAction.cs index 5f59335a81d..5e83bb89730 100644 --- a/src/config/NServiceBus.Config/ConfigureSettingLocalAddressNameAction.cs +++ b/src/config/NServiceBus.Config/ConfigureSettingLocalAddressNameAction.cs @@ -8,14 +8,14 @@ namespace NServiceBus.Config.Advanced public static class ConfigureSettingLocalAddressNameAction { /// - /// By default local address should equal endpoint name. - /// See: Here for more details. + /// By default local address should equal endpoint name. + /// See: Here for more details. /// private static Func defineLocalAddressNameFunc = Configure.GetEndpointNameAction; /// - /// Set a function that overrides the default naming of NServiceBus local addresses. - /// See: Here for more details. + /// Set a function that overrides the default naming of NServiceBus local addresses. + /// See: Here for more details. /// /// /// @@ -26,8 +26,8 @@ public static Configure DefineLocalAddressNameFunc(this Configure config, Func - /// Execute function that returns the NServiceBus local addresses name. If not override by the user, NServiceBus defaults will be used. - /// See: Here for more details. + /// Execute function that returns the NServiceBus local addresses name. If not override by the user, NServiceBus defaults will be used. + /// See: Here for more details. /// /// public static string GetLocalAddressName() diff --git a/src/distributor/NServiceBus.Distributor/LicenseConfig.cs b/src/distributor/NServiceBus.Distributor/LicenseConfig.cs index 6c5c8dc5903..1fd94861ad2 100644 --- a/src/distributor/NServiceBus.Distributor/LicenseConfig.cs +++ b/src/distributor/NServiceBus.Distributor/LicenseConfig.cs @@ -30,7 +30,7 @@ internal static bool LimitNumberOfWorkers(Address workerAddress) return false; } Logger.WarnFormat( - "License limitation for [{0}] workers per distributor reached. To obtain a license that allows to add more workers, please visit http://nservicebus.com/License.aspx.", + "License limitation for [{0}] workers per distributor reached. To obtain a license that allows to add more workers, please visit http://particular.net/licensing.", allowedWorkerNodes); return true; } diff --git a/src/forms/PrepareMachine.cs b/src/forms/PrepareMachine.cs index 6b40cc99442..6f802cb32db 100644 --- a/src/forms/PrepareMachine.cs +++ b/src/forms/PrepareMachine.cs @@ -18,7 +18,7 @@ public PrepareMachine() private void requestLink_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) { - Process.Start("http://nservicebus.com/RequiredInfrastructure/Windows"); + Process.Start("http://particular.net/articles/running-nservicebus-on-windows"); } diff --git a/src/forms/TrialExpired.cs b/src/forms/TrialExpired.cs index 0b43f49efe1..30cccb46bfe 100644 --- a/src/forms/TrialExpired.cs +++ b/src/forms/TrialExpired.cs @@ -99,7 +99,7 @@ private void timer_Tick(object sender, EventArgs e) private void requestButton_Click(object sender, EventArgs e) { - Process.Start("http://www.nservicebus.com/LicenseExpired"); + Process.Start("http://particular.net/licensing"); } private void ignoreButton_Click(object sender, EventArgs e) diff --git a/src/impl/licensing/NServiceBus.Licensing/LicenseManager.cs b/src/impl/licensing/NServiceBus.Licensing/LicenseManager.cs index 65fb8b6a257..f00cf691c11 100644 --- a/src/impl/licensing/NServiceBus.Licensing/LicenseManager.cs +++ b/src/impl/licensing/NServiceBus.Licensing/LicenseManager.cs @@ -411,13 +411,13 @@ private void CheckIfNServiceBusVersionIsNewerThanLicenseVersion() catch (Exception exception) { throw new ConfigurationErrorsException( - "Your license is valid for an older version of NServiceBus. If you are still within the 1 year upgrade protection period of your original license, you should have already received a new license and if you haven’t, please contact customer.care@nservicebus.com. If your upgrade protection has lapsed, you can renew it at http://www.nservicebus.com/PurchaseSupport.aspx.", + "Your license is valid for an older version of NServiceBus. If you are still within the 1 year upgrade protection period of your original license, you should have already received a new license and if you haven’t, please contact customer.care@particular.net. If your upgrade protection has lapsed, you can renew it at http://particular.net/support.", exception); } } throw new ConfigurationErrorsException( - "Your license is valid for an older version of NServiceBus. If you are still within the 1 year upgrade protection period of your original license, you should have already received a new license and if you haven’t, please contact customer.care@nservicebus.com. If your upgrade protection has lapsed, you can renew it at http://www.nservicebus.com/PurchaseSupport.aspx."); + "Your license is valid for an older version of NServiceBus. If you are still within the 1 year upgrade protection period of your original license, you should have already received a new license and if you haven’t, please contact customer.care@particular.net. If your upgrade protection has lapsed, you can renew it at http://particular.net/support."); } private static Version GetNServiceBusVersion() diff --git a/src/impl/unicast/queuing/NServiceBus.Unicast.Queuing.Msmq.Config/Installers/MsmqInfrastructureInstaller.cs b/src/impl/unicast/queuing/NServiceBus.Unicast.Queuing.Msmq.Config/Installers/MsmqInfrastructureInstaller.cs index 1552d70c0f2..03b82d9064e 100644 --- a/src/impl/unicast/queuing/NServiceBus.Unicast.Queuing.Msmq.Config/Installers/MsmqInfrastructureInstaller.cs +++ b/src/impl/unicast/queuing/NServiceBus.Unicast.Queuing.Msmq.Config/Installers/MsmqInfrastructureInstaller.cs @@ -20,7 +20,7 @@ public void Install(WindowsIdentity identity) return; if(!MsmqSetup.StartMsmqIfNecessary(false)) - throw new Exception("Failed to setup MSMQ since it needs to be reinstalled. A reinstall will remove any local queues. Please go to http://nservicebus.com/RequiredInfrastructure/Windows for instructions on how to remedy the situation"); + throw new Exception("Failed to setup MSMQ since it needs to be reinstalled. A reinstall will remove any local queues. Please go to http://particular.net/articles/running-nservicebus-on-windows for instructions on how to remedy the situation"); } } } \ No newline at end of file diff --git a/src/installation/NServiceBus.Installation/INeedToInstallInfrastructure.cs b/src/installation/NServiceBus.Installation/INeedToInstallInfrastructure.cs index 3e073bcfeec..68906a72fb3 100644 --- a/src/installation/NServiceBus.Installation/INeedToInstallInfrastructure.cs +++ b/src/installation/NServiceBus.Installation/INeedToInstallInfrastructure.cs @@ -4,7 +4,7 @@ /// Interface invoked by the infrastructure when going to install an endpoint. /// Implementors should not implement this type directly but rather the generic version of it. /// - [ObsoleteEx(Message = "It is possible to use NServiceBus installer or powershell support to accomplish the same thing. Please see http://www.nservicebus.com/powershell.aspx for more information.", TreatAsErrorFromVersion = "4.0", RemoveInVersion = "5.0")] + [ObsoleteEx(Message = "It is possible to use NServiceBus installer or powershell support to accomplish the same thing. Please see http://particular.net/articles/managing-nservicebus-using-powershell for more information.", TreatAsErrorFromVersion = "4.0", RemoveInVersion = "5.0")] public interface INeedToInstallInfrastructure : INeedToInstallSomething { @@ -15,7 +15,7 @@ public interface INeedToInstallInfrastructure : INeedToInstallSomething /// Implementors invoked before . /// /// - [ObsoleteEx(Message = "It is possible to use NServiceBus installer or powershell support to accomplish the same thing. Please see http://www.nservicebus.com/powershell.aspx for more information.", TreatAsErrorFromVersion = "4.0", RemoveInVersion = "5.0")] + [ObsoleteEx(Message = "It is possible to use NServiceBus installer or powershell support to accomplish the same thing. Please see http://particular.net/articles/managing-nservicebus-using-powershell for more information.", TreatAsErrorFromVersion = "4.0", RemoveInVersion = "5.0")] public interface INeedToInstallInfrastructure : INeedToInstallInfrastructure where T : IEnvironment { diff --git a/src/nhibernate/SagaPersister/NServiceBus.SagaPersisters.NHibernate.Config/ConfigureNHibernateSagaPersister.cs b/src/nhibernate/SagaPersister/NServiceBus.SagaPersisters.NHibernate.Config/ConfigureNHibernateSagaPersister.cs index 25cab61bb55..42c1da3663f 100644 --- a/src/nhibernate/SagaPersister/NServiceBus.SagaPersisters.NHibernate.Config/ConfigureNHibernateSagaPersister.cs +++ b/src/nhibernate/SagaPersister/NServiceBus.SagaPersisters.NHibernate.Config/ConfigureNHibernateSagaPersister.cs @@ -53,7 +53,7 @@ public static Configure NHibernateSagaPersisterWithSQLiteAndAutomaticSchemaGener if (e.ExceptionObject.GetType() == typeof(AccessViolationException)) LogManager.GetLogger("System.Data.SQLite").Fatal( - "NServiceBus has detected an error in the operation of SQLite. SQLite is the database used to store sagas from NServiceBus when running under the 'Integration' profile. This error usually occurs only under load. If you wish to use sagas under load, it is recommended to run NServiceBus under the 'Production' profile. This can be done by passing the value 'NServiceBus.Production' on the command line to the NServiceBus.Host.exe process. For more information see http://www.NServiceBus.com/Profiles.aspx ."); + "NServiceBus has detected an error in the operation of SQLite. SQLite is the database used to store sagas from NServiceBus when running under the 'Integration' profile. This error usually occurs only under load. If you wish to use sagas under load, it is recommended to run NServiceBus under the 'Production' profile. This can be done by passing the value 'NServiceBus.Production' on the command line to the NServiceBus.Host.exe process. For more information see http://particular.net/articles/profiles-for-nservicebus-host"); }; return NHibernateSagaPersister(config, nhibernateProperties, true); diff --git a/src/nhibernate/TimeoutPersister/NServiceBus.TimeoutPersisters.NHibernate/Config/TimeoutEntityMap.cs b/src/nhibernate/TimeoutPersister/NServiceBus.TimeoutPersisters.NHibernate/Config/TimeoutEntityMap.cs index f64b6fe0137..bb4e228f32c 100644 --- a/src/nhibernate/TimeoutPersister/NServiceBus.TimeoutPersisters.NHibernate/Config/TimeoutEntityMap.cs +++ b/src/nhibernate/TimeoutPersister/NServiceBus.TimeoutPersisters.NHibernate/Config/TimeoutEntityMap.cs @@ -1,29 +1,29 @@ -namespace NServiceBus.TimeoutPersisters.NHibernate.Config -{ - using NHibernate; - using global::NHibernate.Mapping.ByCode; - using global::NHibernate.Mapping.ByCode.Conformist; - - public class TimeoutEntityMap : ClassMapping - { - public TimeoutEntityMap() - { - Id(x => x.Id, m => m.Generator(Generators.Assigned)); - Property(p => p.State); - Property(p => p.CorrelationId, pm => pm.Length(1024)); - Property(p => p.Destination, pm => - { - pm.Type(); - pm.Length(1024); - }); - Property(p => p.SagaId, pm => pm.Index("SagaIdIdx")); - Property(p => p.Time); - Property(p => p.Headers, pm => pm.Length(4000)); - Property(p => p.Endpoint, pm => - { - pm.Index("EndpointIdx"); - pm.Length(1024); - }); - } - } -} \ No newline at end of file +namespace NServiceBus.TimeoutPersisters.NHibernate.Config +{ + using global::NHibernate; + using global::NHibernate.Mapping.ByCode; + using global::NHibernate.Mapping.ByCode.Conformist; + + public class TimeoutEntityMap : ClassMapping + { + public TimeoutEntityMap() + { + Id(x => x.Id, m => m.Generator(Generators.Assigned)); + Property(p => p.State); + Property(p => p.CorrelationId, pm => pm.Length(1024)); + Property(p => p.Destination, pm => + { + pm.Type(); + pm.Length(1024); + }); + Property(p => p.SagaId, pm => pm.Index("SagaIdIdx")); + Property(p => p.Time); + Property(p => p.Headers, pm => pm.Type(NHibernateUtil.StringClob)); + Property(p => p.Endpoint, pm => + { + pm.Index("EndpointIdx"); + pm.Length(450); + }); + } + } +} diff --git a/src/testing/NServiceBus.Testing.Tests/SagaTests.cs b/src/testing/NServiceBus.Testing.Tests/SagaTests.cs index ff5386afd04..267850e027e 100644 --- a/src/testing/NServiceBus.Testing.Tests/SagaTests.cs +++ b/src/testing/NServiceBus.Testing.Tests/SagaTests.cs @@ -28,6 +28,15 @@ public void MySaga() } [Test] + public void MySagaWithActions() + { + Test.Saga() + .ExpectTimeoutToBeSetIn( + (state, span) => Assert.That(() => span, Is.EqualTo(TimeSpan.FromDays(7)))) + .When(s => s.Handle(new StartsSaga())); + } + + [Test] public void DiscountTest() { decimal total = 600; @@ -42,6 +51,16 @@ public void DiscountTest() } [Test] + public void DiscountTestWithActions() + { + decimal total = 600; + + Test.Saga() + .ExpectSend(m => Assert.That(() => m.Total, Is.EqualTo(total))) + .When(s => s.Handle(new SubmitOrder { Total = total })); + } + + [Test] public void DiscountTestWithTimeout() { decimal total = 600; @@ -68,7 +87,22 @@ public void RemoteOrder() .When(s => s.Handle(new SubmitOrder {Total = total, IsRemoteOrder = true})); } - + [Test] + public void RemoteOrderWithAssertions() + { + decimal total = 100; + + Test.Saga() + .ExpectSendToDestination((m, a) => + { + Assert.That(() => m.Total, Is.EqualTo(total)); + Assert.That(() => a.Queue, Is.EqualTo("remote.orderqueue")); + }) + .ExpectTimeoutToBeSetIn((state, span) => span == TimeSpan.FromDays(7)) + .When(s => s.Handle(new SubmitOrder { Total = total, IsRemoteOrder = true })); + } + + [Test] public void DiscountTestWithSpecificTimeout() { diff --git a/src/testing/Saga.cs b/src/testing/Saga.cs index 0fcb835d3d9..a5ec1c9fb58 100644 --- a/src/testing/Saga.cs +++ b/src/testing/Saga.cs @@ -96,6 +96,17 @@ public Saga ExpectSend(Func check = null) } /// + /// Check that the saga sends a message of the given type complying with user-supplied assertions. + /// + /// + /// An action containing assertions on the message. + /// + public Saga ExpectSend(Action check) + { + return ExpectSend(CheckActionToFunc(check)); + } + + /// /// Check that the saga does not send a message of the given type complying with the given predicate. /// /// @@ -108,6 +119,18 @@ public Saga ExpectNotSend(Func check) } /// + /// Check that the saga does not send a message of the given type complying with the given predicate. + /// + /// + /// An action containing assertions on the message. + /// + public Saga ExpectNotSend(Action check) + { + expectedInvocations.Add(new ExpectedNotSendInvocation { Check = CheckActionToFunc(check) }); + return this; + } + + /// /// Check that the saga replies with the given message type complying with the given predicate. /// /// @@ -133,6 +156,18 @@ public Saga ExpectSendLocal(Func check = null) } /// + /// Check that the saga sends the given message type to its local queue + /// and that the message complies with the given predicate. + /// + /// + /// An action that performs assertions on the message. + /// + public Saga ExpectSendLocal(Action check) + { + return ExpectSendLocal(CheckActionToFunc(check)); + } + + /// /// Check that the saga does not send a message type to its local queue that complies with the given predicate. /// /// @@ -145,6 +180,17 @@ public Saga ExpectNotSendLocal(Func check) } /// + /// Check that the saga does not send a message type to its local queue that complies with the given predicate. + /// + /// + /// An action that performs assertions on the message. + /// + public Saga ExpectNotSendLocal(Action check) + { + return ExpectNotSendLocal(CheckActionToFunc(check)); + } + + /// /// Check that the saga uses the bus to return the appropriate error code. /// /// @@ -169,6 +215,17 @@ public Saga ExpectSendToDestination(Func c } /// + /// Check that the saga sends the given message type to the appropriate destination. + /// + /// + /// An action that performs assertions on the message. + /// + public Saga ExpectSendToDestination(Action check) + { + return ExpectSendToDestination(CheckActionToFunc(check)); + } + + /// /// Check that the saga replies to the originator with the given message type. /// /// @@ -205,6 +262,17 @@ public Saga ExpectReplyToOrginator(Func check = nul } /// + /// Check that the saga replies to the originator with the given message type. + /// + /// + /// An action that performs assertions on the message. + /// + public Saga ExpectReplyToOrginator(Action check) + { + return ExpectReplyToOrginator(CheckActionToFunc(check)); + } + + /// /// Check that the saga publishes a message of the given type complying with the given predicate. /// /// @@ -215,8 +283,19 @@ public Saga ExpectPublish(Func check = null) expectedInvocations.Add(new ExpectedPublishInvocation { Check = check }); return this; } - + /// + /// Check that the saga publishes a message of the given type complying with the given predicate. + /// + /// + /// An action that performs assertions on the message. + /// + public Saga ExpectPublish(Action check) + { + return ExpectPublish(CheckActionToFunc(check)); + } + + /// /// Check that the saga does not publish any messages of the given type complying with the given predicate. /// /// @@ -229,6 +308,17 @@ public Saga ExpectNotPublish(Func check = null) } /// + /// Check that the saga does not publish any messages of the given type complying with the given predicate. + /// + /// + /// An action that performs assertions on the message. + /// + public Saga ExpectNotPublish(Action check) + { + return ExpectNotPublish(CheckActionToFunc(check)); + } + + /// /// Check that the saga tells the bus to handle the current message later. /// /// @@ -307,10 +397,50 @@ public Saga ExpectTimeoutToBeSetIn(Func c /// /// /// + public Saga ExpectTimeoutToBeSetIn(Action check) + { + return ExpectTimeoutToBeSetIn(CheckActionToFunc(check)); + } + + /// + /// Verifies that the saga is setting the specified timeout + /// + /// + /// + /// public Saga ExpectTimeoutToBeSetAt(Func check = null) { expectedInvocations.Add(new ExpectedDeferMessageInvocation { Check = check }); return this; } + + /// + /// Verifies that the saga is setting the specified timeout + /// + /// + /// + /// + public Saga ExpectTimeoutToBeSetAt(Action check) + { + return ExpectTimeoutToBeSetAt(CheckActionToFunc(check)); + } + + private static Func CheckActionToFunc(Action check) + { + return arg => + { + check(arg); + return true; + }; + } + + private static Func CheckActionToFunc(Action check) + { + return (arg1, arg2) => + { + check(arg1, arg2); + return true; + }; + } } } diff --git a/src/wix/WixInstaller/Fragments/AddRemove.wxs b/src/wix/WixInstaller/Fragments/AddRemove.wxs index c627ca09d83..bddafffcdfa 100644 --- a/src/wix/WixInstaller/Fragments/AddRemove.wxs +++ b/src/wix/WixInstaller/Fragments/AddRemove.wxs @@ -3,10 +3,10 @@ - - - - + + + +