Changeset 1450 for trunk/sources/HeuristicLab.Hive.Client.Communication

Timestamp:

03/27/09 14:31:57 (16 years ago)

Author:

kgrading

Message:

first implementation (#547)

Location:

trunk/sources/HeuristicLab.Hive.Client.Communication

Files:

• HeuristicLab.Hive.Client.Communication.csproj (modified) (1 diff)
• Service References/ServerService/HeuristicLab.Hive.Contracts1.xsd (modified) (2 diffs)
• Service References/ServerService/HeuristicLab.PluginInfrastructure.xsd (added)
• Service References/ServerService/Reference.cs (modified) (4 diffs)
• Service References/ServerService/Reference.svcmap (modified) (1 diff)
• Service References/ServerService/System1.xsd (modified) (1 diff)
• Service References/ServerService/service1.wsdl (modified) (1 diff)
• Service References/ServerService/service2.xsd (modified) (2 diffs)
• WcfService.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Hive.Client.Communication/HeuristicLab.Hive.Client.Communication.csproj

@@ -128 +128 @@
     <None Include="Service References\ServerService\HeuristicLab.Hive.Contracts.BusinessObjects1.xsd" />
     <None Include="Service References\ServerService\HeuristicLab.Hive.Contracts1.xsd" />
+    <None Include="Service References\ServerService\HeuristicLab.PluginInfrastructure.xsd" />
     <None Include="Service References\ServerService\Reference.svcmap">
       <Generator>WCF Proxy Generator</Generator>

trunk/sources/HeuristicLab.Hive.Client.Communication/Service References/ServerService/HeuristicLab.Hive.Contracts1.xsd

@@ -3 +3 @@
   <xs:import namespace="http://schemas.microsoft.com/2003/10/Serialization/" />
   <xs:import namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Hive.Contracts.BusinessObjects" />
+  <xs:import namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.PluginInfrastructure" />
   <xs:complexType name="Response">
     <xs:sequence>
@@ -71 +72 @@
       <xs:extension base="tns:Response">
         <xs:sequence>
-          <xs:element minOccurs="0" name="Plugins" nillable="true" type="xs:base64Binary" />
+          <xs:element xmlns:q2="http://schemas.datacontract.org/2004/07/HeuristicLab.PluginInfrastructure" minOccurs="0" name="Plugins" nillable="true" type="q2:ArrayOfCachedPlugin" />
         </xs:sequence>
       </xs:extension>

trunk/sources/HeuristicLab.Hive.Client.Communication/Service References/ServerService/Reference.cs

@@ -85 +85 @@
         
         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IClientCommunicator/SendPlugins", ReplyAction="http://tempuri.org/IClientCommunicator/SendPluginsResponse")]
-        HeuristicLab.Hive.Contracts.ResponsePlugin SendPlugins(string[] pluginList);
+        HeuristicLab.Hive.Contracts.ResponsePlugin SendPlugins(HeuristicLab.PluginInfrastructure.PluginInfo[] pluginList);
         
         [System.ServiceModel.OperationContractAttribute(AsyncPattern=true, Action="http://tempuri.org/IClientCommunicator/SendPlugins", ReplyAction="http://tempuri.org/IClientCommunicator/SendPluginsResponse")]
-        System.IAsyncResult BeginSendPlugins(string[] pluginList, System.AsyncCallback callback, object asyncState);
+        System.IAsyncResult BeginSendPlugins(HeuristicLab.PluginInfrastructure.PluginInfo[] pluginList, System.AsyncCallback callback, object asyncState);
         
         HeuristicLab.Hive.Contracts.ResponsePlugin EndSendPlugins(System.IAsyncResult result);
@@ -702 +702 @@
         }
         
-        public HeuristicLab.Hive.Contracts.ResponsePlugin SendPlugins(string[] pluginList) {
+        public HeuristicLab.Hive.Contracts.ResponsePlugin SendPlugins(HeuristicLab.PluginInfrastructure.PluginInfo[] pluginList) {
             return base.Channel.SendPlugins(pluginList);
         }
         
         [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
-        public System.IAsyncResult BeginSendPlugins(string[] pluginList, System.AsyncCallback callback, object asyncState) {
+        public System.IAsyncResult BeginSendPlugins(HeuristicLab.PluginInfrastructure.PluginInfo[] pluginList, System.AsyncCallback callback, object asyncState) {
             return base.Channel.BeginSendPlugins(pluginList, callback, asyncState);
         }
@@ -717 +717 @@
         
         private System.IAsyncResult OnBeginSendPlugins(object[] inValues, System.AsyncCallback callback, object asyncState) {
-            string[] pluginList = ((string[])(inValues[0]));
+            HeuristicLab.PluginInfrastructure.PluginInfo[] pluginList = ((HeuristicLab.PluginInfrastructure.PluginInfo[])(inValues[0]));
             return this.BeginSendPlugins(pluginList, callback, asyncState);
         }
@@ -734 +734 @@
         }
         
-        public void SendPluginsAsync(string[] pluginList) {
+        public void SendPluginsAsync(HeuristicLab.PluginInfrastructure.PluginInfo[] pluginList) {
             this.SendPluginsAsync(pluginList, null);
         }
         
-        public void SendPluginsAsync(string[] pluginList, object userState) {
+        public void SendPluginsAsync(HeuristicLab.PluginInfrastructure.PluginInfo[] pluginList, object userState) {
             if ((this.onBeginSendPluginsDelegate == null)) {
                 this.onBeginSendPluginsDelegate = new BeginOperationDelegate(this.OnBeginSendPlugins);

trunk/sources/HeuristicLab.Hive.Client.Communication/Service References/ServerService/Reference.svcmap

@@ -29 +29 @@
     <MetadataFile FileName="Arrays1.xsd" MetadataType="Schema" ID="53f47e2f-ca2b-4f21-9457-037e222fefaf" SourceId="1" SourceUrl="net.tcp://10.20.53.7:9000/HiveServer/mex" />
     <MetadataFile FileName="System1.xsd" MetadataType="Schema" ID="6a87c5f1-b08b-4dea-b2b3-bd10a1f13d52" SourceId="1" SourceUrl="net.tcp://10.20.53.7:9000/HiveServer/mex" />
+    <MetadataFile FileName="HeuristicLab.PluginInfrastructure.xsd" MetadataType="Schema" ID="2dafc69c-27f2-456d-80d7-303362ac8b68" SourceId="1" SourceUrl="net.tcp://10.20.53.3:9000/HiveServer/mex" />
   </Metadata>
   <Extensions>

trunk/sources/HeuristicLab.Hive.Client.Communication/Service References/ServerService/System1.xsd

@@ -9 +9 @@
   </xs:complexType>
   <xs:element name="Exception" nillable="true" type="tns:Exception" />
+  <xs:complexType name="Version">
+    <xs:sequence>
+      <xs:element name="_Build" type="xs:int" />
+      <xs:element name="_Major" type="xs:int" />
+      <xs:element name="_Minor" type="xs:int" />
+      <xs:element name="_Revision" type="xs:int" />
+    </xs:sequence>
+  </xs:complexType>
+  <xs:element name="Version" nillable="true" type="tns:Version" />
 </xs:schema>

trunk/sources/HeuristicLab.Hive.Client.Communication/Service References/ServerService/service1.wsdl

@@ -26 +26 @@
       <xsd:import namespace="http://schemas.microsoft.com/2003/10/Serialization/Arrays" />
       <xsd:import namespace="http://schemas.datacontract.org/2004/07/System" />
+      <xsd:import namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.PluginInfrastructure" />
     </xsd:schema>
   </wsdl:types>

trunk/sources/HeuristicLab.Hive.Client.Communication/Service References/ServerService/service2.xsd

@@ -5 +5 @@
   <xs:import namespace="http://schemas.microsoft.com/2003/10/Serialization/" />
   <xs:import namespace="http://schemas.datacontract.org/2004/07/System" />
-  <xs:import namespace="http://schemas.microsoft.com/2003/10/Serialization/Arrays" />
+  <xs:import namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.PluginInfrastructure" />
   <xs:element name="Login">
     <xs:complexType>
@@ -115 +115 @@
     <xs:complexType>
       <xs:sequence>
-        <xs:element xmlns:q19="http://schemas.microsoft.com/2003/10/Serialization/Arrays" minOccurs="0" name="pluginList" nillable="true" type="q19:ArrayOfstring" />
+        <xs:element xmlns:q16="http://schemas.datacontract.org/2004/07/HeuristicLab.PluginInfrastructure" minOccurs="0" name="pluginList" nillable="true" type="q16:ArrayOfPluginInfo" />
       </xs:sequence>
     </xs:complexType>

trunk/sources/HeuristicLab.Hive.Client.Communication/WcfService.cs

@@ -30 +30 @@
 using HeuristicLab.Hive.Client.Common;
 using HeuristicLab.Hive.Client.Communication.ServerService;
+using HeuristicLab.PluginInfrastructure;
 
 namespace HeuristicLab.Hive.Client.Communication {
@@ -249 +250 @@
 
     public ResponseResultReceived SendStoredJobResultsSync(Guid clientId, Guid jobId, byte[] result, double percentage, Exception exception, bool finished) {
-      return proxy.StoreFinishedJobResult(clientId, jobId, result, percentage, exception);
-    }
+      return proxy.StoreFinishedJobResult(clientId, jobId, result, percentage, exception);    
+    }
+
+    public List<CachedPlugin> RequestPlugins(List<PluginInfo> requestedPlugins) {
+      try {
+        return proxy.SendPlugins(requestedPlugins.ToArray()).Plugins;
+      }
+      catch (Exception e) {
+        HandleNetworkError(e);
+        return null;
+      }
+    }
+
   }
 }