User: xtoff
Date: 2009/12/17 11:59 AM
Modified:
/InversionOfControl/trunk/src/Castle.MicroKernel/
DefaultKernel.cs, DefaultKernel_AddComponent.cs, DefaultKernel_Events.cs,
DefaultKernel_Resolve.cs
/InversionOfControl/trunk/src/Castle.MicroKernel/ComponentActivator/
AbstractComponentActivator.cs, ComponentActivatorException.cs,
DefaultComponentActivator.cs, WebUserControlComponentActivator.cs
/InversionOfControl/trunk/src/Castle.MicroKernel/Context/
CreationContext.cs, DependencyTrackingScope.cs
/InversionOfControl/trunk/src/Castle.MicroKernel/Exceptions/
CircularDependencyException.cs, ComponentNotFoundException.cs,
ComponentRegistrationException.cs, KernelException.cs
/InversionOfControl/trunk/src/Castle.MicroKernel/Handlers/
AbstractHandler.cs, DefaultGenericHandler.cs, DefaultHandlerFactory.cs
/InversionOfControl/trunk/src/Castle.MicroKernel/Lifestyle/
AbstractLifestyleManager.cs, PerThreadLifestyleManager.cs,
PerWebRequestLifestyleManager.cs
/InversionOfControl/trunk/src/Castle.MicroKernel/Lifestyle/Pool/
DefaultPool.cs
/InversionOfControl/trunk/src/Castle.MicroKernel/ModelBuilder/Inspectors/
ComponentActivatorInspector.cs, ComponentProxyInspector.cs,
ConfigurationModelInspector.cs, ConfigurationParametersInspector.cs
/InversionOfControl/trunk/src/Castle.MicroKernel/Resolvers/
DefaultDependencyResolver.cs
/InversionOfControl/trunk/src/Castle.MicroKernel/SubSystems/Configuration/
DefaultConfigurationStore.cs
/InversionOfControl/trunk/src/Castle.MicroKernel/SubSystems/Conversion/
AbstractTypeConverter.cs, DefaultConversionManager.cs
/InversionOfControl/trunk/src/Castle.MicroKernel/SubSystems/Conversion/Converters/
ArrayConverter.cs, ComponentConverter.cs, ComponentModelConverter.cs,
DefaultComplexConverter.cs, DictionaryConverter.cs, EnumConverter.cs,
ListConverter.cs, PrimitiveConverter.cs, TimeSpanConverter.cs,
TypeNameConverter.cs
/InversionOfControl/trunk/src/Castle.MicroKernel/SubSystems/Naming/
BinaryTreeComponentName.cs, ComponentName.cs, DefaultNamingSubSystem.cs,
KeySearchNamingSubSystem.cs, NamingPartsSubSystem.cs
/InversionOfControl/trunk/src/Castle.Windsor/
InitializationException.cs, WindsorContainer.cs
/InversionOfControl/trunk/src/Castle.Windsor/Proxy/
DefaultProxyFactory.cs
Log:
- applied patch from Simon Cropp for IOC-ISSUE-174 - Exclude Serialization
attributes for Silverlight
File Changes:
Directory: /InversionOfControl/trunk/src/Castle.MicroKernel/
============================================================
File [modified]: DefaultKernel.cs
Delta lines: +3 -3
===================================================================
---
InversionOfControl/trunk/src/Castle.MicroKernel/DefaultKernel_AddComponent.cs
2009-12-17 18:42:17 UTC (rev 6443)
+++
InversionOfControl/trunk/src/Castle.MicroKernel/DefaultKernel_AddComponent.cs
2009-12-17 18:59:15 UTC (rev 6444)
@@ -20,10 +20,10 @@
using ComponentActivator;
using Core;
-#if !SILVERLIGHT
+#if (SILVERLIGHT)
+ public partial class DefaultKernel : IKernel, IKernelEvents
+#else
public partial class DefaultKernel : MarshalByRefObject, IKernel,
IKernelEvents, IDeserializationCallback
-#else
- public partial class DefaultKernel : IKernel, IKernelEvents
#endif
{
File [modified]: DefaultKernel_AddComponent.cs
Delta lines: +5 -6
===================================================================
--- InversionOfControl/trunk/src/Castle.MicroKernel/DefaultKernel_Events.cs
2009-12-17 18:42:17 UTC (rev 6443)
+++ InversionOfControl/trunk/src/Castle.MicroKernel/DefaultKernel_Events.cs
2009-12-17 18:59:15 UTC (rev 6444)
@@ -26,10 +26,10 @@
/// This implementation is complete and also support a kernel
/// hierarchy (sub containers).
/// </summary>
-#if !SILVERLIGHT
- public partial class DefaultKernel : MarshalByRefObject, IKernel,
IKernelEvents, IDeserializationCallback
-#else
+#if (SILVERLIGHT)
public partial class DefaultKernel : IKernel, IKernelEvents
+#else
+ public partial class DefaultKernel : MarshalByRefObject, IKernel,
IKernelEvents, IDeserializationCallback
#endif
{
private static readonly object HandlerRegisteredEvent = new
object();
@@ -47,7 +47,9 @@
private bool handlersChanged;
private volatile bool handlersChangedDeferred;
+#if (!SILVERLIGHT)
[NonSerialized]
+#endif
private readonly EventHandlerList events = new
EventHandlerList();
#if !SILVERLIGHT
@@ -234,10 +236,7 @@
if (eventDelegate != null) eventDelegate(client, model,
dependency);
}
- #region IDeserializationCallback Members
- #endregion
-
public IDisposable OptimizeDependencyResolution()
{
File [modified]: DefaultKernel_Events.cs
Delta lines: +3 -3
===================================================================
--- InversionOfControl/trunk/src/Castle.MicroKernel/DefaultKernel_Resolve.cs
2009-12-17 18:42:17 UTC (rev 6443)
+++ InversionOfControl/trunk/src/Castle.MicroKernel/DefaultKernel_Resolve.cs
2009-12-17 18:59:15 UTC (rev 6444)
@@ -21,10 +21,10 @@
using Core;
using Handlers;
-#if !SILVERLIGHT
+#if (SILVERLIGHT)
+ public partial class DefaultKernel : IKernel, IKernelEvents
+#else
public partial class DefaultKernel : MarshalByRefObject, IKernel,
IKernelEvents, IDeserializationCallback
-#else
- public partial class DefaultKernel : IKernel, IKernelEvents
#endif
{
File [modified]: DefaultKernel_Resolve.cs
Delta lines: +5 -1
===================================================================
---
InversionOfControl/trunk/src/Castle.MicroKernel/Exceptions/CircularDependencyException.cs
2009-12-17 18:42:17 UTC (rev 6443)
+++
InversionOfControl/trunk/src/Castle.MicroKernel/Exceptions/CircularDependencyException.cs
2009-12-17 18:59:15 UTC (rev 6444)
@@ -20,7 +20,9 @@
/// <summary>
/// Exception throw when a circular dependency is detected
/// </summary>
+#if (!SILVERLIGHT)
[Serializable]
+#endif
public class CircularDependencyException : Exception
{
/// <summary>
@@ -46,7 +48,8 @@
public CircularDependencyException(string message, Exception
innerException) : base(message, innerException)
{
}
-
+
+#if (!SILVERLIGHT)
/// <summary>
/// Initializes a new instance of the <see
cref="CircularDependencyException"/> class.
/// </summary>
@@ -57,5 +60,6 @@
protected CircularDependencyException(SerializationInfo info,
StreamingContext context) : base(info, context)
{
}
+#endif
}
Directory: /InversionOfControl/trunk/src/Castle.Windsor/
========================================================
File [modified]: InitializationException.cs
Delta lines: +8 -2
===================================================================
--- InversionOfControl/trunk/src/Castle.Windsor/Proxy/DefaultProxyFactory.cs
2009-12-17 18:42:17 UTC (rev 6443)
+++ InversionOfControl/trunk/src/Castle.Windsor/Proxy/DefaultProxyFactory.cs
2009-12-17 18:59:15 UTC (rev 6444)
@@ -35,10 +35,16 @@
/// was registered with a service interface, we proxy
/// the interface and the methods don't need to be virtual,
/// </remarks>
+#if (SILVERLIGHT)
+ public class DefaultProxyFactory : AbstractProxyFactory
+#else
[Serializable]
public class DefaultProxyFactory : AbstractProxyFactory,
IDeserializationCallback
+#endif
{
+#if (!SILVERLIGHT)
[NonSerialized]
+#endif
protected ProxyGenerator generator;
/// <summary>
@@ -182,14 +188,14 @@
return !type.IsAssignableFrom(mainInterface) &&
type.IsPublic;
}
- #region IDeserializationCallback
+#if (!SILVERLIGHT)
public void OnDeserialization(object sender)
{
Init();
}
+#endif
- #endregion
private void Init()
File [modified]: WindsorContainer.cs
Delta lines: +0 -0
===================================================================
Directory: /InversionOfControl/trunk/src/Castle.MicroKernel/ComponentActivator/
===============================================================================
File [modified]: AbstractComponentActivator.cs
Delta lines: +5 -1
===================================================================
---
InversionOfControl/trunk/src/Castle.MicroKernel/ComponentActivator/ComponentActivatorException.cs
2009-12-17 18:42:17 UTC (rev 6443)
+++
InversionOfControl/trunk/src/Castle.MicroKernel/ComponentActivator/ComponentActivatorException.cs
2009-12-17 18:59:15 UTC (rev 6444)
@@ -20,7 +20,9 @@
/// <summary>
/// Summary description for ComponentActivatorException.
/// </summary>
+#if (!SILVERLIGHT)
[Serializable]
+#endif
public class ComponentActivatorException : Exception
{
public ComponentActivatorException(string message) :
base(message)
@@ -30,9 +32,11 @@
public ComponentActivatorException(string message, Exception
innerException) : base(message, innerException)
{
}
-
+
+#if (!SILVERLIGHT)
public ComponentActivatorException(SerializationInfo info,
StreamingContext context) : base(info, context)
{
}
+#endif
}
File [modified]: ComponentActivatorException.cs
Delta lines: +2 -0
===================================================================
---
InversionOfControl/trunk/src/Castle.MicroKernel/ComponentActivator/DefaultComponentActivator.cs
2009-12-17 18:42:17 UTC (rev 6443)
+++
InversionOfControl/trunk/src/Castle.MicroKernel/ComponentActivator/DefaultComponentActivator.cs
2009-12-17 18:59:15 UTC (rev 6444)
@@ -35,7 +35,9 @@
/// Please note however that the activator is responsible for the proxy
creation
/// when needed.
/// </remarks>
+#if (!SILVERLIGHT)
[Serializable]
+#endif
public class DefaultComponentActivator : AbstractComponentActivator
{
File [modified]: DefaultComponentActivator.cs
Delta lines: +2 -0
===================================================================
---
InversionOfControl/trunk/src/Castle.MicroKernel/ComponentActivator/WebUserControlComponentActivator.cs
2009-12-17 18:42:17 UTC (rev 6443)
+++
InversionOfControl/trunk/src/Castle.MicroKernel/ComponentActivator/WebUserControlComponentActivator.cs
2009-12-17 18:59:15 UTC (rev 6444)
@@ -43,7 +43,9 @@
/// Has not been tested with proxies.
/// </para>
/// </summary>
+#if (!SILVERLIGHT)
[Serializable]
+#endif
public class WebUserControlComponentActivator :
DefaultComponentActivator
{
File [modified]: WebUserControlComponentActivator.cs
Delta lines: +2 -0
===================================================================
--- InversionOfControl/trunk/src/Castle.MicroKernel/Context/CreationContext.cs
2009-12-17 18:42:17 UTC (rev 6443)
+++ InversionOfControl/trunk/src/Castle.MicroKernel/Context/CreationContext.cs
2009-12-17 18:59:15 UTC (rev 6444)
@@ -28,7 +28,9 @@
/// to detected cycled dependency graphs and now it's also being used
/// to provide arguments to components.
/// </summary>
+#if (!SILVERLIGHT)
[Serializable]
+#endif
public class CreationContext : MarshalByRefObject,
ISubDependencyResolver
{
Directory:
/InversionOfControl/trunk/src/Castle.MicroKernel/SubSystems/Configuration/
=====================================================================================
File [modified]: DefaultConfigurationStore.cs
Delta lines: +2 -0
===================================================================
---
InversionOfControl/trunk/src/Castle.MicroKernel/SubSystems/Conversion/AbstractTypeConverter.cs
2009-12-17 18:42:17 UTC (rev 6443)
+++
InversionOfControl/trunk/src/Castle.MicroKernel/SubSystems/Conversion/AbstractTypeConverter.cs
2009-12-17 18:59:15 UTC (rev 6444)
@@ -20,7 +20,9 @@
/// <summary>
/// Base implementation of <see cref="ITypeConverter"/>
/// </summary>
+#if (!SILVERLIGHT)
[Serializable]
+#endif
public abstract class AbstractTypeConverter : ITypeConverter
{
Directory: /InversionOfControl/trunk/src/Castle.MicroKernel/Context/
====================================================================
File [modified]: CreationContext.cs
Delta lines: +2 -0
===================================================================
---
InversionOfControl/trunk/src/Castle.MicroKernel/Context/DependencyTrackingScope.cs
2009-12-17 18:42:17 UTC (rev 6443)
+++
InversionOfControl/trunk/src/Castle.MicroKernel/Context/DependencyTrackingScope.cs
2009-12-17 18:59:15 UTC (rev 6444)
@@ -102,7 +102,9 @@
/// The ComponentModel is required so we can get resolve an
object that takes as a parameter itself, but
/// with difference model. (See IoC 51 for the details)
/// </summary>
+#if (!SILVERLIGHT)
[Serializable]
+#endif
internal class DependencyModelExtended : DependencyModel
{
File [modified]: DependencyTrackingScope.cs
Delta lines: +3 -1
===================================================================
--- InversionOfControl/trunk/src/Castle.MicroKernel/DefaultKernel.cs
2009-12-17 18:42:17 UTC (rev 6443)
+++ InversionOfControl/trunk/src/Castle.MicroKernel/DefaultKernel.cs
2009-12-17 18:59:15 UTC (rev 6444)
@@ -145,7 +145,8 @@
resolver = new DefaultDependencyResolver(this);
resolver.Initialize(new
DependencyDelegate(RaiseDependencyResolving));
}
-
+
+#if (!SILVERLIGHT)
public DefaultKernel(SerializationInfo info, StreamingContext
context)
{
MemberInfo[] members =
FormatterServices.GetSerializableMembers(GetType(), context);
@@ -157,6 +158,7 @@
events[HandlerRegisteredEvent] = (Delegate)
info.GetValue("HandlerRegisteredEvent",
typeof(Delegate));
}
+#endif
#endregion
Directory:
/InversionOfControl/trunk/src/Castle.MicroKernel/SubSystems/Conversion/
==================================================================================
File [modified]: AbstractTypeConverter.cs
Delta lines: +2 -0
===================================================================
---
InversionOfControl/trunk/src/Castle.MicroKernel/SubSystems/Conversion/Converters/ArrayConverter.cs
2009-12-17 18:42:17 UTC (rev 6443)
+++
InversionOfControl/trunk/src/Castle.MicroKernel/SubSystems/Conversion/Converters/ArrayConverter.cs
2009-12-17 18:59:15 UTC (rev 6444)
@@ -17,7 +17,9 @@
using System;
using Castle.Core.Configuration;
+#if (!SILVERLIGHT)
[Serializable]
+#endif
public class ArrayConverter : AbstractTypeConverter
{
File [modified]: DefaultConversionManager.cs
Delta lines: +4 -0
===================================================================
---
InversionOfControl/trunk/src/Castle.MicroKernel/SubSystems/Naming/BinaryTreeComponentName.cs
2009-12-17 18:42:17 UTC (rev 6443)
+++
InversionOfControl/trunk/src/Castle.MicroKernel/SubSystems/Naming/BinaryTreeComponentName.cs
2009-12-17 18:59:15 UTC (rev 6444)
@@ -17,7 +17,9 @@
using System;
using System.Collections.Generic;
+#if (!SILVERLIGHT)
[Serializable]
+#endif
public class BinaryTreeComponentName
{
private TreeNode root;
@@ -294,7 +296,9 @@
}
+#if (!SILVERLIGHT)
[Serializable]
+#endif
internal class TreeNode
{
Directory:
/InversionOfControl/trunk/src/Castle.MicroKernel/SubSystems/Conversion/Converters/
=============================================================================================
File [modified]: ArrayConverter.cs
Delta lines: +2 -0
===================================================================
---
InversionOfControl/trunk/src/Castle.MicroKernel/SubSystems/Conversion/Converters/ComponentConverter.cs
2009-12-17 18:42:17 UTC (rev 6443)
+++
InversionOfControl/trunk/src/Castle.MicroKernel/SubSystems/Conversion/Converters/ComponentConverter.cs
2009-12-17 18:59:15 UTC (rev 6444)
@@ -20,7 +20,9 @@
using Castle.Core;
using Castle.Core.Configuration;
+#if (!SILVERLIGHT)
[Serializable]
+#endif
public class ComponentConverter : AbstractTypeConverter,
IKernelDependentConverter
{
File [modified]: ComponentConverter.cs
Delta lines: +2 -0
===================================================================
---
InversionOfControl/trunk/src/Castle.MicroKernel/SubSystems/Conversion/Converters/ComponentModelConverter.cs
2009-12-17 18:42:17 UTC (rev 6443)
+++
InversionOfControl/trunk/src/Castle.MicroKernel/SubSystems/Conversion/Converters/ComponentModelConverter.cs
2009-12-17 18:59:15 UTC (rev 6444)
@@ -21,7 +21,9 @@
/// <summary>
/// Attempts to utilize an existing <see cref="TypeConverter"/> for
conversion
/// </summary>
+#if (!SILVERLIGHT)
[Serializable]
+#endif
public class ComponentModelConverter : AbstractTypeConverter
{
File [modified]: ComponentModelConverter.cs
Delta lines: +2 -0
===================================================================
---
InversionOfControl/trunk/src/Castle.MicroKernel/SubSystems/Conversion/Converters/DefaultComplexConverter.cs
2009-12-17 18:42:17 UTC (rev 6443)
+++
InversionOfControl/trunk/src/Castle.MicroKernel/SubSystems/Conversion/Converters/DefaultComplexConverter.cs
2009-12-17 18:59:15 UTC (rev 6444)
@@ -20,7 +20,9 @@
using Castle.MicroKernel;
using Castle.MicroKernel.SubSystems.Conversion;
+#if (!SILVERLIGHT)
[Serializable]
+#endif
public class DefaultComplexConverter : AbstractTypeConverter
{
File [modified]: DefaultComplexConverter.cs
Delta lines: +2 -0
===================================================================
---
InversionOfControl/trunk/src/Castle.MicroKernel/SubSystems/Conversion/Converters/DictionaryConverter.cs
2009-12-17 18:42:17 UTC (rev 6443)
+++
InversionOfControl/trunk/src/Castle.MicroKernel/SubSystems/Conversion/Converters/DictionaryConverter.cs
2009-12-17 18:59:15 UTC (rev 6444)
@@ -22,7 +22,9 @@
using Castle.Core.Configuration;
+#if (!SILVERLIGHT)
[Serializable]
+#endif
public class DictionaryConverter : AbstractTypeConverter
{
File [modified]: DictionaryConverter.cs
Delta lines: +2 -0
===================================================================
---
InversionOfControl/trunk/src/Castle.MicroKernel/SubSystems/Conversion/Converters/EnumConverter.cs
2009-12-17 18:42:17 UTC (rev 6443)
+++
InversionOfControl/trunk/src/Castle.MicroKernel/SubSystems/Conversion/Converters/EnumConverter.cs
2009-12-17 18:59:15 UTC (rev 6444)
@@ -21,7 +21,9 @@
/// <summary>
/// Converts a string representation to an enum value
/// </summary>
+#if (!SILVERLIGHT)
[Serializable]
+#endif
public class EnumConverter : AbstractTypeConverter
{
File [modified]: EnumConverter.cs
Delta lines: +2 -0
===================================================================
---
InversionOfControl/trunk/src/Castle.MicroKernel/SubSystems/Conversion/Converters/ListConverter.cs
2009-12-17 18:42:17 UTC (rev 6443)
+++
InversionOfControl/trunk/src/Castle.MicroKernel/SubSystems/Conversion/Converters/ListConverter.cs
2009-12-17 18:59:15 UTC (rev 6444)
@@ -23,7 +23,9 @@
using Castle.Core.Configuration;
+#if (!SILVERLIGHT)
[Serializable]
+#endif
public class ListConverter : AbstractTypeConverter
{
File [modified]: ListConverter.cs
Delta lines: +2 -0
===================================================================
---
InversionOfControl/trunk/src/Castle.MicroKernel/SubSystems/Conversion/Converters/PrimitiveConverter.cs
2009-12-17 18:42:17 UTC (rev 6443)
+++
InversionOfControl/trunk/src/Castle.MicroKernel/SubSystems/Conversion/Converters/PrimitiveConverter.cs
2009-12-17 18:59:15 UTC (rev 6444)
@@ -20,7 +20,9 @@
/// <summary>
/// Implements all standard conversions.
/// </summary>
+#if (!SILVERLIGHT)
[Serializable]
+#endif
public class PrimitiveConverter : AbstractTypeConverter
{
File [modified]: PrimitiveConverter.cs
Delta lines: +2 -0
===================================================================
---
InversionOfControl/trunk/src/Castle.MicroKernel/SubSystems/Conversion/Converters/TimeSpanConverter.cs
2009-12-17 18:42:17 UTC (rev 6443)
+++
InversionOfControl/trunk/src/Castle.MicroKernel/SubSystems/Conversion/Converters/TimeSpanConverter.cs
2009-12-17 18:59:15 UTC (rev 6444)
@@ -16,7 +16,9 @@
{
using System;
+#if (!SILVERLIGHT)
[Serializable]
+#endif
public class TimeSpanConverter : AbstractTypeConverter
{
File [modified]: TimeSpanConverter.cs
Delta lines: +2 -0
===================================================================
---
InversionOfControl/trunk/src/Castle.MicroKernel/SubSystems/Conversion/Converters/TypeNameConverter.cs
2009-12-17 18:42:17 UTC (rev 6443)
+++
InversionOfControl/trunk/src/Castle.MicroKernel/SubSystems/Conversion/Converters/TypeNameConverter.cs
2009-12-17 18:59:15 UTC (rev 6444)
@@ -21,7 +21,9 @@
/// <summary>
/// Convert a type name to a Type instance.
/// </summary>
+#if (!SILVERLIGHT)
[Serializable]
+#endif
public class TypeNameConverter : AbstractTypeConverter
{
File [modified]: TypeNameConverter.cs
Delta lines: +2 -0
===================================================================
---
InversionOfControl/trunk/src/Castle.MicroKernel/SubSystems/Conversion/DefaultConversionManager.cs
2009-12-17 18:42:17 UTC (rev 6443)
+++
InversionOfControl/trunk/src/Castle.MicroKernel/SubSystems/Conversion/DefaultConversionManager.cs
2009-12-17 18:59:15 UTC (rev 6444)
@@ -24,7 +24,9 @@
/// <summary>
/// Composition of all available conversion managers
/// </summary>
+#if (!SILVERLIGHT)
[Serializable]
+#endif
public class DefaultConversionManager : AbstractSubSystem,
IConversionManager, ITypeConverterContext
{
Directory: /InversionOfControl/trunk/src/Castle.MicroKernel/Exceptions/
=======================================================================
File [modified]: CircularDependencyException.cs
Delta lines: +5 -1
===================================================================
---
InversionOfControl/trunk/src/Castle.MicroKernel/Exceptions/ComponentNotFoundException.cs
2009-12-17 18:42:17 UTC (rev 6443)
+++
InversionOfControl/trunk/src/Castle.MicroKernel/Exceptions/ComponentNotFoundException.cs
2009-12-17 18:59:15 UTC (rev 6444)
@@ -22,7 +22,9 @@
/// cannot be satisfied because the component does not
/// exist in the container
/// </summary>
+#if (!SILVERLIGHT)
[Serializable]
+#endif
public class ComponentNotFoundException : Exception
{
/// <summary>
@@ -42,7 +44,8 @@
base( String.Format("No component for supporting the
service {0} was found", service.FullName) )
{
}
-
+
+#if (!SILVERLIGHT)
/// <summary>
/// Initializes a new instance of the <see
cref="ComponentNotFoundException"/> class.
/// </summary>
@@ -51,5 +54,6 @@
public ComponentNotFoundException(SerializationInfo info,
StreamingContext context) : base(info, context)
{
}
+#endif
}
File [modified]: ComponentNotFoundException.cs
Delta lines: +5 -1
===================================================================
---
InversionOfControl/trunk/src/Castle.MicroKernel/Exceptions/ComponentRegistrationException.cs
2009-12-17 18:42:17 UTC (rev 6443)
+++
InversionOfControl/trunk/src/Castle.MicroKernel/Exceptions/ComponentRegistrationException.cs
2009-12-17 18:59:15 UTC (rev 6444)
@@ -21,7 +21,9 @@
/// Exception threw when there is a problem
/// registering a component
/// </summary>
+#if (!SILVERLIGHT)
[Serializable]
+#endif
public class ComponentRegistrationException : Exception
{
/// <summary>
@@ -31,7 +33,8 @@
public ComponentRegistrationException(string message) :
base(message)
{
}
-
+
+#if (!SILVERLIGHT)
/// <summary>
/// Initializes a new instance of the <see
cref="ComponentRegistrationException"/> class.
/// </summary>
@@ -40,5 +43,6 @@
public ComponentRegistrationException(SerializationInfo info,
StreamingContext context) : base(info, context)
{
}
+#endif
}
File [modified]: ComponentRegistrationException.cs
Delta lines: +5 -1
===================================================================
---
InversionOfControl/trunk/src/Castle.MicroKernel/Exceptions/KernelException.cs
2009-12-17 18:42:17 UTC (rev 6443)
+++
InversionOfControl/trunk/src/Castle.MicroKernel/Exceptions/KernelException.cs
2009-12-17 18:59:15 UTC (rev 6444)
@@ -21,7 +21,9 @@
/// Exception threw by Kernel operations that failed
/// for some reason.
/// </summary>
+#if (!SILVERLIGHT)
[Serializable]
+#endif
public class KernelException : Exception
{
/// <summary>
@@ -40,7 +42,8 @@
public KernelException(string message, Exception
innerException) : base(message, innerException)
{
}
-
+
+#if (!SILVERLIGHT)
/// <summary>
/// Initializes a new instance of the <see
cref="KernelException"/> class.
/// </summary>
@@ -49,5 +52,6 @@
public KernelException(SerializationInfo info, StreamingContext
context) : base(info, context)
{
}
+#endif
}
File [modified]: KernelException.cs
Delta lines: +2 -0
===================================================================
--- InversionOfControl/trunk/src/Castle.MicroKernel/Handlers/AbstractHandler.cs
2009-12-17 18:42:17 UTC (rev 6443)
+++ InversionOfControl/trunk/src/Castle.MicroKernel/Handlers/AbstractHandler.cs
2009-12-17 18:59:15 UTC (rev 6444)
@@ -28,7 +28,9 @@
/// <summary>
/// Implements the basis of <see cref="IHandler"/>
/// </summary>
+#if (!SILVERLIGHT)
[Serializable]
+#endif
[DebuggerDisplay("Model: {ComponentModel.Service} /
{ComponentModel.Implementation} ")]
public abstract class AbstractHandler : MarshalByRefObject, IHandler,
IExposeDependencyInfo, IDisposable
Directory: /InversionOfControl/trunk/src/Castle.MicroKernel/Handlers/
=====================================================================
File [modified]: AbstractHandler.cs
Delta lines: +2 -0
===================================================================
---
InversionOfControl/trunk/src/Castle.MicroKernel/Handlers/DefaultGenericHandler.cs
2009-12-17 18:42:17 UTC (rev 6443)
+++
InversionOfControl/trunk/src/Castle.MicroKernel/Handlers/DefaultGenericHandler.cs
2009-12-17 18:59:15 UTC (rev 6444)
@@ -26,7 +26,9 @@
/// TODO: Consider refactoring AbstractHandler moving lifestylemanager
/// creation to DefaultHandler
/// </remarks>
+#if (!SILVERLIGHT)
[Serializable]
+#endif
public class DefaultGenericHandler : AbstractHandler
{
File [modified]: DefaultGenericHandler.cs
Delta lines: +2 -0
===================================================================
---
InversionOfControl/trunk/src/Castle.MicroKernel/Handlers/DefaultHandlerFactory.cs
2009-12-17 18:42:17 UTC (rev 6443)
+++
InversionOfControl/trunk/src/Castle.MicroKernel/Handlers/DefaultHandlerFactory.cs
2009-12-17 18:59:15 UTC (rev 6444)
@@ -21,7 +21,9 @@
/// <summary>
/// Summary description for DefaultHandlerFactory.
/// </summary>
+#if (!SILVERLIGHT)
[Serializable]
+#endif
public class DefaultHandlerFactory : IHandlerFactory
{
File [modified]: DefaultHandlerFactory.cs
Delta lines: +2 -0
===================================================================
---
InversionOfControl/trunk/src/Castle.MicroKernel/Lifestyle/AbstractLifestyleManager.cs
2009-12-17 18:42:17 UTC (rev 6443)
+++
InversionOfControl/trunk/src/Castle.MicroKernel/Lifestyle/AbstractLifestyleManager.cs
2009-12-17 18:59:15 UTC (rev 6444)
@@ -20,7 +20,9 @@
/// <summary>
/// Summary description for AbstractLifestyleManager.
/// </summary>
+#if (!SILVERLIGHT)
[Serializable]
+#endif
public abstract class AbstractLifestyleManager : ILifestyleManager
{
Directory:
/InversionOfControl/trunk/src/Castle.MicroKernel/ModelBuilder/Inspectors/
====================================================================================
File [modified]: ComponentActivatorInspector.cs
Delta lines: +2 -0
===================================================================
---
InversionOfControl/trunk/src/Castle.MicroKernel/ModelBuilder/Inspectors/ComponentProxyInspector.cs
2009-12-17 18:42:17 UTC (rev 6443)
+++
InversionOfControl/trunk/src/Castle.MicroKernel/ModelBuilder/Inspectors/ComponentProxyInspector.cs
2009-12-17 18:59:15 UTC (rev 6444)
@@ -29,7 +29,9 @@
/// attribute.
/// </para>
/// </summary>
+#if (!SILVERLIGHT)
[Serializable]
+#endif
public class ComponentProxyInspector :
IContributeComponentModelConstruction
{
File [modified]: ComponentProxyInspector.cs
Delta lines: +2 -0
===================================================================
---
InversionOfControl/trunk/src/Castle.MicroKernel/ModelBuilder/Inspectors/ConfigurationModelInspector.cs
2009-12-17 18:42:17 UTC (rev 6443)
+++
InversionOfControl/trunk/src/Castle.MicroKernel/ModelBuilder/Inspectors/ConfigurationModelInspector.cs
2009-12-17 18:59:15 UTC (rev 6444)
@@ -22,7 +22,9 @@
/// Uses the ConfigurationStore registered in the kernel to obtain
/// an <see cref="IConfiguration"/> associated with the component.
/// </summary>
+#if (!SILVERLIGHT)
[Serializable]
+#endif
public class ConfigurationModelInspector :
IContributeComponentModelConstruction
{
File [modified]: ConfigurationModelInspector.cs
Delta lines: +2 -0
===================================================================
---
InversionOfControl/trunk/src/Castle.MicroKernel/ModelBuilder/Inspectors/ConfigurationParametersInspector.cs
2009-12-17 18:42:17 UTC (rev 6443)
+++
InversionOfControl/trunk/src/Castle.MicroKernel/ModelBuilder/Inspectors/ConfigurationParametersInspector.cs
2009-12-17 18:59:15 UTC (rev 6444)
@@ -24,7 +24,9 @@
/// configuration. For each child it, a ParameterModel is created
/// and added to ComponentModel's Parameters collection
/// </summary>
+#if (!SILVERLIGHT)
[Serializable]
+#endif
public class ConfigurationParametersInspector :
IContributeComponentModelConstruction
{
File [modified]: ConfigurationParametersInspector.cs
Delta lines: +2 -0
===================================================================
---
InversionOfControl/trunk/src/Castle.MicroKernel/Resolvers/DefaultDependencyResolver.cs
2009-12-17 18:42:17 UTC (rev 6443)
+++
InversionOfControl/trunk/src/Castle.MicroKernel/Resolvers/DefaultDependencyResolver.cs
2009-12-17 18:59:15 UTC (rev 6444)
@@ -25,7 +25,9 @@
/// This implementation is quite simple, but still should be useful
/// for 99% of situations.
/// </summary>
+#if (!SILVERLIGHT)
[Serializable]
+#endif
public class DefaultDependencyResolver : IDependencyResolver
{
Directory: /InversionOfControl/trunk/src/Castle.MicroKernel/Lifestyle/
======================================================================
File [modified]: AbstractLifestyleManager.cs
Delta lines: +11 -1
===================================================================
---
InversionOfControl/trunk/src/Castle.MicroKernel/Lifestyle/PerThreadLifestyleManager.cs
2009-12-17 18:42:17 UTC (rev 6443)
+++
InversionOfControl/trunk/src/Castle.MicroKernel/Lifestyle/PerThreadLifestyleManager.cs
2009-12-17 18:59:15 UTC (rev 6444)
@@ -23,13 +23,21 @@
/// <summary>
/// Summary description for PerThreadLifestyleManager.
/// </summary>
+#if (SILVERLIGHT)
+ public class PerThreadLifestyleManager : AbstractLifestyleManager
+#else
[Serializable]
public class PerThreadLifestyleManager : AbstractLifestyleManager,
IDeserializationCallback
+#endif
{
+#if (!SILVERLIGHT)
[NonSerialized]
+#endif
private static LocalDataStoreSlot slot =
Thread.AllocateNamedDataSlot("CastlePerThread");
+#if (!SILVERLIGHT)
[NonSerialized]
+#endif
private IList<object> instances = new List<object>();
/// <summary>
@@ -79,11 +87,13 @@
// Do nothing.
return false;
}
-
+
+#if (!SILVERLIGHT)
public void OnDeserialization(object sender)
{
slot = Thread.AllocateNamedDataSlot("CastlePerThread");
instances = new List<object>();
}
+#endif
}
File [modified]: PerThreadLifestyleManager.cs
Delta lines: +2 -0
===================================================================
---
InversionOfControl/trunk/src/Castle.MicroKernel/Lifestyle/PerWebRequestLifestyleManager.cs
2009-12-17 18:42:17 UTC (rev 6443)
+++
InversionOfControl/trunk/src/Castle.MicroKernel/Lifestyle/PerWebRequestLifestyleManager.cs
2009-12-17 18:59:15 UTC (rev 6444)
@@ -23,7 +23,9 @@
/// Implements a Lifestyle Manager for Web Apps that
/// create at most one object per web request.
/// </summary>
+#if (!SILVERLIGHT)
[Serializable]
+#endif
public class PerWebRequestLifestyleManager : AbstractLifestyleManager
{
File [modified]: PerWebRequestLifestyleManager.cs
Delta lines: +2 -0
===================================================================
---
InversionOfControl/trunk/src/Castle.MicroKernel/Lifestyle/Pool/DefaultPool.cs
2009-12-17 18:42:17 UTC (rev 6443)
+++
InversionOfControl/trunk/src/Castle.MicroKernel/Lifestyle/Pool/DefaultPool.cs
2009-12-17 18:59:15 UTC (rev 6444)
@@ -22,7 +22,9 @@
using Castle.Core;
+#if (!SILVERLIGHT)
[Serializable]
+#endif
public class DefaultPool : IPool, IDisposable
{
Directory: /InversionOfControl/trunk/src/Castle.MicroKernel/SubSystems/Naming/
==============================================================================
File [modified]: BinaryTreeComponentName.cs
Delta lines: +10 -5
===================================================================
---
InversionOfControl/trunk/src/Castle.MicroKernel/SubSystems/Naming/ComponentName.cs
2009-12-17 18:42:17 UTC (rev 6443)
+++
InversionOfControl/trunk/src/Castle.MicroKernel/SubSystems/Naming/ComponentName.cs
2009-12-17 18:59:15 UTC (rev 6444)
@@ -19,8 +19,12 @@
using System.Text;
using System.Runtime.Serialization;
+#if (SILVERLIGHT)
+ public class ComponentName
+#else
[Serializable]
public class ComponentName : ISerializable
+#endif
{
protected String internalService;
protected String internalliteralProperties = String.Empty;
@@ -53,7 +57,8 @@
{
get { return internalproperties; }
}
-
+
+#if (!SILVERLIGHT)
/// <summary>
/// Serialization constructor.
/// </summary>
@@ -70,6 +75,7 @@
SetupProperties(props);
}
}
+#endif
/// <summary>
/// Parses the full name extracting the service and properties.
@@ -231,14 +237,13 @@
internalService,
internalliteralProperties);
}
- #region ISerializable Members
-
+
+#if (!SILVERLIGHT)
public void GetObjectData(SerializationInfo info,
StreamingContext context)
{
info.AddValue("service", internalService);
info.AddValue("props", internalliteralProperties);
}
-
- #endregion
+#endif
}
File [modified]: ComponentName.cs
Delta lines: +2 -0
===================================================================
---
InversionOfControl/trunk/src/Castle.MicroKernel/SubSystems/Naming/DefaultNamingSubSystem.cs
2009-12-17 18:42:17 UTC (rev 6443)
+++
InversionOfControl/trunk/src/Castle.MicroKernel/SubSystems/Naming/DefaultNamingSubSystem.cs
2009-12-17 18:59:15 UTC (rev 6444)
@@ -25,7 +25,9 @@
/// Keeps key map as a list dictionary to maintain order.
/// Does not support a query string.
/// </summary>
+#if (!SILVERLIGHT)
[Serializable]
+#endif
public class DefaultNamingSubSystem : AbstractSubSystem,
INamingSubSystem
{
File [modified]: DefaultNamingSubSystem.cs
Delta lines: +2 -0
===================================================================
---
InversionOfControl/trunk/src/Castle.MicroKernel/SubSystems/Naming/KeySearchNamingSubSystem.cs
2009-12-17 18:42:17 UTC (rev 6443)
+++
InversionOfControl/trunk/src/Castle.MicroKernel/SubSystems/Naming/KeySearchNamingSubSystem.cs
2009-12-17 18:59:15 UTC (rev 6444)
@@ -27,7 +27,9 @@
/// key to use for service resolution. If no Predicate matches, the
default
/// resolution occurs.
/// </summary>
+#if (!SILVERLIGHT)
[Serializable]
+#endif
public class KeySearchNamingSubSystem : DefaultNamingSubSystem
{
File [modified]: KeySearchNamingSubSystem.cs
Delta lines: +2 -0
===================================================================
---
InversionOfControl/trunk/src/Castle.MicroKernel/SubSystems/Naming/NamingPartsSubSystem.cs
2009-12-17 18:42:17 UTC (rev 6443)
+++
InversionOfControl/trunk/src/Castle.MicroKernel/SubSystems/Naming/NamingPartsSubSystem.cs
2009-12-17 18:59:15 UTC (rev 6444)
@@ -40,7 +40,9 @@
/// protocol:*
/// </code>
/// </example>
+#if (!SILVERLIGHT)
[Serializable]
+#endif
public class NamingPartsSubSystem : DefaultNamingSubSystem
{
File [modified]: NamingPartsSubSystem.cs
Delta lines: +5 -1
===================================================================
--- InversionOfControl/trunk/src/Castle.Windsor/InitializationException.cs
2009-12-17 18:42:17 UTC (rev 6443)
+++ InversionOfControl/trunk/src/Castle.Windsor/InitializationException.cs
2009-12-17 18:59:15 UTC (rev 6444)
@@ -17,7 +17,9 @@
using System;
using System.Runtime.Serialization;
+#if (!SILVERLIGHT)
[Serializable]
+#endif
public class InitializationException : Exception
{
public InitializationException()
@@ -31,9 +33,11 @@
public InitializationException(Exception innerException) :
base("The initialization of the container threw an exception", innerException)
{
}
-
+
+#if (!SILVERLIGHT)
public InitializationException(SerializationInfo info,
StreamingContext context) : base(info, context)
{
}
+#endif
}
Directory: /InversionOfControl/trunk/src/Castle.MicroKernel/Lifestyle/Pool/
===========================================================================
File [modified]: DefaultPool.cs
Delta lines: +2 -0
===================================================================
---
InversionOfControl/trunk/src/Castle.MicroKernel/ModelBuilder/Inspectors/ComponentActivatorInspector.cs
2009-12-17 18:42:17 UTC (rev 6443)
+++
InversionOfControl/trunk/src/Castle.MicroKernel/ModelBuilder/Inspectors/ComponentActivatorInspector.cs
2009-12-17 18:59:15 UTC (rev 6444)
@@ -28,7 +28,9 @@
/// If nothing could be found it wont touch the model. In this case is
up to
/// the kernel to establish a default component activator for
components.
/// </remarks>
+#if (!SILVERLIGHT)
[Serializable]
+#endif
public class ComponentActivatorInspector :
IContributeComponentModelConstruction
{
Directory: /InversionOfControl/trunk/src/Castle.Windsor/Proxy/
==============================================================
File [modified]: DefaultProxyFactory.cs
Delta lines: +2 -0
===================================================================
--- InversionOfControl/trunk/src/Castle.Windsor/WindsorContainer.cs
2009-12-17 18:42:17 UTC (rev 6443)
+++ InversionOfControl/trunk/src/Castle.Windsor/WindsorContainer.cs
2009-12-17 18:59:15 UTC (rev 6444)
@@ -30,7 +30,9 @@
/// Implementation of <see cref="IWindsorContainer"/>
/// which delegates to <see cref="IKernel"/> implementation.
/// </summary>
+#if (!SILVERLIGHT)
[Serializable]
+#endif
public class WindsorContainer : MarshalByRefObject, IWindsorContainer
{
Directory: /InversionOfControl/trunk/src/Castle.MicroKernel/Resolvers/
======================================================================
File [modified]: DefaultDependencyResolver.cs
Delta lines: +2 -0
===================================================================
---
InversionOfControl/trunk/src/Castle.MicroKernel/SubSystems/Configuration/DefaultConfigurationStore.cs
2009-12-17 18:42:17 UTC (rev 6443)
+++
InversionOfControl/trunk/src/Castle.MicroKernel/SubSystems/Configuration/DefaultConfigurationStore.cs
2009-12-17 18:59:15 UTC (rev 6444)
@@ -29,7 +29,9 @@
/// Its only purpose is to serve as a base class for subclasses
/// that might obtain the configuration node from anywhere.
/// </summary>
+#if (!SILVERLIGHT)
[Serializable]
+#endif
public class DefaultConfigurationStore : AbstractSubSystem,
IConfigurationStore
{
--
You received this message because you are subscribed to the Google Groups
"Castle Project Commits" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/castle-project-commits?hl=en.
