Author: atsushi
Date: 2008-02-14 12:27:33 -0500 (Thu, 14 Feb 2008)
New Revision: 95665
Modified:
trunk/olive/class/System.ServiceModel.Web/System.ServiceModel.Description/ChangeLog
trunk/olive/class/System.ServiceModel.Web/System.ServiceModel.Description/WebHttpBehavior.cs
trunk/olive/class/System.ServiceModel.Web/System.ServiceModel.Dispatcher/ChangeLog
trunk/olive/class/System.ServiceModel.Web/System.ServiceModel.Dispatcher/WebMessageFormatter.cs
Log:
2008-02-14 Atsushi Enomoto <[EMAIL PROTECTED]>
* WebHttpBehavior.cs : pass itself to WebMessageFormatter too.
* WebMessageFormatter.cs : pass WebHttpBehavior too.
Modified:
trunk/olive/class/System.ServiceModel.Web/System.ServiceModel.Description/ChangeLog
===================================================================
---
trunk/olive/class/System.ServiceModel.Web/System.ServiceModel.Description/ChangeLog
2008-02-14 17:25:21 UTC (rev 95664)
+++
trunk/olive/class/System.ServiceModel.Web/System.ServiceModel.Description/ChangeLog
2008-02-14 17:27:33 UTC (rev 95665)
@@ -1,5 +1,9 @@
2008-02-14 Atsushi Enomoto <[EMAIL PROTECTED]>
+ * WebHttpBehavior.cs : pass itself to WebMessageFormatter too.
+
+2008-02-14 Atsushi Enomoto <[EMAIL PROTECTED]>
+
* WebHttpBehavior.cs : now WebMessageFormatter requires
QueryStringConverter. Hence implemented GetQueryStringConverter().
Modified:
trunk/olive/class/System.ServiceModel.Web/System.ServiceModel.Description/WebHttpBehavior.cs
===================================================================
---
trunk/olive/class/System.ServiceModel.Web/System.ServiceModel.Description/WebHttpBehavior.cs
2008-02-14 17:25:21 UTC (rev 95664)
+++
trunk/olive/class/System.ServiceModel.Web/System.ServiceModel.Description/WebHttpBehavior.cs
2008-02-14 17:27:33 UTC (rev 95665)
@@ -108,25 +108,25 @@
[MonoTODO]
protected virtual IClientMessageFormatter
GetReplyClientFormatter (OperationDescription operationDescription,
ServiceEndpoint endpoint)
{
- return new WebMessageFormatter.ReplyClientFormatter
(operationDescription, endpoint, GetQueryStringConverter
(operationDescription));
+ return new WebMessageFormatter.ReplyClientFormatter
(operationDescription, endpoint, GetQueryStringConverter
(operationDescription), this);
}
[MonoTODO]
protected virtual IDispatchMessageFormatter
GetReplyDispatchFormatter (OperationDescription operationDescription,
ServiceEndpoint endpoint)
{
- return new WebMessageFormatter.ReplyDispatchFormatter
(operationDescription, endpoint, GetQueryStringConverter
(operationDescription));
+ return new WebMessageFormatter.ReplyDispatchFormatter
(operationDescription, endpoint, GetQueryStringConverter
(operationDescription), this);
}
[MonoTODO]
protected virtual IClientMessageFormatter
GetRequestClientFormatter (OperationDescription operationDescription,
ServiceEndpoint endpoint)
{
- return new WebMessageFormatter.RequestClientFormatter
(operationDescription, endpoint, GetQueryStringConverter
(operationDescription));
+ return new WebMessageFormatter.RequestClientFormatter
(operationDescription, endpoint, GetQueryStringConverter
(operationDescription), this);
}
[MonoTODO]
protected virtual IDispatchMessageFormatter
GetRequestDispatchFormatter (OperationDescription operationDescription,
ServiceEndpoint endpoint)
{
- return new WebMessageFormatter.RequestDispatchFormatter
(operationDescription, endpoint, GetQueryStringConverter
(operationDescription));
+ return new WebMessageFormatter.RequestDispatchFormatter
(operationDescription, endpoint, GetQueryStringConverter
(operationDescription), this);
}
[MonoTODO]
Modified:
trunk/olive/class/System.ServiceModel.Web/System.ServiceModel.Dispatcher/ChangeLog
===================================================================
---
trunk/olive/class/System.ServiceModel.Web/System.ServiceModel.Dispatcher/ChangeLog
2008-02-14 17:25:21 UTC (rev 95664)
+++
trunk/olive/class/System.ServiceModel.Web/System.ServiceModel.Dispatcher/ChangeLog
2008-02-14 17:27:33 UTC (rev 95665)
@@ -1,5 +1,9 @@
2008-02-14 Atsushi Enomoto <[EMAIL PROTECTED]>
+ * WebMessageFormatter.cs : pass WebHttpBehavior too.
+
+2008-02-14 Atsushi Enomoto <[EMAIL PROTECTED]>
+
* WebMessageFormatter.cs : pass QueryStringConverter which is used to
convert parameter objects to the components of the request URI.
Modified:
trunk/olive/class/System.ServiceModel.Web/System.ServiceModel.Dispatcher/WebMessageFormatter.cs
===================================================================
---
trunk/olive/class/System.ServiceModel.Web/System.ServiceModel.Dispatcher/WebMessageFormatter.cs
2008-02-14 17:25:21 UTC (rev 95664)
+++
trunk/olive/class/System.ServiceModel.Web/System.ServiceModel.Dispatcher/WebMessageFormatter.cs
2008-02-14 17:27:33 UTC (rev 95665)
@@ -42,13 +42,16 @@
MessageDescription message_desc;
ServiceEndpoint endpoint;
QueryStringConverter converter;
+ WebHttpBehavior behavior;
UriTemplate template;
+ WebAttributeInfo info = null;
- public WebMessageFormatter (OperationDescription operation,
ServiceEndpoint endpoint, QueryStringConverter converter)
+ public WebMessageFormatter (OperationDescription operation,
ServiceEndpoint endpoint, QueryStringConverter converter, WebHttpBehavior
behavior)
{
this.operation = operation;
this.endpoint = endpoint;
this.converter = converter;
+ this.behavior = behavior;
ApplyWebAttribute ();
}
@@ -57,7 +60,6 @@
MethodInfo mi = operation.SyncMethod ??
operation.BeginMethod;
object [] atts = mi.GetCustomAttributes (typeof
(WebGetAttribute), false);
- WebAttributeInfo info = null;
if (atts.Length > 0)
info = ((WebGetAttribute) atts [0]).Info;
atts = mi.GetCustomAttributes (typeof
(WebInvokeAttribute), false);
@@ -70,6 +72,10 @@
message_desc = GetMessageDescription ();
}
+ public WebAttributeInfo Info {
+ get { return info; }
+ }
+
public OperationDescription Operation {
get { return operation; }
}
@@ -127,40 +133,40 @@
internal class RequestClientFormatter :
WebClientMessageFormatter
{
- public RequestClientFormatter (OperationDescription
operation, ServiceEndpoint endpoint, QueryStringConverter converter)
- : base (operation, endpoint, converter)
+ public RequestClientFormatter (OperationDescription
operation, ServiceEndpoint endpoint, QueryStringConverter converter,
WebHttpBehavior behavior)
+ : base (operation, endpoint, converter,
behavior)
{
}
}
internal class ReplyClientFormatter : WebClientMessageFormatter
{
- public ReplyClientFormatter (OperationDescription
operation, ServiceEndpoint endpoint, QueryStringConverter converter)
- : base (operation, endpoint, converter)
+ public ReplyClientFormatter (OperationDescription
operation, ServiceEndpoint endpoint, QueryStringConverter converter,
WebHttpBehavior behavior)
+ : base (operation, endpoint, converter,
behavior)
{
}
}
internal class RequestDispatchFormatter :
WebDispatchMessageFormatter
{
- public RequestDispatchFormatter (OperationDescription
operation, ServiceEndpoint endpoint, QueryStringConverter converter)
- : base (operation, endpoint, converter)
+ public RequestDispatchFormatter (OperationDescription
operation, ServiceEndpoint endpoint, QueryStringConverter converter,
WebHttpBehavior behavior)
+ : base (operation, endpoint, converter,
behavior)
{
}
}
internal class ReplyDispatchFormatter :
WebDispatchMessageFormatter
{
- public ReplyDispatchFormatter (OperationDescription
operation, ServiceEndpoint endpoint, QueryStringConverter converter)
- : base (operation, endpoint, converter)
+ public ReplyDispatchFormatter (OperationDescription
operation, ServiceEndpoint endpoint, QueryStringConverter converter,
WebHttpBehavior behavior)
+ : base (operation, endpoint, converter,
behavior)
{
}
}
internal abstract class WebClientMessageFormatter :
WebMessageFormatter, IClientMessageFormatter
{
- protected WebClientMessageFormatter
(OperationDescription operation, ServiceEndpoint endpoint, QueryStringConverter
converter)
- : base (operation, endpoint, converter)
+ protected WebClientMessageFormatter
(OperationDescription operation, ServiceEndpoint endpoint, QueryStringConverter
converter, WebHttpBehavior behavior)
+ : base (operation, endpoint, converter,
behavior)
{
}
@@ -210,8 +216,8 @@
internal abstract class WebDispatchMessageFormatter :
WebMessageFormatter, IDispatchMessageFormatter
{
- protected WebDispatchMessageFormatter
(OperationDescription operation, ServiceEndpoint endpoint, QueryStringConverter
converter)
- : base (operation, endpoint, converter)
+ protected WebDispatchMessageFormatter
(OperationDescription operation, ServiceEndpoint endpoint, QueryStringConverter
converter, WebHttpBehavior behavior)
+ : base (operation, endpoint, converter,
behavior)
{
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
