From 5db91c16890ef98d343b3761bc1be8494c28cc03 Mon Sep 17 00:00:00 2001 From: Renaud Paquay Date: Tue, 22 Jun 2010 10:53:28 -0700 Subject: [PATCH] Rename OrchardSystemException to OrchardCoreException --HG-- branch : dev rename : src/Orchard/OrchardSystemException.cs => src/Orchard/OrchardCoreException.cs --- src/Orchard/Commands/CommandHostAgent.cs | 2 +- src/Orchard/Commands/DefaultCommandManager.cs | 4 ++-- src/Orchard/Data/SessionFactoryHolder.cs | 4 ++-- .../Extensions/Compilers/DefaultExtensionCompiler.cs | 2 +- src/Orchard/FileSystems/AppData/AppDataFolder.cs | 2 +- src/Orchard/Orchard.Framework.csproj | 2 +- ...{OrchardSystemException.cs => OrchardCoreException.cs} | 8 ++++---- src/Orchard/Security/OrchardSecurityException.cs | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) rename src/Orchard/{OrchardSystemException.cs => OrchardCoreException.cs} (60%) diff --git a/src/Orchard/Commands/CommandHostAgent.cs b/src/Orchard/Commands/CommandHostAgent.cs index 50e3a71e3..0884f4ff4 100644 --- a/src/Orchard/Commands/CommandHostAgent.cs +++ b/src/Orchard/Commands/CommandHostAgent.cs @@ -121,7 +121,7 @@ namespace Orchard.Commands { if (settingsList.Any()) { var settings = settingsList.SingleOrDefault(s => String.Equals(s.Name, tenant, StringComparison.OrdinalIgnoreCase)); if (settings == null) { - throw new OrchardSystemException(T("Tenant {0} does not exist", tenant)); + throw new OrchardCoreException(T("Tenant {0} does not exist", tenant)); } var env = host.CreateStandaloneEnvironment(settings); diff --git a/src/Orchard/Commands/DefaultCommandManager.cs b/src/Orchard/Commands/DefaultCommandManager.cs index 87841e159..2bce1da1a 100644 --- a/src/Orchard/Commands/DefaultCommandManager.cs +++ b/src/Orchard/Commands/DefaultCommandManager.cs @@ -30,11 +30,11 @@ namespace Orchard.Commands { var commandMatch = string.Join(" ", parameters.Arguments.ToArray()); var commandList = string.Join(",", GetCommandDescriptors().Select(d => d.Name).ToArray()); if (matches.Any()) { - throw new OrchardSystemException(T("Multiple commands found matching arguments \"{0}\". Commands available: {1}.", + throw new OrchardCoreException(T("Multiple commands found matching arguments \"{0}\". Commands available: {1}.", commandMatch, commandList)); } else { - throw new OrchardSystemException(T("No command found matching arguments \"{0}\". Commands available: {1}.", + throw new OrchardCoreException(T("No command found matching arguments \"{0}\". Commands available: {1}.", commandMatch, commandList)); } } diff --git a/src/Orchard/Data/SessionFactoryHolder.cs b/src/Orchard/Data/SessionFactoryHolder.cs index 5b820bd3f..6dcaa417b 100644 --- a/src/Orchard/Data/SessionFactoryHolder.cs +++ b/src/Orchard/Data/SessionFactoryHolder.cs @@ -46,7 +46,7 @@ namespace Orchard.Data { lock (this) { if (_sessionFactory != null) { Logger.Error("CreateSchema can not be called after a session factory was created"); - throw new OrchardSystemException(T("CreateSchema can not be called after a session factory was created")); + throw new OrchardCoreException(T("CreateSchema can not be called after a session factory was created")); } _sessionFactory = BuildSessionFactory(true /*createDatabase*/, false /*updateSchema*/); @@ -57,7 +57,7 @@ namespace Orchard.Data { lock (this) { if (_sessionFactory != null) { Logger.Error("UpdateSchema can not be called after a session factory was created"); - throw new OrchardSystemException(T("UpdateSchema can not be called after a session factory was created")); + throw new OrchardCoreException(T("UpdateSchema can not be called after a session factory was created")); } _sessionFactory = BuildSessionFactory(false /*createDatabase*/, true /*updateSchema*/); diff --git a/src/Orchard/Environment/Extensions/Compilers/DefaultExtensionCompiler.cs b/src/Orchard/Environment/Extensions/Compilers/DefaultExtensionCompiler.cs index 34e97cdba..6ae511941 100644 --- a/src/Orchard/Environment/Extensions/Compilers/DefaultExtensionCompiler.cs +++ b/src/Orchard/Environment/Extensions/Compilers/DefaultExtensionCompiler.cs @@ -45,7 +45,7 @@ namespace Orchard.Environment.Extensions.Compilers { } } catch(Exception e) { - throw new OrchardSystemException(T("Error compiling module \"{0}\" from file \"{1}\"", moduleName, context.VirtualPath), e); + throw new OrchardCoreException(T("Error compiling module \"{0}\" from file \"{1}\"", moduleName, context.VirtualPath), e); } } diff --git a/src/Orchard/FileSystems/AppData/AppDataFolder.cs b/src/Orchard/FileSystems/AppData/AppDataFolder.cs index b914074ea..f6cb73610 100644 --- a/src/Orchard/FileSystems/AppData/AppDataFolder.cs +++ b/src/Orchard/FileSystems/AppData/AppDataFolder.cs @@ -65,7 +65,7 @@ namespace Orchard.FileSystems.AppData { } // Everything failed, throw an exception - throw new OrchardSystemException(T("Unable to make room for file \"{0}\" in \"App_Data\" folder: too many conflicts.", destinationFileName)); + throw new OrchardCoreException(T("Unable to make room for file \"{0}\" in \"App_Data\" folder: too many conflicts.", destinationFileName)); } /// diff --git a/src/Orchard/Orchard.Framework.csproj b/src/Orchard/Orchard.Framework.csproj index 92ceb1f70..61ae62328 100644 --- a/src/Orchard/Orchard.Framework.csproj +++ b/src/Orchard/Orchard.Framework.csproj @@ -428,7 +428,7 @@ - + diff --git a/src/Orchard/OrchardSystemException.cs b/src/Orchard/OrchardCoreException.cs similarity index 60% rename from src/Orchard/OrchardSystemException.cs rename to src/Orchard/OrchardCoreException.cs index 7eb42f13d..cf3748c40 100644 --- a/src/Orchard/OrchardSystemException.cs +++ b/src/Orchard/OrchardCoreException.cs @@ -3,20 +3,20 @@ using System.Runtime.Serialization; using Orchard.Localization; namespace Orchard { - public class OrchardSystemException : Exception { + public class OrchardCoreException : Exception { private readonly LocalizedString _localizedMessage; - public OrchardSystemException(LocalizedString message) + public OrchardCoreException(LocalizedString message) : base(message.Text) { _localizedMessage = message; } - public OrchardSystemException(LocalizedString message, Exception innerException) + public OrchardCoreException(LocalizedString message, Exception innerException) : base(message.Text, innerException) { _localizedMessage = message; } - protected OrchardSystemException(SerializationInfo info, StreamingContext context) + protected OrchardCoreException(SerializationInfo info, StreamingContext context) : base(info, context) { } diff --git a/src/Orchard/Security/OrchardSecurityException.cs b/src/Orchard/Security/OrchardSecurityException.cs index acad24c44..908761fff 100644 --- a/src/Orchard/Security/OrchardSecurityException.cs +++ b/src/Orchard/Security/OrchardSecurityException.cs @@ -4,7 +4,7 @@ using Orchard.ContentManagement; using Orchard.Localization; namespace Orchard.Security { - public class OrchardSecurityException : OrchardSystemException { + public class OrchardSecurityException : OrchardCoreException { public OrchardSecurityException(LocalizedString message) : base(message) { } public OrchardSecurityException(LocalizedString message, Exception innerException) : base(message, innerException) { } protected OrchardSecurityException(SerializationInfo info, StreamingContext context) : base(info, context) { }