- Added additional configuration settings for appfabric message Queue

- Added AsA_Listener
bfcamara · Sep 18, 2011 · 602e54e · 602e54e
1 parent e7453be
commit 602e54e
Show file tree

Hide file tree

Showing 26 changed files with 384 additions and 137 deletions.
diff --git a/Samples/Azure/AppFabricQueueFullDuplex/OrderService/EndpointConfiguration.cs b/Samples/Azure/AppFabricQueueFullDuplex/OrderService/EndpointConfiguration.cs
@@ -1,7 +1,6 @@
 using NServiceBus;
-using NServiceBus.Hosting.Azure.Roles.Handlers;
 
 namespace OrderService
 {
-    public class EndpointConfiguration : IConfigureThisEndpoint, AsA_Worker { }
+    public class EndpointConfiguration : IConfigureThisEndpoint, AsA_Listener { }
 }
diff --git a/Samples/Azure/AppFabricQueueFullDuplex/OrderWebSite/Global.asax.cs b/Samples/Azure/AppFabricQueueFullDuplex/OrderWebSite/Global.asax.cs
@@ -38,7 +38,7 @@ protected void Application_BeginRequest(object sender, EventArgs e)
                .DefaultBuilder()
                .Log4Net(new AzureAppender())
                .AzureConfigurationSource()
-               .AppFabricQueue()
+               .AppFabricMessageQueue()
                .JsonSerializer()
                .UnicastBus()
                .DoNotAutoSubscribe()

diff --git a/Samples/Azure/AppFabricQueueFullDuplex/ServiceConfiguration.cscfg b/Samples/Azure/AppFabricQueueFullDuplex/ServiceConfiguration.cscfg
@@ -4,38 +4,36 @@
     <Instances count="1" />
     <ConfigurationSettings>
       <Setting name="AppFabricQueueConfig.IssuerKey" value="yourkey" />
-      <Setting name="AppFabricQueueConfig.IssuerName" value="owner" />
       <Setting name="AppFabricQueueConfig.ServiceNamespace" value="yournamespace" />      
 
-      <Setting name="Diagnostics.Level" value="Error" />
-      <Setting name="Diagnostics.ConnectionString" value="UseDevelopmentStorage=true" />
-
       <Setting name="MessageForwardingInCaseOfFaultConfig.ErrorQueue" value="errorqueue" />
 
-      <Setting name="MsmqTransportConfig.InputQueue" value="orderwebsiteinputqueue" />
+      <Setting name="UnicastBusConfig.LocalAddress" value="orderwebsiteinputqueue" />
       <Setting name="MsmqTransportConfig.NumberOfWorkerThreads" value="1" />
       <Setting name="MsmqTransportConfig.MaxRetries" value="5" />
+
+      <Setting name="Microsoft.WindowsAzure.Plugins.Diagnostics.Level" value="Error" />
+      <Setting name="Microsoft.WindowsAzure.Plugins.Diagnostics.ConnectionString" value="UseDevelopmentStorage=true" />
+
     </ConfigurationSettings>
   </Role>
   <Role name="OrderService">
     <Instances count="1" />
     <ConfigurationSettings>
       <Setting name="AppFabricQueueConfig.IssuerKey" value="yourkey" />
-      <Setting name="AppFabricQueueConfig.IssuerName" value="owner" />
       <Setting name="AppFabricQueueConfig.ServiceNamespace" value="yournamespace" />
-
-      <Setting name="AzureSubscriptionStorageConfig.ConnectionString" value="UseDevelopmentStorage=true" />
 
       <Setting name="NServiceBus.Profile" value="NServiceBus.Development NServiceBus.OnAzureTableStorage NServiceBus.WithAppFabricQueues" />
-
-      <Setting name="Diagnostics.Level" value="Error" />
-      <Setting name="Diagnostics.ConnectionString" value="UseDevelopmentStorage=true" />
-
+
       <Setting name="MessageForwardingInCaseOfFaultConfig.ErrorQueue" value="errorqueue" />
 
-      <Setting name="MsmqTransportConfig.InputQueue" value="orderserviceinputqueue" />
+      <Setting name="UnicastBusConfig.LocalAddress" value="orderserviceinputqueue" />
       <Setting name="MsmqTransportConfig.NumberOfWorkerThreads" value="1" />
       <Setting name="MsmqTransportConfig.MaxRetries" value="5" />
+
+      <Setting name="Microsoft.WindowsAzure.Plugins.Diagnostics.Level" value="Error" />
+      <Setting name="Microsoft.WindowsAzure.Plugins.Diagnostics.ConnectionString" value="UseDevelopmentStorage=true" />
+
     </ConfigurationSettings>
   </Role>
 </ServiceConfiguration>
diff --git a/Samples/Azure/AppFabricQueueFullDuplex/ServiceDefinition.build.csdef b/Samples/Azure/AppFabricQueueFullDuplex/ServiceDefinition.build.csdef
@@ -19,14 +19,13 @@
     </Sites>
     <ConfigurationSettings>
       <Setting name="AppFabricQueueConfig.IssuerKey" />
-      <Setting name="AppFabricQueueConfig.IssuerName" />
       <Setting name="AppFabricQueueConfig.ServiceNamespace" />
-      <Setting name="Diagnostics.ConnectionString" />
-      <Setting name="Diagnostics.Level" />
       <Setting name="MessageForwardingInCaseOfFaultConfig.ErrorQueue" />
-      <Setting name="MsmqTransportConfig.InputQueue" />
+      <Setting name="UnicastBusConfig.LocalAddress" />
       <Setting name="MsmqTransportConfig.NumberOfWorkerThreads" />
       <Setting name="MsmqTransportConfig.MaxRetries" />
+      <Setting name="Microsoft.WindowsAzure.Plugins.Diagnostics.ConnectionString" />
+      <Setting name="Microsoft.WindowsAzure.Plugins.Diagnostics.Level" />
     </ConfigurationSettings>
     <Endpoints>
       <InputEndpoint name="HttpIn" protocol="http" port="80" />
@@ -35,17 +34,14 @@
   <WorkerRole name="OrderService" enableNativeCodeExecution="true">
     <ConfigurationSettings>
       <Setting name="AppFabricQueueConfig.IssuerKey" />
-      <Setting name="AppFabricQueueConfig.IssuerName" />
       <Setting name="AppFabricQueueConfig.ServiceNamespace" />
-      <Setting name="AzureSubscriptionStorageConfig.ConnectionString" />
       <Setting name="NServiceBus.Profile" />
-      <Setting name="Diagnostics.ConnectionString" />
-      <Setting name="Diagnostics.Level" />
-      <!--<Setting name="UnicastBusConfig.LocalAddress" />-->
+      <Setting name="UnicastBusConfig.LocalAddress" />
       <Setting name="MessageForwardingInCaseOfFaultConfig.ErrorQueue" />
-      <Setting name="MsmqTransportConfig.InputQueue" />
       <Setting name="MsmqTransportConfig.NumberOfWorkerThreads" />
       <Setting name="MsmqTransportConfig.MaxRetries" />
+      <Setting name="Microsoft.WindowsAzure.Plugins.Diagnostics.ConnectionString" />
+      <Setting name="Microsoft.WindowsAzure.Plugins.Diagnostics.Level" />
     </ConfigurationSettings>
   </WorkerRole>
 </ServiceDefinition>
diff --git a/Samples/Azure/AppFabricQueueFullDuplex/ServiceDefinition.csdef b/Samples/Azure/AppFabricQueueFullDuplex/ServiceDefinition.csdef
@@ -10,15 +10,15 @@
     </Sites>
     <ConfigurationSettings>
       <Setting name="AppFabricQueueConfig.IssuerKey" />
-      <Setting name="AppFabricQueueConfig.IssuerName" />
-      <Setting name="AppFabricQueueConfig.ServiceNamespace" />
-
-      <Setting name="Diagnostics.ConnectionString" />
-      <Setting name="Diagnostics.Level" />
+      <Setting name="AppFabricQueueConfig.ServiceNamespace" />      
+
       <Setting name="MessageForwardingInCaseOfFaultConfig.ErrorQueue" />
-      <Setting name="MsmqTransportConfig.InputQueue" />
+      <Setting name="UnicastBusConfig.LocalAddress" />
       <Setting name="MsmqTransportConfig.NumberOfWorkerThreads" />
       <Setting name="MsmqTransportConfig.MaxRetries" />
+
+      <Setting name="Microsoft.WindowsAzure.Plugins.Diagnostics.ConnectionString" />
+      <Setting name="Microsoft.WindowsAzure.Plugins.Diagnostics.Level" />
     </ConfigurationSettings>
     <Endpoints>
       <InputEndpoint name="HttpIn" protocol="http" port="80" />
@@ -27,19 +27,17 @@
   <WorkerRole name="OrderService" enableNativeCodeExecution="true">
     <ConfigurationSettings>
       <Setting name="AppFabricQueueConfig.IssuerKey" />
-      <Setting name="AppFabricQueueConfig.IssuerName" />
       <Setting name="AppFabricQueueConfig.ServiceNamespace" />
 
-      <Setting name="AzureSubscriptionStorageConfig.ConnectionString" />
-
       <Setting name="NServiceBus.Profile" />
-      <Setting name="Diagnostics.ConnectionString" />
-      <Setting name="Diagnostics.Level" />
-      <!--<Setting name="UnicastBusConfig.LocalAddress" />-->
+
+      <Setting name="UnicastBusConfig.LocalAddress" />
       <Setting name="MessageForwardingInCaseOfFaultConfig.ErrorQueue" />
-      <Setting name="MsmqTransportConfig.InputQueue" />
       <Setting name="MsmqTransportConfig.NumberOfWorkerThreads" />
       <Setting name="MsmqTransportConfig.MaxRetries" />
+
+      <Setting name="Microsoft.WindowsAzure.Plugins.Diagnostics.ConnectionString" />
+      <Setting name="Microsoft.WindowsAzure.Plugins.Diagnostics.Level" />
     </ConfigurationSettings>
   </WorkerRole>
 </ServiceDefinition>
diff --git a/Samples/Azure/AppFabricQueuePubSub/OrderWebSite/Global.asax.cs b/Samples/Azure/AppFabricQueuePubSub/OrderWebSite/Global.asax.cs
@@ -22,7 +22,7 @@ private static IBus ConfigureNServiceBus()
                 .DefaultBuilder()
                 .Log4Net(new AzureAppender())
                 .AzureConfigurationSource()
-                .AppFabricQueue()
+                .AppFabricMessageQueue()
                 .JsonSerializer()
                 .UnicastBus()
                 .LoadMessageHandlers()

diff --git a/Samples/Azure/AppFabricQueuePubSub/ServiceConfiguration.cscfg b/Samples/Azure/AppFabricQueuePubSub/ServiceConfiguration.cscfg
@@ -4,39 +4,39 @@
     <Instances count="1" />
     <ConfigurationSettings>
       <Setting name="AppFabricQueueConfig.IssuerKey" value="yourkey" />
-      <Setting name="AppFabricQueueConfig.IssuerName" value="owner" />
       <Setting name="AppFabricQueueConfig.ServiceNamespace" value="yournamespace" />     
-
-      <Setting name="Diagnostics.Level" value="Error" />
-      <Setting name="Diagnostics.ConnectionString" value="UseDevelopmentStorage=true" />
-
+
       <Setting name="MessageForwardingInCaseOfFaultConfig.ErrorQueue" value="errorqueue" />
 
       <Setting name="UnicastBusConfig.LocalAddress" value="orderwebsiteinputqueue" />
       <Setting name="MsmqTransportConfig.NumberOfWorkerThreads" value="1" />
       <Setting name="MsmqTransportConfig.MaxRetries" value="5" />
+
+      <Setting name="Microsoft.WindowsAzure.Plugins.Diagnostics.Level" value="Error" />
+      <Setting name="Microsoft.WindowsAzure.Plugins.Diagnostics.ConnectionString" value="UseDevelopmentStorage=true" />
+
     </ConfigurationSettings>
   </Role>
   <Role name="OrderService">
     <Instances count="1" />
     <ConfigurationSettings>
       <Setting name="AppFabricQueueConfig.IssuerKey" value="yourkey" />
-      <Setting name="AppFabricQueueConfig.IssuerName" value="owner" />
       <Setting name="AppFabricQueueConfig.ServiceNamespace" value="yournamespace" />
 
       <Setting name="NServiceBus.Profile" value="NServiceBus.Production NServiceBus.OnAzureTableStorage NServiceBus.WithAppFabricQueues" />
 
       <Setting name="AzureSubscriptionStorageConfig.ConnectionString" value="UseDevelopmentStorage=true" />
 
-      <Setting name="Diagnostics.Level" value="Error" />
-      <Setting name="Diagnostics.ConnectionString" value="UseDevelopmentStorage=true" />
-
       <Setting name="UnicastBusConfig.LocalAddress" value="orderserviceinputqueue" />
 
       <Setting name="MessageForwardingInCaseOfFaultConfig.ErrorQueue" value="errorqueue" />
 
       <Setting name="MsmqTransportConfig.NumberOfWorkerThreads" value="1" />
       <Setting name="MsmqTransportConfig.MaxRetries" value="5" />
+
+      <Setting name="Microsoft.WindowsAzure.Plugins.Diagnostics.Level" value="Error" />
+      <Setting name="Microsoft.WindowsAzure.Plugins.Diagnostics.ConnectionString" value="UseDevelopmentStorage=true" />
+
     </ConfigurationSettings>
   </Role>
 </ServiceConfiguration>
diff --git a/Samples/Azure/AppFabricQueuePubSub/ServiceDefinition.build.csdef b/Samples/Azure/AppFabricQueuePubSub/ServiceDefinition.build.csdef
@@ -19,14 +19,13 @@
     </Sites>
     <ConfigurationSettings>
       <Setting name="AppFabricQueueConfig.IssuerKey" />
-      <Setting name="AppFabricQueueConfig.IssuerName" />
       <Setting name="AppFabricQueueConfig.ServiceNamespace" />
-      <Setting name="Diagnostics.ConnectionString" />
-      <Setting name="Diagnostics.Level" />
       <Setting name="MessageForwardingInCaseOfFaultConfig.ErrorQueue" />
       <Setting name="UnicastBusConfig.LocalAddress" />
       <Setting name="MsmqTransportConfig.NumberOfWorkerThreads" />
       <Setting name="MsmqTransportConfig.MaxRetries" />
+      <Setting name="Microsoft.WindowsAzure.Plugins.Diagnostics.Level" />
+      <Setting name="Microsoft.WindowsAzure.Plugins.Diagnostics.ConnectionString" />
     </ConfigurationSettings>
     <Endpoints>
       <InputEndpoint name="HttpIn" protocol="http" port="80" />
@@ -35,16 +34,15 @@
   <WorkerRole name="OrderService" enableNativeCodeExecution="true">
     <ConfigurationSettings>
       <Setting name="AppFabricQueueConfig.IssuerKey" />
-      <Setting name="AppFabricQueueConfig.IssuerName" />
       <Setting name="AppFabricQueueConfig.ServiceNamespace" />
       <Setting name="NServiceBus.Profile" />
-      <Setting name="Diagnostics.ConnectionString" />
       <Setting name="AzureSubscriptionStorageConfig.ConnectionString" />
-      <Setting name="Diagnostics.Level" />
       <Setting name="UnicastBusConfig.LocalAddress" />
       <Setting name="MessageForwardingInCaseOfFaultConfig.ErrorQueue" />
       <Setting name="MsmqTransportConfig.NumberOfWorkerThreads" />
       <Setting name="MsmqTransportConfig.MaxRetries" />
+      <Setting name="Microsoft.WindowsAzure.Plugins.Diagnostics.Level" />
+      <Setting name="Microsoft.WindowsAzure.Plugins.Diagnostics.ConnectionString" />
     </ConfigurationSettings>
   </WorkerRole>
 </ServiceDefinition>
diff --git a/Samples/Azure/AppFabricQueuePubSub/ServiceDefinition.csdef b/Samples/Azure/AppFabricQueuePubSub/ServiceDefinition.csdef
@@ -10,14 +10,15 @@
     </Sites>
     <ConfigurationSettings>
       <Setting name="AppFabricQueueConfig.IssuerKey"/>
-      <Setting name="AppFabricQueueConfig.IssuerName"/>
       <Setting name="AppFabricQueueConfig.ServiceNamespace" />
-      <Setting name="Diagnostics.ConnectionString" />
-      <Setting name="Diagnostics.Level" />
       <Setting name="MessageForwardingInCaseOfFaultConfig.ErrorQueue" />
       <Setting name="UnicastBusConfig.LocalAddress" />
       <Setting name="MsmqTransportConfig.NumberOfWorkerThreads" />
       <Setting name="MsmqTransportConfig.MaxRetries" />
+
+      <Setting name="Microsoft.WindowsAzure.Plugins.Diagnostics.Level" />
+      <Setting name="Microsoft.WindowsAzure.Plugins.Diagnostics.ConnectionString" />
+
     </ConfigurationSettings>
     <Endpoints>
       <InputEndpoint name="HttpIn" protocol="http" port="80" />
@@ -26,16 +27,16 @@
   <WorkerRole name="OrderService" enableNativeCodeExecution="true">
     <ConfigurationSettings>
       <Setting name="AppFabricQueueConfig.IssuerKey"/>
-      <Setting name="AppFabricQueueConfig.IssuerName"/>
       <Setting name="AppFabricQueueConfig.ServiceNamespace" />
       <Setting name="NServiceBus.Profile" />
-      <Setting name="Diagnostics.ConnectionString" />
       <Setting name="AzureSubscriptionStorageConfig.ConnectionString" />
-      <Setting name="Diagnostics.Level" />
       <Setting name="UnicastBusConfig.LocalAddress" />
       <Setting name="MessageForwardingInCaseOfFaultConfig.ErrorQueue" />
       <Setting name="MsmqTransportConfig.NumberOfWorkerThreads" />
       <Setting name="MsmqTransportConfig.MaxRetries" />
+
+      <Setting name="Microsoft.WindowsAzure.Plugins.Diagnostics.Level" />
+      <Setting name="Microsoft.WindowsAzure.Plugins.Diagnostics.ConnectionString" />
     </ConfigurationSettings>
   </WorkerRole>
 </ServiceDefinition>
diff --git a/src/azure/Hosting/NServiceBus.Hosting.Azure/NServiceBus.Hosting.Azure.csproj b/src/azure/Hosting/NServiceBus.Hosting.Azure/NServiceBus.Hosting.Azure.csproj
@@ -121,10 +121,10 @@
     <Compile Include="Profiles\Handler\ProductionProfileHandler.cs" />
     <Compile Include="Profiles\Production.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Roles\AsA_Client.cs" />
+    <Compile Include="Roles\AsA_Listener.cs" />
     <Compile Include="Roles\AsA_Host.cs" />
     <Compile Include="Roles\AsA_Worker.cs" />
-    <Compile Include="Roles\Handlers\ClientRoleHandler.cs" />
+    <Compile Include="Roles\Handlers\ListenerRoleHandler.cs" />
     <Compile Include="IsHostedIn.cs" />
     <Compile Include="Roles\Handlers\WorkerRoleHandler.cs" />
   </ItemGroup>

diff --git a/src/azure/Hosting/NServiceBus.Hosting.Azure/Profiles/Handler/OnAzureStorageProfileHandler.cs b/src/azure/Hosting/NServiceBus.Hosting.Azure/Profiles/Handler/OnAzureStorageProfileHandler.cs
@@ -2,14 +2,19 @@
 
 namespace NServiceBus.Hosting.Azure.Profiles.Handlers
 {
-    internal class OnAzureTableStorageProfileHandler : IHandleProfile<OnAzureTableStorage>
+    internal class OnAzureTableStorageProfileHandler : IHandleProfile<OnAzureTableStorage>, IWantTheEndpointConfig
     {
         void IHandleProfile.ProfileActivated()
         {
-            Configure.Instance
-                .AzureSubcriptionStorage()
-                .Sagas().AzureSagaPersister().NHibernateUnitOfWork();
+            if (Config is AsA_Worker)
+            {
+                Configure.Instance
+                    .AzureSubcriptionStorage()
+                    .AzureSagaPersister().NHibernateUnitOfWork();
+            }
 
         }
+
+        public IConfigureThisEndpoint Config { get; set; }
     }
 }
diff --git a/src/azure/Hosting/NServiceBus.Hosting.Azure/Profiles/Handler/OnSqlAzureProfileHandler.cs b/src/azure/Hosting/NServiceBus.Hosting.Azure/Profiles/Handler/OnSqlAzureProfileHandler.cs
@@ -2,14 +2,19 @@
 
 namespace NServiceBus.Hosting.Azure.Profiles.Handlers
 {
-    internal class OnSqlAzureProfileHandler : IHandleProfile<OnSqlAzure>
+    internal class OnSqlAzureProfileHandler : IHandleProfile<OnSqlAzure>, IWantTheEndpointConfig
     {
         void IHandleProfile.ProfileActivated()
         {
-            Configure.Instance
-                .DBSubcriptionStorage()
-                .Sagas().NHibernateSagaPersister().NHibernateUnitOfWork();
+            if (Config is AsA_Worker)
+            {
+                Configure.Instance
+                    .DBSubcriptionStorage()
+                    .Sagas().NHibernateSagaPersister().NHibernateUnitOfWork();
+            }
 
         }
+
+        public IConfigureThisEndpoint Config { get; set; }
     }
 }
diff --git a/...e/Hosting/NServiceBus.Hosting.Azure/Profiles/Handler/WithAppFabricQueuesProfileHandler.cs b/...e/Hosting/NServiceBus.Hosting.Azure/Profiles/Handler/WithAppFabricQueuesProfileHandler.cs
@@ -7,7 +7,7 @@ internal class WithAppFabricQueuesProfileHandler : IHandleProfile<WithAppFabricQ
         void IHandleProfile.ProfileActivated()
         {
             Configure.Instance
-                .AppFabricQueue();
+                .AppFabricMessageQueue();
 
         }
     }

diff --git a/...viceBus.Hosting.Azure/Roles/AsA_Client.cs → ...ceBus.Hosting.Azure/Roles/AsA_Listener.cs b/...viceBus.Hosting.Azure/Roles/AsA_Client.cs → ...ceBus.Hosting.Azure/Roles/AsA_Listener.cs
@@ -3,7 +3,7 @@
 namespace NServiceBus
 {
     /// <summary>
-    /// Indicates this endpoint is a client.
+    /// Indicates this endpoint is a listener.
     /// </summary>
-    public interface AsA_Client : IRole { }
+    public interface AsA_Listener : IRole { }
 }