From 4ca1c6cfa0b27f09aa2a7e3ade5bce6a368e3d13 Mon Sep 17 00:00:00 2001 From: Christoph Wille Date: Wed, 17 Feb 2010 09:57:07 +0000 Subject: [PATCH] Add service contract, change proxy namespace to not collide with newly added service contract. git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@5514 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61 --- ...taMessage.cs => UsageDataDataContracts.cs} | 0 .../Contracts/UsageDataServiceContracts.cs | 33 +++++++++++++++++++ .../UsageDataCollector/Reference.cs | 22 ++++++------- .../UsageDataCollector.csproj | 3 +- .../UsageDataCollector/UsageDataUploader.cs | 6 ++-- 5 files changed, 49 insertions(+), 15 deletions(-) rename src/AddIns/Misc/UsageDataCollector/UsageDataCollector/Contracts/{UsageDataMessage.cs => UsageDataDataContracts.cs} (100%) create mode 100644 src/AddIns/Misc/UsageDataCollector/UsageDataCollector/Contracts/UsageDataServiceContracts.cs diff --git a/src/AddIns/Misc/UsageDataCollector/UsageDataCollector/Contracts/UsageDataMessage.cs b/src/AddIns/Misc/UsageDataCollector/UsageDataCollector/Contracts/UsageDataDataContracts.cs similarity index 100% rename from src/AddIns/Misc/UsageDataCollector/UsageDataCollector/Contracts/UsageDataMessage.cs rename to src/AddIns/Misc/UsageDataCollector/UsageDataCollector/Contracts/UsageDataDataContracts.cs diff --git a/src/AddIns/Misc/UsageDataCollector/UsageDataCollector/Contracts/UsageDataServiceContracts.cs b/src/AddIns/Misc/UsageDataCollector/UsageDataCollector/Contracts/UsageDataServiceContracts.cs new file mode 100644 index 0000000000..1397387eaa --- /dev/null +++ b/src/AddIns/Misc/UsageDataCollector/UsageDataCollector/Contracts/UsageDataServiceContracts.cs @@ -0,0 +1,33 @@ +// +// +// +// +// $Revision: 5513 $ +// + +using System; +using System.Collections.Generic; +using System.Linq; +using System.Runtime.Serialization; +using System.ServiceModel; +using System.Text; + +namespace ICSharpCode.UsageDataCollector.Contracts +{ + [ServiceContract] + public interface IUDCUploadService + { + [OperationContract(IsOneWay = true)] + void UploadUsageData(UDCUploadRequest request); + } + + [MessageContract()] + public class UDCUploadRequest + { + [MessageHeader(MustUnderstand = true)] + public string ApplicationKey; + + [MessageBodyMember(Order = 1)] + public System.IO.Stream UsageData; + } +} diff --git a/src/AddIns/Misc/UsageDataCollector/UsageDataCollector/Reference.cs b/src/AddIns/Misc/UsageDataCollector/UsageDataCollector/Reference.cs index 7710682cc2..84a6d4a9e4 100644 --- a/src/AddIns/Misc/UsageDataCollector/UsageDataCollector/Reference.cs +++ b/src/AddIns/Misc/UsageDataCollector/UsageDataCollector/Reference.cs @@ -8,7 +8,7 @@ // //------------------------------------------------------------------------------ -namespace ICSharpCode.UsageDataCollector.Service { +namespace ICSharpCode.UsageDataCollector.ServiceReference { [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")] @@ -17,10 +17,10 @@ namespace ICSharpCode.UsageDataCollector.Service { // CODEGEN: Generating message contract since the wrapper name (UDCUploadRequest) of message UDCUploadRequest does not match the default value (UploadUsageData) [System.ServiceModel.OperationContractAttribute(IsOneWay=true, Action="http://tempuri.org/IUDCUploadService/UploadUsageData")] - void UploadUsageData(ICSharpCode.UsageDataCollector.Service.UDCUploadRequest request); + void UploadUsageData(ICSharpCode.UsageDataCollector.ServiceReference.UDCUploadRequest request); [System.ServiceModel.OperationContractAttribute(IsOneWay=true, AsyncPattern=true, Action="http://tempuri.org/IUDCUploadService/UploadUsageData")] - System.IAsyncResult BeginUploadUsageData(ICSharpCode.UsageDataCollector.Service.UDCUploadRequest request, System.AsyncCallback callback, object asyncState); + System.IAsyncResult BeginUploadUsageData(ICSharpCode.UsageDataCollector.ServiceReference.UDCUploadRequest request, System.AsyncCallback callback, object asyncState); void EndUploadUsageData(System.IAsyncResult result); } @@ -46,12 +46,12 @@ namespace ICSharpCode.UsageDataCollector.Service { } [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")] - internal interface IUDCUploadServiceChannel : ICSharpCode.UsageDataCollector.Service.IUDCUploadService, System.ServiceModel.IClientChannel { + internal interface IUDCUploadServiceChannel : ICSharpCode.UsageDataCollector.ServiceReference.IUDCUploadService, System.ServiceModel.IClientChannel { } [System.Diagnostics.DebuggerStepThroughAttribute()] [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")] - internal partial class UDCUploadServiceClient : System.ServiceModel.ClientBase, ICSharpCode.UsageDataCollector.Service.IUDCUploadService { + internal partial class UDCUploadServiceClient : System.ServiceModel.ClientBase, ICSharpCode.UsageDataCollector.ServiceReference.IUDCUploadService { private BeginOperationDelegate onBeginUploadUsageDataDelegate; @@ -81,28 +81,28 @@ namespace ICSharpCode.UsageDataCollector.Service { public event System.EventHandler UploadUsageDataCompleted; [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)] - void ICSharpCode.UsageDataCollector.Service.IUDCUploadService.UploadUsageData(ICSharpCode.UsageDataCollector.Service.UDCUploadRequest request) { + void ICSharpCode.UsageDataCollector.ServiceReference.IUDCUploadService.UploadUsageData(ICSharpCode.UsageDataCollector.ServiceReference.UDCUploadRequest request) { base.Channel.UploadUsageData(request); } public void UploadUsageData(string ApplicationKey, System.IO.Stream UsageData) { - ICSharpCode.UsageDataCollector.Service.UDCUploadRequest inValue = new ICSharpCode.UsageDataCollector.Service.UDCUploadRequest(); + ICSharpCode.UsageDataCollector.ServiceReference.UDCUploadRequest inValue = new ICSharpCode.UsageDataCollector.ServiceReference.UDCUploadRequest(); inValue.ApplicationKey = ApplicationKey; inValue.UsageData = UsageData; - ((ICSharpCode.UsageDataCollector.Service.IUDCUploadService)(this)).UploadUsageData(inValue); + ((ICSharpCode.UsageDataCollector.ServiceReference.IUDCUploadService)(this)).UploadUsageData(inValue); } [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)] - System.IAsyncResult ICSharpCode.UsageDataCollector.Service.IUDCUploadService.BeginUploadUsageData(ICSharpCode.UsageDataCollector.Service.UDCUploadRequest request, System.AsyncCallback callback, object asyncState) { + System.IAsyncResult ICSharpCode.UsageDataCollector.ServiceReference.IUDCUploadService.BeginUploadUsageData(ICSharpCode.UsageDataCollector.ServiceReference.UDCUploadRequest request, System.AsyncCallback callback, object asyncState) { return base.Channel.BeginUploadUsageData(request, callback, asyncState); } [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)] public System.IAsyncResult BeginUploadUsageData(string ApplicationKey, System.IO.Stream UsageData, System.AsyncCallback callback, object asyncState) { - ICSharpCode.UsageDataCollector.Service.UDCUploadRequest inValue = new ICSharpCode.UsageDataCollector.Service.UDCUploadRequest(); + ICSharpCode.UsageDataCollector.ServiceReference.UDCUploadRequest inValue = new ICSharpCode.UsageDataCollector.ServiceReference.UDCUploadRequest(); inValue.ApplicationKey = ApplicationKey; inValue.UsageData = UsageData; - return ((ICSharpCode.UsageDataCollector.Service.IUDCUploadService)(this)).BeginUploadUsageData(inValue, callback, asyncState); + return ((ICSharpCode.UsageDataCollector.ServiceReference.IUDCUploadService)(this)).BeginUploadUsageData(inValue, callback, asyncState); } [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)] diff --git a/src/AddIns/Misc/UsageDataCollector/UsageDataCollector/UsageDataCollector.csproj b/src/AddIns/Misc/UsageDataCollector/UsageDataCollector/UsageDataCollector.csproj index 1d951a28d1..82c1aa5046 100644 --- a/src/AddIns/Misc/UsageDataCollector/UsageDataCollector/UsageDataCollector.csproj +++ b/src/AddIns/Misc/UsageDataCollector/UsageDataCollector/UsageDataCollector.csproj @@ -56,7 +56,8 @@ GlobalAssemblyInfo.cs - + + diff --git a/src/AddIns/Misc/UsageDataCollector/UsageDataCollector/UsageDataUploader.cs b/src/AddIns/Misc/UsageDataCollector/UsageDataCollector/UsageDataUploader.cs index ea583d5d46..9bceffc930 100644 --- a/src/AddIns/Misc/UsageDataCollector/UsageDataCollector/UsageDataUploader.cs +++ b/src/AddIns/Misc/UsageDataCollector/UsageDataCollector/UsageDataUploader.cs @@ -18,7 +18,7 @@ using System.ServiceModel.Channels; using System.Xml; using ICSharpCode.UsageDataCollector.Contracts; -using ICSharpCode.UsageDataCollector.Service; +using UdcProxy = ICSharpCode.UsageDataCollector.ServiceReference; namespace ICSharpCode.UsageDataCollector { @@ -116,7 +116,7 @@ namespace ICSharpCode.UsageDataCollector data = ms.ToArray(); } - UDCUploadServiceClient client = new UDCUploadServiceClient(binding, endpoint); + UdcProxy.UDCUploadServiceClient client = new UdcProxy.UDCUploadServiceClient(binding, endpoint); try { client.BeginUploadUsageData("sharpdevelop", new MemoryStream(data), ar => UsageDataUploaded(ar, client, commaSeparatedSessionIDList), null); @@ -126,7 +126,7 @@ namespace ICSharpCode.UsageDataCollector } } - void UsageDataUploaded(IAsyncResult result, UDCUploadServiceClient client, string commaSeparatedSessionIDList) + void UsageDataUploaded(IAsyncResult result, UdcProxy.UDCUploadServiceClient client, string commaSeparatedSessionIDList) { bool success = false; try {