Added QueuePerInstance support

Samples/AzureFullDuplex/OrderWebSite/Global.asax.cs

@@ -37,10 +37,11 @@ protected void Application_BeginRequest(object sender, EventArgs e)
                   .Log4Net(new AzureAppender())
                   .AzureConfigurationSource()
                   .AzureMessageQueue()
-                  .JsonSerializer()
+                    .JsonSerializer()
+                    .QueuePerInstance()
                   .UnicastBus()
-                  .LoadMessageHandlers()
-                  .IsTransactional(true)
+                      .LoadMessageHandlers()
+                      .IsTransactional(true)
                   .CreateBus();
 
            Bus = StartBus.Value; 

Samples/AzurePubSub/OrderWebSite/Global.asax.cs

@@ -36,12 +36,12 @@ protected void Application_Start(object sender, EventArgs e)
     			//.Log4Net(new AzureAppender())
     			.AzureConfigurationSource()
     			.AzureMessageQueue()
-    			.JsonSerializer()
+    			    .JsonSerializer()
+                    .QueuePerInstance()
     			.UnicastBus()
-    			.LoadMessageHandlers()
-    			.IsTransactional(true)
-				.CreateBus()
-				;
+    			    .LoadMessageHandlers()
+    			    .IsTransactional(true)
+				.CreateBus();
 		}
 
 		protected void Application_BeginRequest(object sender, EventArgs e)

Samples/AzureThumbnailCreator/WebSite/Global.asax.cs

@@ -32,6 +32,7 @@ protected void Application_BeginRequest(object sender, EventArgs e)
                   .AzureConfigurationSource()
                   .AzureMessageQueue()
                     .JsonSerializer()
+                    .QueuePerInstance()
                   .AzureDataBus()
                   .UnicastBus()
                     .LoadMessageHandlers()

src/azure/Queueing/NServiceBus.Unicast.Queuing.Azure.Config/AzureQueueConfig.cs

@@ -82,5 +82,18 @@ public int BatchSize
                 this["BatchSize"] = value;
             }
         }
+
+        [ConfigurationProperty("QueuePerInstance", IsRequired = false, DefaultValue = AzureMessageQueue.DefaultQueuePerInstance)]
+        public bool QueuePerInstance
+        {
+            get
+            {
+                return (bool)this["QueuePerInstance"];
+            }
+            set
+            {
+                this["QueuePerInstance"] = value;
+            }
+        }
    }
 }

src/azure/Queueing/NServiceBus.Unicast.Queuing.Azure.Config/ConfigureAzureMessageQueue.cs

@@ -20,6 +20,9 @@ public static Configure AzureMessageQueue(this Configure config)
             {
                 queueClient = CloudStorageAccount.Parse(configSection.ConnectionString).CreateCloudQueueClient();
                 Address.OverrideDefaultMachine(configSection.ConnectionString);
+
+                if (configSection.QueuePerInstance)
+                    Configure.Instance.CustomConfigurationSource(new IndividualQueueConfigurationSource(Configure.ConfigurationSource));
             }
             else
             {
@@ -109,5 +112,18 @@ public static Configure BatchSize(this Configure config, int value)
 
             return config;
         }
+
+        /// <summary>
+        /// Configures a queue per instance
+        /// </summary>
+        /// <param name="config"></param>
+        /// <returns></returns>
+        public static Configure QueuePerInstance(this Configure config)
+        {
+            if(! (Configure.ConfigurationSource is IndividualQueueConfigurationSource))
+                Configure.Instance.CustomConfigurationSource(new IndividualQueueConfigurationSource(Configure.ConfigurationSource));
+
+            return config;
+        }
     }
 }

src/azure/Queueing/NServiceBus.Unicast.Queuing.Azure.Config/IndividualQueueConfigurationSource.cs

@@ -0,0 +1,68 @@
+using Microsoft.WindowsAzure.ServiceRuntime;
+using NServiceBus.Config.ConfigurationSource;
+
+namespace NServiceBus.Config
+{
+    public class IndividualQueueConfigurationSource : IConfigurationSource
+    {
+        private readonly IConfigurationSource innerSource;
+
+        public IndividualQueueConfigurationSource(IConfigurationSource innerSource)
+        {
+            this.innerSource = innerSource;
+        }
+
+        T IConfigurationSource.GetConfiguration<T>()
+        {
+            var config = innerSource.GetConfiguration<T>();
+
+            var unicastBusConfig = config as UnicastBusConfig;
+            if (unicastBusConfig != null && unicastBusConfig.LocalAddress != null && RoleEnvironment.IsAvailable)
+            {
+                var individualQueueName = ParseQueueNameFrom(unicastBusConfig.LocalAddress)
+                                          + "-"
+                                          + ParseIndexFrom(RoleEnvironment.CurrentRoleInstance.Id);
+                if (unicastBusConfig.LocalAddress.Contains("@"))
+                    individualQueueName += "@" + ParseMachineNameFrom(unicastBusConfig.LocalAddress);
+
+                unicastBusConfig.LocalAddress = individualQueueName;
+            }
+
+            var msmqTransportConfig = config as MsmqTransportConfig;
+            if (msmqTransportConfig != null && msmqTransportConfig.InputQueue != null && RoleEnvironment.IsAvailable)
+            {
+                var individualQueueName = ParseQueueNameFrom(msmqTransportConfig.InputQueue)
+                                          + "-"
+                                          + ParseIndexFrom(RoleEnvironment.CurrentRoleInstance.Id);
+                if (msmqTransportConfig.InputQueue.Contains("@"))
+                    individualQueueName += "@" + ParseMachineNameFrom(msmqTransportConfig.InputQueue);
+
+                msmqTransportConfig.InputQueue = individualQueueName;
+            }
+
+            return config;
+        }
+
+        private string ParseMachineNameFrom(string inputQueue)
+        {
+            return inputQueue.Contains("@") ? inputQueue.Substring(inputQueue.IndexOf("@") + 1) : string.Empty;
+        }
+
+        private object ParseQueueNameFrom(string inputQueue)
+        {
+            return inputQueue.Contains("@") ? inputQueue.Substring(0, inputQueue.IndexOf("@")) : inputQueue;
+        }
+
+        private static int ParseIndexFrom(string id)
+        {
+            var idArray = id.Split('.');
+            int index;
+            if (!int.TryParse((idArray[idArray.Length - 1]), out index))
+            {
+                idArray = id.Split('_');
+                index = int.Parse((idArray[idArray.Length - 1]));
+            }
+            return index;
+        }
+    }
+}

src/azure/Queueing/NServiceBus.Unicast.Queuing.Azure.Config/NServiceBus.Unicast.Queuing.Azure.Config.csproj

@@ -32,6 +32,7 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Microsoft.CSharp" />
     <Reference Include="Microsoft.WindowsAzure.ServiceRuntime, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\lib\Azure\Microsoft.WindowsAzure.ServiceRuntime.dll</HintPath>
@@ -59,6 +60,7 @@
     </Compile>
     <Compile Include="AzureQueueConfig.cs" />
     <Compile Include="ConfigureAzureMessageQueue.cs" />
+    <Compile Include="IndividualQueueConfigurationSource.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>

src/azure/Queueing/NServiceBus.Unicast.Queuing.Azure/AzureMessageQueue.cs

@@ -20,6 +20,7 @@ public class AzureMessageQueue : IReceiveMessages,ISendMessages
         public const int DefaultBatchSize = 10;
         public const bool DefaultPurgeOnStartup = false;
         public const string DefaultConnectionString = "UseDevelopmentStorage=true";
+        public const bool DefaultQueuePerInstance = false;
 
         private CloudQueue queue;
         private readonly CloudQueueClient client;