From 5c1a65072e3de35357a42ca275678c1ed1d73f05 Mon Sep 17 00:00:00 2001
From: andreasohlund <andreas_ohlund@hotmail.com>
Date: Mon, 26 Sep 2011 11:08:49 +0200
Subject: [PATCH] Moved the pub/sub sample to the new 3.0 configuration model

---
 Samples/PubSub/MyPublisher/App.config         |  16 ++++------------
 Samples/PubSub/PubSub.suo                     | Bin 153088 -> 163840 bytes
 Samples/PubSub/Subscriber1/App.config         |  11 ++++-------
 Samples/PubSub/Subscriber1/ConfigOverride.cs  |  17 +++++++++++++++++
 Samples/PubSub/Subscriber1/EndpointConfig.cs  |  17 -----------------
 Samples/PubSub/Subscriber1/Subscriber1.csproj |   1 +
 Samples/PubSub/Subscriber2/App.config         |  14 +++++---------
 Samples/PubSub/Subscriber2/Subscriber2.csproj |   4 +++-
 8 files changed, 34 insertions(+), 46 deletions(-)
 create mode 100644 Samples/PubSub/Subscriber1/ConfigOverride.cs

diff --git a/Samples/PubSub/MyPublisher/App.config b/Samples/PubSub/MyPublisher/App.config
index 47e20752f51..ca38c46ef79 100644
--- a/Samples/PubSub/MyPublisher/App.config
+++ b/Samples/PubSub/MyPublisher/App.config
@@ -3,6 +3,7 @@
   <configSections>
     <section name="MsmqTransportConfig" type="NServiceBus.Config.MsmqTransportConfig, NServiceBus.Core" />
     <section name="UnicastBusConfig" type="NServiceBus.Config.UnicastBusConfig, NServiceBus.Core" />
+    <section name="MessageForwardingInCaseOfFaultConfig" type="NServiceBus.Config.MessageForwardingInCaseOfFaultConfig, NServiceBus.Core" />
   </configSections>
 
   
@@ -10,19 +11,10 @@
        input queue must be on the same machine as the process feeding off of it.
        error queue can (and often should) be on a different machine.
   -->
+  <MsmqTransportConfig NumberOfWorkerThreads="1" MaxRetries="5" />
+  <MessageForwardingInCaseOfFaultConfig ErrorQueue="error"/>
 
-  <MsmqTransportConfig
-    InputQueue="MyPublisherInputQueue"
-    ErrorQueue="error"
-    NumberOfWorkerThreads="1"
-    MaxRetries="5"
-  />
-
-  <UnicastBusConfig
-    DistributorControlAddress=""
-    DistributorDataAddress=""
-    ForwardReceivedMessagesTo="">
-
+  <UnicastBusConfig LocalAddress="MyPublisherInputQueue">
     <MessageEndpointMappings>
       <!-- publishers don't need to set this for their own message types -->
       <!--<add Messages="Messages" Endpoint="messagebus" />-->
diff --git a/Samples/PubSub/PubSub.suo b/Samples/PubSub/PubSub.suo
index ec782fec3afa940e34593c8829003129bf5d30ea..ee8703eaa4f40e93a842bf9365c8f59d4e299d62 100644
GIT binary patch
delta 4356
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
I63?3d3q?z?Qvd(}

delta 3697
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
Zs4zKFAlFP658#Pq_oPz%#Txg{zX4YIP#6FJ

diff --git a/Samples/PubSub/Subscriber1/App.config b/Samples/PubSub/Subscriber1/App.config
index eabee194bbb..1d1ebc9c000 100644
--- a/Samples/PubSub/Subscriber1/App.config
+++ b/Samples/PubSub/Subscriber1/App.config
@@ -13,15 +13,12 @@
   <!-- 
   This configuration section has been provided in code by implementing 
   IProvideConfiguration<MsmqTransportConfig>
+  <MessageForwardingInCaseOfFaultConfig ErrorQueue="error"/>
   -->
-  <MsmqTransportConfig
-    
-    ErrorQueue="error"
-    NumberOfWorkerThreads="1"
-    MaxRetries="5"
-  />
+  <MsmqTransportConfig NumberOfWorkerThreads="1" MaxRetries="5" />
 
-  <UnicastBusConfig>
+
+  <UnicastBusConfig LocalAddress="Subscriber1InputQueue">
     <MessageEndpointMappings>
       <add Messages="MyMessages" Endpoint="MyPublisherInputQueue" />
     </MessageEndpointMappings>
diff --git a/Samples/PubSub/Subscriber1/ConfigOverride.cs b/Samples/PubSub/Subscriber1/ConfigOverride.cs
new file mode 100644
index 00000000000..c55d26841d0
--- /dev/null
+++ b/Samples/PubSub/Subscriber1/ConfigOverride.cs
@@ -0,0 +1,17 @@
+namespace Subscriber1
+{
+    using NServiceBus.Config;
+    using NServiceBus.Config.ConfigurationSource;
+
+    //demonstrate how to override specific configuration sections
+    class ConfigOverride : IProvideConfiguration<MessageForwardingInCaseOfFaultConfig>
+    {
+        public MessageForwardingInCaseOfFaultConfig GetConfiguration()
+        {
+            return new MessageForwardingInCaseOfFaultConfig
+                       {
+                           ErrorQueue = "error"
+                       };
+        }
+    }
+}
\ No newline at end of file
diff --git a/Samples/PubSub/Subscriber1/EndpointConfig.cs b/Samples/PubSub/Subscriber1/EndpointConfig.cs
index 165b8f92086..6e9783242eb 100644
--- a/Samples/PubSub/Subscriber1/EndpointConfig.cs
+++ b/Samples/PubSub/Subscriber1/EndpointConfig.cs
@@ -1,23 +1,6 @@
 using NServiceBus;
-using NServiceBus.Config;
-using NServiceBus.Config.ConfigurationSource;
 
 namespace Subscriber1
 {
     class EndpointConfig : IConfigureThisEndpoint, AsA_Server {}
-
-    //demonstrate how to override specific configuration sections
-    class D : IProvideConfiguration<MsmqTransportConfig>
-    {
-        public MsmqTransportConfig GetConfiguration()
-        {
-            return new MsmqTransportConfig
-                       {
-                           ErrorQueue = "error",
-                           InputQueue = "Subscriber1InputQueue",
-                           MaxRetries = 5,
-                           NumberOfWorkerThreads = 1
-                       };
-        }
-    }
 }
\ No newline at end of file
diff --git a/Samples/PubSub/Subscriber1/Subscriber1.csproj b/Samples/PubSub/Subscriber1/Subscriber1.csproj
index 8f82d64b90b..3ab75b2a70e 100644
--- a/Samples/PubSub/Subscriber1/Subscriber1.csproj
+++ b/Samples/PubSub/Subscriber1/Subscriber1.csproj
@@ -79,6 +79,7 @@
     <Compile Include="EndpointConfig.cs" />
     <Compile Include="EventMessageHandler.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="ConfigOverride.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
diff --git a/Samples/PubSub/Subscriber2/App.config b/Samples/PubSub/Subscriber2/App.config
index 0184370cf18..73cc48efc46 100644
--- a/Samples/PubSub/Subscriber2/App.config
+++ b/Samples/PubSub/Subscriber2/App.config
@@ -3,21 +3,17 @@
   <configSections>
     <section name="MsmqTransportConfig" type="NServiceBus.Config.MsmqTransportConfig, NServiceBus.Core" />
     <section name="UnicastBusConfig" type="NServiceBus.Config.UnicastBusConfig, NServiceBus.Core" />
+    <section name="MessageForwardingInCaseOfFaultConfig" type="NServiceBus.Config.MessageForwardingInCaseOfFaultConfig, NServiceBus.Core" />
   </configSections>
 
   <!-- in order to configure remote endpoints use the format: "queue@machine" 
        input queue must be on the same machine as the process feeding off of it.
        error queue can (and often should) be on a different machine.
   -->
-
-  <MsmqTransportConfig
-    InputQueue="Subscriber2InputQueue"
-    ErrorQueue="error"
-    NumberOfWorkerThreads="1"
-    MaxRetries="5"
-  />
-
-  <UnicastBusConfig>
+  <MsmqTransportConfig NumberOfWorkerThreads="1" MaxRetries="5" />
+  <MessageForwardingInCaseOfFaultConfig ErrorQueue="error"/>
+  
+  <UnicastBusConfig LocalAddress="Subscriber2InputQueue">
     <MessageEndpointMappings>
       <add Messages="MyMessages" Endpoint="MyPublisherInputQueue" />
     </MessageEndpointMappings>
diff --git a/Samples/PubSub/Subscriber2/Subscriber2.csproj b/Samples/PubSub/Subscriber2/Subscriber2.csproj
index 6e70c67efd1..35fe8f790d0 100644
--- a/Samples/PubSub/Subscriber2/Subscriber2.csproj
+++ b/Samples/PubSub/Subscriber2/Subscriber2.csproj
@@ -93,7 +93,9 @@
     <Compile Include="Subscriber2Endpoint.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="App.config" />
+    <None Include="App.config">
+      <SubType>Designer</SubType>
+    </None>
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>