Moved the pub/sub sample to the new 3.0 configuration model

bfcamara · Sep 26, 2011 · 5c1a650 · 5c1a650
1 parent ce986eb
commit 5c1a650
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 46 deletions.
diff --git a/Samples/PubSub/MyPublisher/App.config b/Samples/PubSub/MyPublisher/App.config
@@ -3,26 +3,18 @@
   <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 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
diff --git 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
@@ -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"
+                       };
+        }
+    }
+}
diff --git 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
-                       };
-        }
-    }
 }
diff --git 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
@@ -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
@@ -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>