Spring/spring-net
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/spring-projects/spring-net

Browse Source
This commit is contained in:
Steve Bohlen
2015-01-29 19:56:50 -05:00
parent 713875080d 1b84a7296e
commit 0646d02ec5
13 changed files with 74 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Spring/Spring.Core/Util/SystemUtils.cs
View File

@@ -64,7 +64,7 @@ namespace Spring.Util
{
lock (assemblyResolverLock)
{
AppDomain.CurrentDomain.AssemblyResolve += new ResolveEventHandler(LoadedAssemblyResolver);
AppDomain.CurrentDomain.AssemblyResolve += LoadedAssemblyResolver;
assemblyResolverRegistered = true;
}
}

4
src/Spring/Spring.Data.NHibernate/Data/NHibernate/Support/OpenSessionInViewModule.cs
View File

@@ -57,8 +57,8 @@ namespace Spring.Data.NHibernate.Support
/// <param name="context">The standard HTTP application context</param>
public void Init( HttpApplication context )
{
context.BeginRequest += new EventHandler(context_BeginRequest);
context.EndRequest += new EventHandler(context_EndRequest);
context.BeginRequest += context_BeginRequest;
context.EndRequest += context_EndRequest;
}
/// <summary>
/// A do nothing dispose method.

4
src/Spring/Spring.Messaging.Nms/Messaging/Nms/Connections/SingleConnectionFactory.cs
View File

@@ -352,11 +352,11 @@ namespace Spring.Messaging.Nms.Connections
if (reconnectOnException)
{
//add reconnect exception handler first to exception chain.
con.ExceptionListener += new ExceptionListener(this.OnException);
con.ExceptionListener += this.OnException;
}
if (ExceptionListener != null)
{
con.ExceptionListener += new ExceptionListener(ExceptionListener.OnException);
con.ExceptionListener += ExceptionListener.OnException;
}
}

4
src/Spring/Spring.Messaging.Nms/Messaging/Nms/Listener/SimpleMessageListenerContainer.cs
View File

@@ -180,7 +180,7 @@ namespace Spring.Messaging.Nms.Listener
protected override void PrepareSharedConnection(IConnection connection)
{
base.PrepareSharedConnection(connection);
connection.ExceptionListener += new ExceptionListener(OnException);
connection.ExceptionListener += OnException;
}
@@ -313,7 +313,7 @@ namespace Spring.Messaging.Nms.Listener
SimpleMessageListener listener = new SimpleMessageListener(this, session);
// put in explicit registration with 'new' for compilation on .NET 1.1
consumer.Listener += new Apache.NMS.MessageListener(listener.OnMessage);
consumer.Listener += listener.OnMessage;
return consumer;
}

116
src/Spring/Spring.Scheduling.Quartz2/Scheduling/Quartz/SchedulerFactoryObject.cs
View File

@@ -75,14 +75,14 @@ namespace Spring.Scheduling.Quartz
/// <seealso cref="IScheduler" />
/// <seealso cref="ISchedulerFactory" />
/// <seealso cref="StdSchedulerFactory" />
public class SchedulerFactoryObject : SchedulerAccessor, IFactoryObject, IObjectNameAware,
public class SchedulerFactoryObject : SchedulerAccessor, IFactoryObject, IObjectNameAware,
IApplicationContextAware, IApplicationEventListener, IInitializingObject, IDisposable
{
/// <summary>
/// Default thread count to be set to thread pool.
/// </summary>
public const int DEFAULT_THREAD_COUNT = 10;
/// <summary>
/// Property name for thread count in thread pool.
/// </summary>
@@ -131,7 +131,7 @@ namespace Spring.Scheduling.Quartz
private IJobFactory jobFactory;
private bool jobFactorySet;
private IDictionary quartzProperties;
private IScheduler scheduler;
private IScheduler scheduler;
private IDictionary schedulerContextMap;
private Type schedulerFactoryType;
private string schedulerName;
@@ -149,7 +149,6 @@ namespace Spring.Scheduling.Quartz
schedulerFactoryType = typeof (StdSchedulerFactory);
}
/// <summary>
/// Set the Quartz SchedulerFactory implementation to use.
/// </summary>
@@ -286,8 +285,8 @@ namespace Spring.Scheduling.Quartz
/// <p>
/// Default is Spring's <see cref="AdaptableJobFactory" />, which supports
/// standard Quartz <see cref="IJob" /> instances. Note that this default only applies
/// to a <i>local</i> Scheduler, not to a RemoteScheduler (where setting
/// a custom JobFactory is not supported by Quartz).
/// to a <i>local</i> Scheduler, not to a RemoteScheduler (where setting
/// a custom JobFactory is not supported by Quartz).
/// </p>
/// <p>
/// Specify an instance of Spring's <see cref="SpringObjectJobFactory" /> here
@@ -299,8 +298,8 @@ namespace Spring.Scheduling.Quartz
/// <seealso cref="SpringObjectJobFactory" />
public virtual IJobFactory JobFactory
{
set
{
set
{
jobFactory = value;
jobFactorySet = true;
}
@@ -570,18 +569,17 @@ namespace Spring.Scheduling.Quartz
ISchedulerFactory schedulerFactory = ObjectUtils.InstantiateType<ISchedulerFactory>(schedulerFactoryType);
InitSchedulerFactory(schedulerFactory);
if (taskExecutor != null)
{
// Make given TaskExecutor available for SchedulerFactory configuration.
configTimeTaskExecutor = taskExecutor;
}
if (dbProvider != null)
{
// Make given db provider available for SchedulerFactory configuration.
configTimeDbProvider = dbProvider;
}
if (taskExecutor != null)
{
// Make given TaskExecutor available for SchedulerFactory configuration.
configTimeTaskExecutor = taskExecutor;
}
if (dbProvider != null)
{
// Make given db provider available for SchedulerFactory configuration.
configTimeDbProvider = dbProvider;
}
try
{
@@ -589,12 +587,12 @@ namespace Spring.Scheduling.Quartz
scheduler = CreateScheduler(schedulerFactory, schedulerName);
PopulateSchedulerContext();
if (!jobFactorySet && !(scheduler is RemoteScheduler))
if (!jobFactorySet && !(scheduler is RemoteScheduler))
{
// Use AdaptableJobFactory as default for a local Scheduler, unless when
// explicitly given a null value through the "jobFactory" object property.
jobFactory = new AdaptableJobFactory();
}
// Use AdaptableJobFactory as default for a local Scheduler, unless when
// explicitly given a null value through the "jobFactory" object property.
jobFactory = new AdaptableJobFactory();
}
if (jobFactory != null)
{
@@ -607,14 +605,14 @@ namespace Spring.Scheduling.Quartz
}
finally
{
if (taskExecutor != null)
if (taskExecutor != null)
{
configTimeTaskExecutor = null;
}
if (dbProvider != null)
configTimeTaskExecutor = null;
}
if (dbProvider != null)
{
configTimeDbProvider = null;
}
configTimeDbProvider = null;
}
}
RegisterListeners();
@@ -634,7 +632,6 @@ namespace Spring.Scheduling.Quartz
if (configLocation != null || quartzProperties != null || schedulerName != null ||
taskExecutor != null || dbProvider != null)
{
throw new ArgumentException("StdSchedulerFactory required for applying Quartz properties: " + schedulerFactory);
}
// Otherwise assume that no initialization is necessary...
@@ -651,7 +648,7 @@ namespace Spring.Scheduling.Quartz
}
else
{
mergedProps.Set(StdSchedulerFactory.PropertyThreadPoolType, typeof(SimpleThreadPool).AssemblyQualifiedName);
mergedProps.Set(StdSchedulerFactory.PropertyThreadPoolType, typeof (SimpleThreadPool).AssemblyQualifiedName);
mergedProps[PROP_THREAD_COUNT] = Convert.ToString(DEFAULT_THREAD_COUNT);
}
@@ -666,32 +663,30 @@ namespace Spring.Scheduling.Quartz
string line;
while ((line = sr.ReadLine()) != null)
{
string[] lineItems = line.Split(new char[] { '=' }, 2);
string[] lineItems = line.Split(new char[] {'='}, 2);
if (lineItems.Length == 2)
{
mergedProps[lineItems[0].Trim()] = lineItems[1].Trim();
}
}
}
}
}
if (quartzProperties != null)
{
// if given quartz properties, merge to them to configuration
MergePropertiesIntoMap(quartzProperties, mergedProps);
MergePropertiesIntoMap(quartzProperties, mergedProps);
}
if (dbProvider != null)
if (dbProvider != null)
{
mergedProps.Add(StdSchedulerFactory.PropertyJobStoreType, typeof(LocalDataSourceJobStore).AssemblyQualifiedName);
}
mergedProps[StdSchedulerFactory.PropertyJobStoreType] = typeof (LocalDataSourceJobStore).AssemblyQualifiedName;
}
// Make sure to set the scheduler name as configured in the Spring configuration.
if (schedulerName != null)
{
mergedProps.Add(StdSchedulerFactory.PropertySchedulerInstanceName, schedulerName);
mergedProps[StdSchedulerFactory.PropertySchedulerInstanceName] = schedulerName;
}
((StdSchedulerFactory) schedulerFactory).Initialize(mergedProps);
@@ -711,7 +706,6 @@ namespace Spring.Scheduling.Quartz
}
}
/// <summary>
/// Create the Scheduler instance for the given factory and scheduler name.
/// Called by afterPropertiesSet.
@@ -727,24 +721,26 @@ namespace Spring.Scheduling.Quartz
/// <seealso cref="ISchedulerFactory.GetScheduler()"/>
protected virtual IScheduler CreateScheduler(ISchedulerFactory schedulerFactory, string schedName)
{
SchedulerRepository repository = SchedulerRepository.Instance;
lock (repository)
SchedulerRepository repository = SchedulerRepository.Instance;
lock (repository)
{
IScheduler existingScheduler = (schedulerName != null ? repository.Lookup(schedulerName) : null);
IScheduler newScheduler = schedulerFactory.GetScheduler();
if (newScheduler == existingScheduler) {
throw new InvalidOperationException(
IScheduler existingScheduler = (schedulerName != null ? repository.Lookup(schedulerName) : null);
IScheduler newScheduler = schedulerFactory.GetScheduler();
if (newScheduler == existingScheduler)
{
throw new InvalidOperationException(
string.Format(
"Active Scheduler of name '{0}' already registered in Quartz SchedulerRepository. Cannot create a new Spring-managed Scheduler of the same name!",
schedulerName));
}
if (!exposeSchedulerInRepository) {
// Need to explicitly remove it if not intended for exposure,
// since Quartz shares the Scheduler instance by default!
SchedulerRepository.Instance.Remove(newScheduler.SchedulerName);
}
return newScheduler;
}
"Active Scheduler of name '{0}' already registered in Quartz SchedulerRepository. Cannot create a new Spring-managed Scheduler of the same name!",
schedulerName));
}
if (!exposeSchedulerInRepository)
{
// Need to explicitly remove it if not intended for exposure,
// since Quartz shares the Scheduler instance by default!
SchedulerRepository.Instance.Remove(newScheduler.SchedulerName);
}
return newScheduler;
}
}
/// <summary>
@@ -772,7 +768,6 @@ namespace Spring.Scheduling.Quartz
}
}
/// <summary>
/// Start the Quartz Scheduler, respecting the "startDelay" setting.
/// </summary>
@@ -796,7 +791,6 @@ namespace Spring.Scheduling.Quartz
}
}
//---------------------------------------------------------------------
// Implementation of Lifecycle interface
//---------------------------------------------------------------------
@@ -856,4 +850,4 @@ namespace Spring.Scheduling.Quartz
}
}
}
}
}

2
src/Spring/Spring.Services/EnterpriseServices/ServicedComponentFactory.cs
View File

@@ -150,7 +150,7 @@ namespace Spring.EnterpriseServices
{
ValidateConfiguration();
componentType = Type.GetTypeFromProgID(Name, Server);
AppDomain.CurrentDomain.AssemblyResolve += new ResolveEventHandler(CurrentDomain_AssemblyResolve);
AppDomain.CurrentDomain.AssemblyResolve += CurrentDomain_AssemblyResolve;
}
#endregion

2
src/Spring/Spring.Services/EnterpriseServices/ServicedComponentHelper.cs
View File

@@ -83,7 +83,7 @@ namespace Spring.EnterpriseServices
{
// this is to ensure, that assemblies placed next to the component assembly can be loaded
// even when they are not strong named.
AppDomain.CurrentDomain.AssemblyResolve += new ResolveEventHandler(CurrentDomain_AssemblyResolve);
AppDomain.CurrentDomain.AssemblyResolve += CurrentDomain_AssemblyResolve;
FileInfo componentAssemblyFile = new FileInfo(componentType.Assembly.Location);
FileInfo assemblyFile = new FileInfo(componentAssemblyFile.FullName);

2
src/Spring/Spring.Web.Conversation.NHibernate3/Web/Conversation/HttpModule/ConversationModule.cs
View File

@@ -73,7 +73,7 @@ namespace Spring.Web.Conversation.HttpModule
if (HttpContext.Current.Handler is Page)
{
Page page = (Page)HttpContext.Current.Handler;
page.Unload += new EventHandler(page_Unload);
page.Unload += page_Unload;
if (HttpContext.Current.Session != null)
{

2
src/Spring/Spring.Web/Context/Support/WebApplicationContext.cs
View File

@@ -156,7 +156,7 @@ namespace Spring.Context.Support
ILog s_weblog = LogManager.GetLogger(typeof(WebApplicationContext));
// register for ContextRegistry.Cleared event - we need to discard our cache in this case
ContextRegistry.Cleared += new EventHandler(OnContextRegistryCleared);
ContextRegistry.Cleared += OnContextRegistryCleared;
#if !MONO_2_0
if (HttpRuntime.AppDomainAppVirtualPath != null) // check if we're within an ASP.NET AppDomain!

4
src/Spring/Spring.Web/Context/Support/WebSupportModule.cs
View File

@@ -145,8 +145,8 @@ namespace Spring.Context.Support
VirtualEnvironment.SetInitialized();
}
app.PreRequestHandlerExecute += new EventHandler(OnConfigureHandler);
app.EndRequest += new EventHandler(VirtualEnvironment.RaiseEndRequest);
app.PreRequestHandlerExecute += OnConfigureHandler;
app.EndRequest += VirtualEnvironment.RaiseEndRequest;
// TODO: this is only a workaround to get us up & running in IIS7/integrated mode
// We must review all code for relative virtual paths - they must be resolved to application-relative paths

4
src/Spring/Spring.Web/Objects/Factory/Support/WebObjectFactory.cs
View File

@@ -87,8 +87,8 @@ namespace Spring.Objects.Factory.Support
if (s_eventHandlersRegistered) return;
if (log.IsDebugEnabled) log.Debug("hooking up event handlers");
VirtualEnvironment.EndRequest += new VirtualEnvironment.RequestEventHandler(OnEndRequest);
VirtualEnvironment.EndSession += new VirtualEnvironment.SessionEventHandler(OnEndSession);
VirtualEnvironment.EndRequest += OnEndRequest;
VirtualEnvironment.EndSession += OnEndSession;
s_eventHandlersRegistered = true;
}

4
src/Spring/Spring.Web/Web/UI/Controls/TabularMultiView.cs
View File

@@ -220,11 +220,11 @@ namespace Spring.Web.UI.Controls
{
// create menu tabstrip
_tabContainer = CreateTabContainer();
_tabContainer.Click += new TabCommandEventHandler(OnSelectTabCommand);
_tabContainer.Click += OnSelectTabCommand;
// create multiview container
_multiView = new MultiView();
_multiView.ActiveViewChanged += new EventHandler(OnActiveViewChanged);
_multiView.ActiveViewChanged += OnActiveViewChanged;
// add views previously parsed
for (int i = 0; i < _parsedViews.Count; i++) _multiView.Controls.Add((Control) _parsedViews[i]);

4
test/Spring/Spring.Web.Conversation.NHibernate3.Tests/Conversation/SerializeConversationTestModule.cs
View File

@@ -61,8 +61,8 @@ namespace Spring.Web.Conversation
/// <param name="context"></param>
public void Init(HttpApplication context)
{
context.PreRequestHandlerExecute += new EventHandler(context_PreRequestHandlerExecute);
context.PostRequestHandlerExecute += new EventHandler(context_PostRequestHandlerExecute);
context.PreRequestHandlerExecute += context_PreRequestHandlerExecute;
context.PostRequestHandlerExecute += context_PostRequestHandlerExecute;
}
/// <summary>