User: johnsimons
Date: 2010/01/28 02:18 AM
Removed:
/Facilities/Wcf/branches/WcfIntegration-Silverlight/Castle.Facilities.WcfIntegration.Silverlight/Client/Async/
Modified:
/Facilities/Wcf/branches/WcfIntegration-Silverlight/Castle.Facilities.WcfIntegration.Silverlight/
Castle.Facilities.WcfIntegration.Silverlight.csproj, WcfContextChannel.cs
/Facilities/Wcf/branches/WcfIntegration-Silverlight/Castle.Facilities.WcfIntegration.Silverlight/Behaviors/
WcfChannelExtensions.cs, WcfExplicitExtension.cs
/Facilities/Wcf/branches/WcfIntegration-Silverlight/Castle.Facilities.WcfIntegration.Silverlight/Client/
AbstractChannelBuilder.Generic.cs, WcfClientActivator.cs,
WcfClientExtension.cs, WcfClientModel.cs
/Facilities/Wcf/branches/WcfIntegration-Silverlight/Castle.Facilities.WcfIntegration.Silverlight/Client/Proxy/
WcfChannelHolder.cs, WcfProxyFactory.cs
/Facilities/Wcf/branches/WcfIntegration-Silverlight/Castle.Facilities.WcfIntegration.Silverlight/Internal/
WcfBurden.cs
Log:
Compilling :)
Now the tests!
File Changes:
Directory:
/Facilities/Wcf/branches/WcfIntegration-Silverlight/Castle.Facilities.WcfIntegration.Silverlight/Behaviors/
======================================================================================================================
File [modified]: WcfChannelExtensions.cs
Delta lines: +1 -0
===================================================================
---
Facilities/Wcf/branches/WcfIntegration-Silverlight/Castle.Facilities.WcfIntegration.Silverlight/Behaviors/WcfExplicitExtension.cs
2010-01-28 09:09:10 UTC (rev 6728)
+++
Facilities/Wcf/branches/WcfIntegration-Silverlight/Castle.Facilities.WcfIntegration.Silverlight/Behaviors/WcfExplicitExtension.cs
2010-01-28 09:18:30 UTC (rev 6729)
@@ -12,6 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+
namespace Castle.Facilities.WcfIntegration
{
File [modified]: WcfExplicitExtension.cs
Delta lines: +0 -15
===================================================================
---
Facilities/Wcf/branches/WcfIntegration-Silverlight/Castle.Facilities.WcfIntegration.Silverlight/Castle.Facilities.WcfIntegration.Silverlight.csproj
2010-01-28 09:09:10 UTC (rev 6728)
+++
Facilities/Wcf/branches/WcfIntegration-Silverlight/Castle.Facilities.WcfIntegration.Silverlight/Castle.Facilities.WcfIntegration.Silverlight.csproj
2010-01-28 09:18:30 UTC (rev 6729)
@@ -76,21 +76,6 @@
<Compile Include="Client\AbstractChannelBuilder.Generic.cs" />
<Compile Include="Client\AbstractChannelFactoryAware.cs" />
<Compile Include="Client\AbstractChannelFactoryBuilder.cs" />
- <Compile Include="Client\Async\AsyncChannelFactoryBuilder.cs" />
- <Compile Include="Client\Async\AsyncWcfCall.cs" />
- <Compile Include="Client\Async\AsyncWcfCall.Void.cs" />
- <Compile Include="Client\Async\AsyncWcfCallBase.cs" />
- <Compile Include="Client\Async\AsyncWcfCallContext.cs" />
- <Compile Include="Client\Async\IWcfAsyncCall.cs" />
- <Compile Include="Client\Async\TypeSystem\AsyncMethod.cs" />
- <Compile Include="Client\Async\TypeSystem\AsyncMethodParameter.cs" />
- <Compile Include="Client\Async\TypeSystem\AsyncType.cs" />
- <Compile Include="Client\Async\TypeSystem\AttributeHelpers.cs" />
- <Compile Include="Client\Async\TypeSystem\BeginMethod.cs" />
- <Compile Include="Client\Async\TypeSystem\EndMethod.cs" />
- <Compile Include="Client\Async\TypeSystem\HandleProvider.cs" />
- <Compile Include="Client\Async\WcfAsync.cs" />
- <Compile Include="Client\Async\WcfRemotingAsyncInterceptor.cs" />
<Compile Include="Client\ChannelFactoryExtensions.cs" />
<Compile Include="Client\ChannelFactoryHolder.cs" />
Directory:
/Facilities/Wcf/branches/WcfIntegration-Silverlight/Castle.Facilities.WcfIntegration.Silverlight/
============================================================================================================
File [modified]: Castle.Facilities.WcfIntegration.Silverlight.csproj
Delta lines: +2 -1
===================================================================
---
Facilities/Wcf/branches/WcfIntegration-Silverlight/Castle.Facilities.WcfIntegration.Silverlight/Client/AbstractChannelBuilder.Generic.cs
2010-01-28 09:09:10 UTC (rev 6728)
+++
Facilities/Wcf/branches/WcfIntegration-Silverlight/Castle.Facilities.WcfIntegration.Silverlight/Client/AbstractChannelBuilder.Generic.cs
2010-01-28 09:18:30 UTC (rev 6729)
@@ -19,6 +19,7 @@
using System.ServiceModel;
using System.ServiceModel.Channels;
using System.ServiceModel.Description;
+
using Castle.Facilities.WcfIntegration.Internal;
using Castle.MicroKernel;
@@ -130,7 +131,7 @@
protected virtual ChannelCreator CreateChannelCreator(Type
contract, M clientModel,
params object[] channelFactoryArgs)
{
- Type type =
typeof(ChannelFactory<>).MakeGenericType(new Type[] { contract });
+ Type type =
typeof(ChannelFactory<>).MakeGenericType(new [] { contract });
var channelFactory =
ChannelFactoryBuilder.CreateChannelFactory(type, clientModel,
channelFactoryArgs);
ConfigureChannelFactory(channelFactory);
File [modified]: WcfContextChannel.cs
Delta lines: +0 -0
===================================================================
Directory:
/Facilities/Wcf/branches/WcfIntegration-Silverlight/Castle.Facilities.WcfIntegration.Silverlight/Client/
===================================================================================================================
File [modified]: AbstractChannelBuilder.Generic.cs
Delta lines: +1 -0
===================================================================
---
Facilities/Wcf/branches/WcfIntegration-Silverlight/Castle.Facilities.WcfIntegration.Silverlight/Client/Proxy/WcfChannelHolder.cs
2010-01-28 09:09:10 UTC (rev 6728)
+++
Facilities/Wcf/branches/WcfIntegration-Silverlight/Castle.Facilities.WcfIntegration.Silverlight/Client/Proxy/WcfChannelHolder.cs
2010-01-28 09:18:30 UTC (rev 6729)
@@ -18,6 +18,7 @@
using System.Linq;
using System.Runtime.CompilerServices;
using System.ServiceModel;
+
using Castle.Facilities.WcfIntegration.Internal;
File [modified]: WcfClientActivator.cs
Delta lines: +1 -0
===================================================================
---
Facilities/Wcf/branches/WcfIntegration-Silverlight/Castle.Facilities.WcfIntegration.Silverlight/Client/WcfClientExtension.cs
2010-01-28 09:09:10 UTC (rev 6728)
+++
Facilities/Wcf/branches/WcfIntegration-Silverlight/Castle.Facilities.WcfIntegration.Silverlight/Client/WcfClientExtension.cs
2010-01-28 09:18:30 UTC (rev 6729)
@@ -12,6 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+
namespace Castle.Facilities.WcfIntegration
{
File [modified]: WcfClientExtension.cs
Delta lines: +1 -9
===================================================================
---
Facilities/Wcf/branches/WcfIntegration-Silverlight/Castle.Facilities.WcfIntegration.Silverlight/Client/WcfClientModel.cs
2010-01-28 09:09:10 UTC (rev 6728)
+++
Facilities/Wcf/branches/WcfIntegration-Silverlight/Castle.Facilities.WcfIntegration.Silverlight/Client/WcfClientModel.cs
2010-01-28 09:18:30 UTC (rev 6729)
@@ -21,11 +21,9 @@
{
private IWcfEndpoint endpoint;
private List<IWcfExtension> extensions;
- protected bool wantsAsync;
protected WcfClientModelBase()
{
- wantsAsync = true;
}
protected WcfClientModelBase(IWcfEndpoint endpoint) : this()
@@ -35,7 +33,7 @@
public bool WantsAsyncCapability
{
- get { return wantsAsync; }
+ get { return false; }
}
#region IWcfClientModel Members
@@ -93,12 +91,6 @@
{
}
- public T WithoutAsyncCapability()
- {
- wantsAsync = false;
- return (T)this;
- }
-
public T AddExtensions(params object[] extensions)
{
File [modified]: WcfClientModel.cs
Delta lines: +1 -0
===================================================================
---
Facilities/Wcf/branches/WcfIntegration-Silverlight/Castle.Facilities.WcfIntegration.Silverlight/Internal/WcfBurden.cs
2010-01-28 09:09:10 UTC (rev 6728)
+++
Facilities/Wcf/branches/WcfIntegration-Silverlight/Castle.Facilities.WcfIntegration.Silverlight/Internal/WcfBurden.cs
2010-01-28 09:18:30 UTC (rev 6729)
@@ -13,6 +13,7 @@
{
using System.Collections.Generic;
using System.ServiceModel;
+
using Castle.Facilities.WcfIntegration.Behaviors;
using Castle.MicroKernel;
Directory:
/Facilities/Wcf/branches/WcfIntegration-Silverlight/Castle.Facilities.WcfIntegration.Silverlight/Internal/
=====================================================================================================================
File [modified]: WcfBurden.cs
Delta lines: +0 -1
===================================================================
---
Facilities/Wcf/branches/WcfIntegration-Silverlight/Castle.Facilities.WcfIntegration.Silverlight/WcfContextChannel.cs
2010-01-28 09:09:10 UTC (rev 6728)
+++
Facilities/Wcf/branches/WcfIntegration-Silverlight/Castle.Facilities.WcfIntegration.Silverlight/WcfContextChannel.cs
2010-01-28 09:18:30 UTC (rev 6729)
@@ -15,7 +15,6 @@
namespace Castle.Facilities.WcfIntegration
{
using System.ServiceModel;
- using Castle.Facilities.WcfIntegration.Proxy;
public static class WcfContextChannel
Directory:
/Facilities/Wcf/branches/WcfIntegration-Silverlight/Castle.Facilities.WcfIntegration.Silverlight/Client/Proxy/
=========================================================================================================================
File [modified]: WcfChannelHolder.cs
Delta lines: +4 -27
===================================================================
---
Facilities/Wcf/branches/WcfIntegration-Silverlight/Castle.Facilities.WcfIntegration.Silverlight/Client/Proxy/WcfProxyFactory.cs
2010-01-28 09:09:10 UTC (rev 6728)
+++
Facilities/Wcf/branches/WcfIntegration-Silverlight/Castle.Facilities.WcfIntegration.Silverlight/Client/Proxy/WcfProxyFactory.cs
2010-01-28 09:18:30 UTC (rev 6729)
@@ -12,8 +12,6 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-using Castle.Facilities.WcfIntegration.Async;
-using Castle.Facilities.WcfIntegration.Async.TypeSystem;
namespace Castle.Facilities.WcfIntegration.Proxy
{
@@ -22,7 +20,6 @@
using Castle.Core;
using Castle.Core.Interceptor;
using Castle.DynamicProxy;
- using Castle.Facilities.WcfIntegration.Internal;
using Castle.MicroKernel;
using Castle.MicroKernel.Proxy;
using Castle.Windsor.Proxy;
@@ -50,10 +47,9 @@
throw new ArgumentException("Given instance is
not an IWcfChannelHolder", "instance");
}
- var isDuplex = IsDuplex(channelHolder);
var proxyOptions = ProxyUtil.ObtainProxyOptions(model,
true);
var generationOptions =
CreateProxyGenerationOptions(model.Service, proxyOptions);
- var additionalInterfaces = GetInterfaces(model.Service,
proxyOptions, isDuplex);
+ var additionalInterfaces = GetInterfaces(model.Service,
proxyOptions);
var interceptors = GetInterceptors(kernel, model,
context);
return
generator.CreateInterfaceProxyWithTarget(typeof(IWcfChannelHolder),
@@ -65,44 +61,25 @@
return true;
}
- protected bool IsDuplex(object realProxy)
+ protected virtual Type[] GetInterfaces(Type service,
ProxyOptions proxyOptions)
{
- var typeInfo = (IRemotingTypeInfo)realProxy;
- return
typeInfo.CanCastTo(typeof(IDuplexContextChannel), null);
- }
-
- protected virtual Type[] GetInterfaces(Type service,
ProxyOptions proxyOptions, bool isDuplex)
- {
var additionalInterfaces =
proxyOptions.AdditionalInterfaces ?? Type.EmptyTypes;
- Array.Resize(ref additionalInterfaces,
additionalInterfaces.Length + (isDuplex ? 3 : 2));
+ Array.Resize(ref additionalInterfaces,
additionalInterfaces.Length + 2);
int index = additionalInterfaces.Length;
additionalInterfaces[--index] = service;
additionalInterfaces[--index] = typeof(IClientChannel);
- if (isDuplex)
- {
- additionalInterfaces[--index] =
typeof(IDuplexContextChannel);
- }
-
return additionalInterfaces;
}
private IInterceptor[] GetInterceptors(IKernel kernel,
ComponentModel model, CreationContext context)
{
var interceptors = ObtainInterceptors(kernel, model,
context);
- var clientModel =
(IWcfClientModel)model.ExtendedProperties[WcfConstants.ClientModelKey];
- Array.Resize(ref interceptors, interceptors.Length +
(clientModel.WantsAsyncCapability ? 2 : 1));
+ Array.Resize(ref interceptors, interceptors.Length + 1);
int index = interceptors.Length;
interceptors[--index] = new
WcfRemotingInterceptor(clients);
- if (clientModel.WantsAsyncCapability)
- {
- var getAsyncType = WcfUtils.SafeInitialize(ref
asyncType,
- () =>
AsyncType.GetAsyncType(model.Service));
- interceptors[--index] = new
WcfRemotingAsyncInterceptor(getAsyncType, clients);
- }
-
return interceptors;
}
File [modified]: WcfProxyFactory.cs
Delta lines: +6 -7
===================================================================
---
Facilities/Wcf/branches/WcfIntegration-Silverlight/Castle.Facilities.WcfIntegration.Silverlight/Client/WcfClientActivator.cs
2010-01-28 09:09:10 UTC (rev 6728)
+++
Facilities/Wcf/branches/WcfIntegration-Silverlight/Castle.Facilities.WcfIntegration.Silverlight/Client/WcfClientActivator.cs
2010-01-28 09:18:30 UTC (rev 6729)
@@ -30,7 +30,7 @@
public class WcfClientActivator : DefaultComponentActivator
{
- private WcfProxyFactory proxyFactory;
+ private readonly WcfProxyFactory proxyFactory;
private ChannelCreator createChannel;
private IWcfBurden channelBurden;
@@ -86,8 +86,7 @@
}
catch (Exception ex)
{
- throw new
ComponentActivatorException("WcfClientActivator: could not proxy service " +
-
Model.Service.FullName, ex);
+ throw new
ComponentActivatorException(String.Format("WcfClientActivator: could not proxy
service {0}", Model.Service.FullName), ex);
}
}
@@ -136,12 +135,12 @@
return creator;
}
- private IWcfClientModel ObtainClientModel(ComponentModel model)
+ private static IWcfClientModel ObtainClientModel(ComponentModel
model)
{
return
(IWcfClientModel)model.ExtendedProperties[WcfConstants.ClientModelKey];
}
- private IWcfClientModel ObtainClientModel(ComponentModel model,
CreationContext context)
+ private static IWcfClientModel ObtainClientModel(ComponentModel
model, CreationContext context)
{
var clientModel =
WcfUtils.FindDependencies<IWcfClientModel>(context.AdditionalParameters)
.FirstOrDefault();
@@ -160,7 +159,7 @@
return clientModel;
}
- private void ValidateClientModel(IWcfClientModel clientModel,
ComponentModel model)
+ private static void ValidateClientModel(IWcfClientModel
clientModel, ComponentModel model)
{
Type contract;
@@ -192,7 +191,7 @@
}
}
- private ChannelCreator CreateChannelCreator(IKernel kernel,
ComponentModel model,
+ private static ChannelCreator CreateChannelCreator(IKernel
kernel, ComponentModel model,
IWcfClientModel clientModel, out IWcfBurden burden)
{
--
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.
