User: xtoff
Date: 2009/12/20 03:24 PM
Modified:
/InversionOfControl/trunk/src/Castle.MicroKernel/ModelBuilder/Inspectors/
ComponentActivatorInspector.cs, ComponentProxyInspector.cs
/InversionOfControl/trunk/src/Castle.MicroKernel/Proxy/
ProxyOptions.cs
Log:
- removed references to MBRO around proxies for Silverlight
File Changes:
Directory:
/InversionOfControl/trunk/src/Castle.MicroKernel/ModelBuilder/Inspectors/
====================================================================================
File [modified]: ComponentActivatorInspector.cs
Delta lines: +3 -1
===================================================================
---
InversionOfControl/trunk/src/Castle.MicroKernel/ModelBuilder/Inspectors/ComponentProxyInspector.cs
2009-12-20 22:09:51 UTC (rev 6506)
+++
InversionOfControl/trunk/src/Castle.MicroKernel/ModelBuilder/Inspectors/ComponentProxyInspector.cs
2009-12-20 22:24:31 UTC (rev 6507)
@@ -48,7 +48,7 @@
/// Reads the proxy behavior associated with the
/// component configuration/type and applies it to the model.
/// </summary>
- /// <exception
cref="System.Configuration.ConfigurationException">
+ /// <exception cref="System.Exception">
/// If the conversion fails
/// </exception>
/// <param name="kernel"></param>
@@ -124,7 +124,9 @@
ProxyOptions options =
ProxyUtil.ObtainProxyOptions(model, true);
options.UseSingleInterfaceProxy =
behavior.UseSingleInterfaceProxy;
+#if (!SILVERLIGHT)
options.UseMarshalByRefAsBaseClass =
behavior.UseMarshalByRefProxy;
+#endif
options.AddAdditionalInterfaces(behavior.AdditionalInterfaces);
}
File [modified]: ComponentProxyInspector.cs
Delta lines: +4 -0
===================================================================
--- InversionOfControl/trunk/src/Castle.MicroKernel/Proxy/ProxyOptions.cs
2009-12-20 22:09:51 UTC (rev 6506)
+++ InversionOfControl/trunk/src/Castle.MicroKernel/Proxy/ProxyOptions.cs
2009-12-20 22:24:31 UTC (rev 6507)
@@ -29,7 +29,9 @@
private List<Type> interfaceList;
private List<object> mixInList;
private bool useSingleInterfaceProxy;
+#if (!SILVERLIGHT)
private bool useMarshalByRefAsBaseClass;
+#endif
private bool allowChangeTarget;
private bool omitTarget;
@@ -88,6 +90,7 @@
set { useSingleInterfaceProxy = value; }
}
+#if (!SILVERLIGHT)
/// <summary>
/// Determines if the interface proxied component should
inherit
/// from <see cref="MarshalByRefObject"/>
@@ -97,6 +100,7 @@
get { return useMarshalByRefAsBaseClass; }
set { useMarshalByRefAsBaseClass = value; }
}
+#endif
/// <summary>
Directory: /InversionOfControl/trunk/src/Castle.MicroKernel/Proxy/
==================================================================
File [modified]: ProxyOptions.cs
Delta lines: +0 -0
===================================================================
--
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.
