Renaming Windows Azure to Microsoft Azure

This commit is contained in:
Sebastien Ros
2014-04-01 17:10:25 -07:00
parent 4434e55837
commit a7c2bab4e8
22 changed files with 51 additions and 51 deletions

View File

@@ -119,7 +119,7 @@ namespace Orchard.Azure.MediaServices.Controllers {
}
public ActionResult Delete(int id) {
if (!_authorizer.Authorize(Permissions.ManageCloudMediaContent, T("You are not authorized to manage Windows Azure Media content.")))
if (!_authorizer.Authorize(Permissions.ManageCloudMediaContent, T("You are not authorized to manage Microsoft Azure Media content.")))
return new HttpUnauthorizedResult();
Logger.Debug("User requested to delete asset with ID {0}.", id);
@@ -154,7 +154,7 @@ namespace Orchard.Azure.MediaServices.Controllers {
}
private ActionResult Validate(int id, Func<Asset, ActionResult> validationSucceeded) {
if (!_authorizer.Authorize(Permissions.ManageCloudMediaContent, T("You are not authorized to manage Windows Azure Media content.")))
if (!_authorizer.Authorize(Permissions.ManageCloudMediaContent, T("You are not authorized to manage Microsoft Azure Media content.")))
return new HttpUnauthorizedResult();
var asset = _assetManager.GetAssetById(id);

View File

@@ -90,7 +90,7 @@ namespace Orchard.Azure.MediaServices.Controllers {
[HttpPost]
public ActionResult Upload() {
if (!_authorizer.Authorize(Permissions.ManageCloudMediaContent, T("You are not authorized to manage Windows Azure Media content.")))
if (!_authorizer.Authorize(Permissions.ManageCloudMediaContent, T("You are not authorized to manage Microsoft Azure Media content.")))
return new HttpUnauthorizedResult();
if (HttpContext.Request.Files.Count < 1)
@@ -109,7 +109,7 @@ namespace Orchard.Azure.MediaServices.Controllers {
}
private ActionResult EditImplementation(IContent content, string folderPath) {
if (!_authorizer.Authorize(Permissions.ManageCloudMediaContent, T("You are not authorized to manage Windows Azure Media content.")))
if (!_authorizer.Authorize(Permissions.ManageCloudMediaContent, T("You are not authorized to manage Microsoft Azure Media content.")))
return new HttpUnauthorizedResult();
var editorShape = _contentManager.BuildEditor(content);
@@ -118,7 +118,7 @@ namespace Orchard.Azure.MediaServices.Controllers {
}
private ActionResult UpdateImplementation(CloudVideoPart part, string folderPath, LocalizedString notification, bool publish) {
if (!_authorizer.Authorize(Permissions.ManageCloudMediaContent, T("You are not authorized to manage Windows Azure Media content.")))
if (!_authorizer.Authorize(Permissions.ManageCloudMediaContent, T("You are not authorized to manage Microsoft Azure Media content.")))
return new HttpUnauthorizedResult();
Logger.Debug("User requested to save cloud video item with ID {0}.", part.Id);

View File

@@ -36,7 +36,7 @@ namespace Orchard.Azure.MediaServices.Controllers {
public ILogger Logger { get; set; }
public ActionResult Index() {
if (!_services.Authorizer.Authorize(Permissions.ManageCloudMediaSettings, T("You are not authorized to manage Windows Azure Media settings.")))
if (!_services.Authorizer.Authorize(Permissions.ManageCloudMediaSettings, T("You are not authorized to manage Microsoft Azure Media settings.")))
return new HttpUnauthorizedResult();
var settings = _services.WorkContext.CurrentSite.As<CloudMediaSettingsPart>();
@@ -67,7 +67,7 @@ namespace Orchard.Azure.MediaServices.Controllers {
[HttpPost]
public ActionResult Save(SettingsViewModel viewModel) {
if (!_services.Authorizer.Authorize(Permissions.ManageCloudMediaSettings, T("You are not authorized to manage Windows Azure Media settings.")))
if (!_services.Authorizer.Authorize(Permissions.ManageCloudMediaSettings, T("You are not authorized to manage Microsoft Azure Media settings.")))
return new HttpUnauthorizedResult();
if (!ModelState.IsValid) {
@@ -150,7 +150,7 @@ namespace Orchard.Azure.MediaServices.Controllers {
[HttpPost]
public ActionResult TestCredentials(SettingsViewModel viewModel) {
if (!_services.Authorizer.Authorize(Permissions.ManageCloudMediaSettings, T("You are not authorized to manage Windows Azure Media settings.")))
if (!_services.Authorizer.Authorize(Permissions.ManageCloudMediaSettings, T("You are not authorized to manage Microsoft Azure Media settings.")))
return new HttpUnauthorizedResult();
Logger.Debug("User requested to verify WAMS account credentials.");
@@ -171,7 +171,7 @@ namespace Orchard.Azure.MediaServices.Controllers {
var ctx = new CloudMediaContext(wamsAccountName, wamsAccountKey);
if (!String.IsNullOrWhiteSpace(storageAccountKey)) {
// This will trigger an authentication call to Windows Azure Storage.
// This will trigger an authentication call to Microsoft Azure Storage.
var storageAccount = new CloudStorageAccount(new StorageCredentials(ctx.DefaultStorageAccount.Name, storageAccountKey), false);
storageAccount.CreateCloudBlobClient().GetServiceProperties();
Logger.Information("Storage account credentials were verified.");

View File

@@ -37,7 +37,7 @@ namespace Orchard.Azure.MediaServices.Handlers {
private void DeferOrPublishAssets(PublishContentContext context, CloudVideoPart part) {
if (part.MezzanineAsset != null && part.MezzanineAsset.UploadState.Status != AssetUploadStatus.Uploaded) {
part.PublishOnUpload = true;
_notifier.Warning(T("The cloud video item was saved, but will not be published until the primary video asset has finished uploading to Windows Azure Media Services."));
_notifier.Warning(T("The cloud video item was saved, but will not be published until the primary video asset has finished uploading to Microsoft Azure Media Services."));
context.Cancel = true;
}
else

View File

@@ -62,7 +62,7 @@ namespace Orchard.Azure.MediaServices {
ContentDefinitionManager.AlterPartDefinition("CloudVideoPart", part => part
.Attachable(false)
.WithDescription("Stores information about a cloud video item and its related assets and jobs in Windows Azure Media Services."));
.WithDescription("Stores information about a cloud video item and its related assets and jobs in Microsoft Azure Media Services."));
ContentDefinitionManager.AlterTypeDefinition("CloudVideo", type => type
.WithPart("CommonPart")

View File

@@ -1,13 +1,13 @@
Name: Windows Azure Media Services
Name: Microsoft Azure Media Services
AntiForgery: enabled
Author: Microsoft Open Technologies, Inc
Website: http://msopentech.com
Version: 1.8
OrchardVersion: 1.8
Description: Provides integration of Windows Azure Media Services functionality into Orchard.
Description: Provides integration of Microsoft Azure Media Services functionality into Orchard.
Features:
Orchard.Azure.MediaServices:
Name: Windows Azure Media Services
Description: Provides integration of Windows Azure Media Services functionality into Orchard.
Name: Microsoft Azure Media Services
Description: Provides integration of Microsoft Azure Media Services functionality into Orchard.
Category: Hosting
Dependencies: Orchard.MediaLibrary, Orchard.PublishLater, Orchard.TaskLease

View File

@@ -10,12 +10,12 @@ namespace Orchard.Azure.MediaServices.Navigation {
public void GetNavigation(NavigationBuilder builder) {
builder
.Add(T("Media"), "6", menu => menu
.Add(T("Windows Azure Media Jobs"), "10.0", item => item.Action("Index", "Job", new { area = "Orchard.Azure.MediaServices" })
.Add(T("Microsoft Azure Media Jobs"), "10.0", item => item.Action("Index", "Job", new { area = "Orchard.Azure.MediaServices" })
.Permission(Permissions.ManageCloudMediaJobs)));
builder
.Add(T("Settings"), menu => menu
.Add(T("Windows Azure Media"), "10.0", item => item.Action("Index", "Settings", new { area = "Orchard.Azure.MediaServices" })
.Add(T("Microsoft Azure Media"), "10.0", item => item.Action("Index", "Settings", new { area = "Orchard.Azure.MediaServices" })
.Permission(StandardPermissions.SiteOwner)
.Permission(Permissions.ManageCloudMediaSettings)
));

View File

@@ -6,7 +6,7 @@ namespace Orchard.Azure.MediaServices.Navigation {
public string MenuName { get { return "mediaproviders"; } }
public void GetNavigation(NavigationBuilder builder) {
builder.AddImageSet("cloudmedia").Add(T("Windows Azure Media"), "5",
builder.AddImageSet("cloudmedia").Add(T("Microsoft Azure Media"), "5",
menu => menu.Action("Import", "Media", new { area = "Orchard.Azure.MediaServices" }).Permission(Permissions.ManageCloudMediaContent));
}
}

View File

@@ -5,9 +5,9 @@ using Orchard.Security.Permissions;
namespace Orchard.Azure.MediaServices {
public class Permissions : IPermissionProvider {
public static readonly Permission ManageCloudMediaContent = new Permission { Description = "Managing Windows Azure Media", Name = "ManageCloudMediaContent" };
public static readonly Permission ManageCloudMediaJobs = new Permission { Description = "Managing Windows Azure Media Jobs", Name = "ManageCloudMediaJobs" };
public static readonly Permission ManageCloudMediaSettings = new Permission { Description = "Managing Windows Azure Media Settings", Name = "ManageCloudMediaSettings" };
public static readonly Permission ManageCloudMediaContent = new Permission { Description = "Managing Microsoft Azure Media", Name = "ManageCloudMediaContent" };
public static readonly Permission ManageCloudMediaJobs = new Permission { Description = "Managing Microsoft Azure Media Jobs", Name = "ManageCloudMediaJobs" };
public static readonly Permission ManageCloudMediaSettings = new Permission { Description = "Managing Microsoft Azure Media Settings", Name = "ManageCloudMediaSettings" };
public virtual Feature Feature { get; set; }

View File

@@ -5,8 +5,8 @@ CONFIGURING ORCHARD FOR THE MODULE
1. Increase the maximum request content length for Orchard
----------------------------------------------------------
The module provides two ways of uploading media files to Windows Azure Media Services (WAMS):
* Direct CORS-based upload to Windows Azure Blob Storage. This is used by default if the browser supports CORS.
The module provides two ways of uploading media files to Microsoft Azure Media Services (WAMS):
* Direct CORS-based upload to Microsoft Azure Blob Storage. This is used by default if the browser supports CORS.
* Proxied upload where files are first uploaded to Orchard where they are kept in local file system storage temporarily, before being ingested into WAMS by a server-side background process. This is used as a fallback for browsers that don't support CORS.
When using proxied upload, IIS places limits on the maximum allowed upload file sizes. By default, Orchard is configured in its Web.config to allow file uploads of up to 64 MB. If the module will be used to ingest media files larger than 64 MB these values need to be increased, or the first upload step (from the user's/editor's local machine to Orchard temporary storage) will fail.
@@ -38,9 +38,9 @@ CONFIGURING THE MODULE
1. Configuring the WAMS account credentials
-------------------------------------------
After the module is installed and the feature "Windows Azure Media Services" is enabled, the WAMS account credentials must be configured in the "Windows Azure Media" settings section in the Orchard administration dashboard. This information can be obtained from the Windows Azure management portal.
After the module is installed and the feature "Microsoft Azure Media Services" is enabled, the WAMS account credentials must be configured in the "Windows Azure Media" settings section in the Orchard administration dashboard. This information can be obtained from the Windows Azure management portal.
2. Configuring the Windows Azure Storage account credentials
2. Configuring the Microsoft Azure Storage account credentials
------------------------------------------------------------
To use the direct CORS-based upload a CORS rule must be added to the Windows Azure Storage account used by the configured WAMS instance. The module can do this automatically, but it needs the Windows Azure Storage account credentials. Specify the account key for the underlying Windows Azure Storage account used by your Windows Azure Media Services instance if you want to automatically enable CORS support with the appropriate origin URLs for the Orchard site. CORS rules will be added to the storage account for both the configured base URL of the site, and the URL on which you are accessing the site when saving the credentials. If you leave this field blank you will have to manually enable the appropriate CORS support for your Windows Azure Storage account using PowerShell.
To use the direct CORS-based upload a CORS rule must be added to the Microsoft Azure Storage account used by the configured WAMS instance. The module can do this automatically, but it needs the Windows Azure Storage account credentials. Specify the account key for the underlying Windows Azure Storage account used by your Windows Azure Media Services instance if you want to automatically enable CORS support with the appropriate origin URLs for the Orchard site. CORS rules will be added to the storage account for both the configured base URL of the site, and the URL on which you are accessing the site when saving the credentials. If you leave this field blank you will have to manually enable the appropriate CORS support for your Windows Azure Storage account using PowerShell.

View File

@@ -1,8 +1,8 @@
namespace Orchard.Azure.MediaServices.Services.Wams {
public class MediaProcessorName {
public static readonly MediaProcessorName WindowsAzureMediaEncoder = new MediaProcessorName("Windows Azure Media Encoder");
public static readonly MediaProcessorName WindowsAzureMediaPackager = new MediaProcessorName("Windows Azure Media Packager");
public static readonly MediaProcessorName WindowsAzureMediaEncryptor = new MediaProcessorName("Windows Azure Media Encryptor");
public static readonly MediaProcessorName WindowsAzureMediaEncoder = new MediaProcessorName("Microsoft Azure Media Encoder");
public static readonly MediaProcessorName WindowsAzureMediaPackager = new MediaProcessorName("Microsoft Azure Media Packager");
public static readonly MediaProcessorName WindowsAzureMediaEncryptor = new MediaProcessorName("Microsoft Azure Media Encryptor");
public static readonly MediaProcessorName StorageDecryption = new MediaProcessorName("Storage Decryption");
private MediaProcessorName(string name) {

View File

@@ -26,7 +26,7 @@ namespace Orchard.Azure.MediaServices.Services.Wams {
if (settings == null || !settings.IsValid()) {
var url = _urlHelper.Action("Index", "Settings", new {area = "Orchard.Azure.MediaServices"});
yield return new NotifyEntry { Message = T("The <a href=\"{0}\">Windows Azure Media settings</a> are either missing or invalid and need to be configured.", url), Type = NotifyType.Warning };
yield return new NotifyEntry { Message = T("The <a href=\"{0}\">Microsoft Azure Media settings</a> are either missing or invalid and need to be configured.", url), Type = NotifyType.Warning };
}
}
}

View File

@@ -7,7 +7,7 @@
}
<p class="hint">
For information about which encoding presets are supported by Windows Azure Media Services please see <a href="http://msdn.microsoft.com/en-us/library/windowsazure/jj129582.aspx">http://msdn.microsoft.com/en-us/library/windowsazure/jj129582.aspx</a>.
For information about which encoding presets are supported by Microsoft Azure Media Services please see <a href="http://msdn.microsoft.com/en-us/library/windowsazure/jj129582.aspx">http://msdn.microsoft.com/en-us/library/windowsazure/jj129582.aspx</a>.
</p>
<fieldset>

View File

@@ -2,8 +2,8 @@
<fieldset>
<legend>@T("Account credentials")</legend>
<p class="hint">@T("The account name and access key for your Windows Azure Media Services account can be obtained from the Windows Azure management portal at <a href='https://manage.windowsazure.com'>https://manage.windowsazure.com</a>.")</p>
<p class="hint">@T("If you do not yet have a Windows Azure subscription, visit <a href='http://www.windowsazure.com/pricing/free-trial'>http://www.windowsazure.com/pricing/free-trial</a> to sign up for a free trial or buy a subscription.")</p>
<p class="hint">@T("The account name and access key for your Microsoft Azure Media Services account can be obtained from the Windows Azure management portal at <a href='https://manage.windowsazure.com'>https://manage.windowsazure.com</a>.")</p>
<p class="hint">@T("If you do not yet have a Microsoft Azure subscription, visit <a href='http://www.windowsazure.com/pricing/free-trial'>http://www.windowsazure.com/pricing/free-trial</a> to sign up for a free trial or buy a subscription.")</p>
<div>
<label>@T("Account name")</label>
@Html.TextBoxFor(m => m.WamsAccountName, new { @class = "text medium" })
@@ -18,7 +18,7 @@
<label>@T("Storage account access key")</label>
@Html.TextBoxFor(m => m.StorageAccountKey, new { @class = "text medium" })
@Html.ValidationMessageFor(m => m.StorageAccountKey)
<p class="hint">@T("Specify the account key for the underlying Windows Azure Storage account used by your Windows Azure Media Services instance if you want to automatically enable CORS support with the appropriate origin URLs for this web site. Enabling CORS support in your Windows Azure Storage account is required for uploading media files directly to Windows Azure Media Services. If you leave this field blank you will have to manually enable the appropriate CORS support for your Windows Azure Storage account using PowerShell.")</p>
<p class="hint">@T("Specify the account key for the underlying Microsoft Azure Storage account used by your Windows Azure Media Services instance if you want to automatically enable CORS support with the appropriate origin URLs for this web site. Enabling CORS support in your Windows Azure Storage account is required for uploading media files directly to Windows Azure Media Services. If you leave this field blank you will have to manually enable the appropriate CORS support for your Windows Azure Storage account using PowerShell.")</p>
</div>
<button id="test-button" type="submit" formaction="@Url.Action("TestCredentials")" class="button grey">@T("Test")</button>
</fieldset>

View File

@@ -16,7 +16,7 @@
</div>
if (settings.EnableDynamicPackaging) {
<p class="hint">
NOTE: Dynamic packaging is enabled in the Windows Azure Media settings. To enable dynamic packaging for the output video asset, you must use one of the H264-based encoding presets.
NOTE: Dynamic packaging is enabled in the Microsoft Azure Media settings. To enable dynamic packaging for the output video asset, you must use one of the H264-based encoding presets.
</p>
}
}

View File

@@ -8,7 +8,7 @@
Layout.Title = "Create Cloud Job";
}
@Display.FrameBuster()
<h2>@T("Select a Windows Azure Media task to perform")</h2>
<h2>@T("Select a Microsoft Azure Media task to perform")</h2>
<ul id="task-list">
@foreach (var provider in taskProviders) {
<li class="task-list-item">

View File

@@ -4,7 +4,7 @@
Style.Include("cloudmedia-progress.css", "cloudmedia-progress.min.css");
Script.Require("ShapesBase");
Layout.Title = "Manage Windows Azure Media Jobs";
Layout.Title = "Manage Microsoft Azure Media Jobs";
var jobs = (IEnumerable<Job>)Model.Jobs;
var dateTimeFormatProvider = WorkContext.Resolve<IDateTimeFormatProvider>();

View File

@@ -12,7 +12,7 @@
Script.Include("~/Modules/Orchard.MediaLibrary/Scripts/knockout-2.3.0.js").AtFoot();
Script.Include("cloudmedia-admin-settings.js").AtFoot();
Layout.Title = T("Windows Azure Media Settings");
Layout.Title = T("Microsoft Azure Media Settings");
}
@using (Html.BeginFormAntiForgeryPost()) {

View File

@@ -1,24 +1,24 @@
Name: Windows Azure Services
Name: Microsoft Azure Services
AntiForgery: enabled
Author: The Orchard Team
Website: http://orchardproject.net
Version: 1.8
OrchardVersion: 1.8
Description: Provides a set of Orchard service implementations targeting Windows Azure services.
Description: Provides a set of Orchard service implementations targeting Microsoft Azure services.
Category: Hosting
Features:
Orchard.Azure.Media:
Name: Windows Azure Media Storage
Description: Activates an Orchard media storage provider that targets Windows Azure Blob Storage.
Name: Microsoft Azure Media Storage
Description: Activates an Orchard media storage provider that targets Microsoft Azure Blob Storage.
Dependencies: Orchard.Azure
Category: Hosting
Orchard.Azure.OutputCache:
Name: Windows Azure Output Cache
Name: Microsoft Azure Output Cache
Description: Activates an Orchard output cache provider that targets Windows Azure Cache.
Dependencies: Orchard.Azure, Orchard.OutputCache
Category: Performance
Orchard.Azure.DatabaseCache:
Name: Windows Azure Database Cache
Description: Activates an NHibernate second-level cache provider that targets Windows Azure Cache.
Name: Microsoft Azure Database Cache
Description: Activates an NHibernate second-level cache provider that targets Microsoft Azure Cache.
Dependencies: Orchard.Azure
Category: Performance

View File

@@ -11,11 +11,11 @@ using Orchard.Logging;
namespace Orchard.Azure.Services.Environment.Configuration {
/// <summary>
/// Provides an IShellSettingsManager implementation that uses Windows Azure Blob Storage as the
/// Provides an IShellSettingsManager implementation that uses Microsoft Azure Blob Storage as the
/// underlying storage system.
/// </summary>
/// <remarks>
/// Additionally, this class handles role configuration change events when running in a Windows Azure Cloud
/// Additionally, this class handles role configuration change events when running in a Microsoft Azure Cloud
/// Service to ensure all Orchard tenents are notified whenever a role configuration setting is changed
/// through the management portal or API.
/// </remarks>

View File

@@ -10,9 +10,9 @@ namespace Orchard.Azure.Services.Environment.Configuration {
/// </summary>
/// <remarks>
/// Settings are read first using the <c>CloudConfigurationManager</c> class, which looks first in cloud service role
/// configuration if running in a Windows Azure Cloud Service and secondly in app settings (either in Web.config or in
/// Windows Azure Web Site app settings configuration). If the setting is not found using CloudConfigurationManager
/// then connection strings (either in Web.config or in Windows Azure Web Site connection strings configuration) is
/// configuration if running in a Microsoft Azure Cloud Service and secondly in app settings (either in Web.config or in
/// Microsoft Azure Web Site app settings configuration). If the setting is not found using CloudConfigurationManager
/// then connection strings (either in Web.config or in Microsoft Azure Web Site connection strings configuration) is
/// checked. Both the tenant-specific name and the tenant-neutral name are checked within each configuration source
/// before proceeding to the next one.
/// </remarks>

View File

@@ -5,7 +5,7 @@ using System.Diagnostics;
namespace Orchard.Azure.Services.Logging {
/// <summary>
/// Provides a Log4net appender implementation that sends log messages to Windows Azure Diagnostics.
/// Provides a Log4net appender implementation that sends log messages to Microsoft Azure Diagnostics.
/// </summary>
public class AzureDiagnosticsAppender : AppenderSkeleton {