Free cookie consent management tool by TermsFeed Policy Generator

Changeset 1103


Ignore:
Timestamp:
01/08/09 18:26:46 (15 years ago)
Author:
svonolfe
Message:

Changed SendJobResult Interface (#351)

Location:
trunk/sources
Files:
1 added
1 deleted
18 edited

Legend:

Unmodified
Added
Removed

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

    r1007 r1103  
    127127    <None Include="Service References\ServerService\service1.wsdl" />
    128128    <None Include="Service References\ServerService\service2.xsd" />
    129     <None Include="Service References\ServerService\service21.xsd" />
     129    <None Include="Service References\ServerService\service3.xsd" />
    130130    <None Include="Service References\ServerService\System1.xsd" />
    131131  </ItemGroup>

  • trunk/sources/HeuristicLab.Hive.Client.Communication/Service References/ServerService/HeuristicLab.Hive.Contracts.BusinessObjects1.xsd

    r1007 r1103  
    22<xs:schema xmlns:tns="http://schemas.datacontract.org/2004/07/HeuristicLab.Hive.Contracts.BusinessObjects" xmlns:ser="http://schemas.microsoft.com/2003/10/Serialization/" elementFormDefault="qualified" targetNamespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Hive.Contracts.BusinessObjects" xmlns:xs="http://www.w3.org/2001/XMLSchema">
    33  <xs:import namespace="http://schemas.microsoft.com/2003/10/Serialization/" />
    4   <xs:import namespace="http://schemas.datacontract.org/2004/07/System" />
    54  <xs:complexType name="ClientInfo">
    65    <xs:complexContent mixed="false">
    … …  
    5958      <xs:element minOccurs="0" name="Id" type="xs:long" />
    6059      <xs:element minOccurs="0" name="ParentJob" nillable="true" type="tns:Job" />
     60      <xs:element minOccurs="0" name="Percentage" type="xs:double" />
    6161      <xs:element minOccurs="0" name="State" type="tns:State" />
    6262    </xs:sequence>
    6363  </xs:complexType>
    6464  <xs:element name="Job" nillable="true" type="tns:Job" />
    65   <xs:complexType name="JobResult">
    66     <xs:sequence>
    67       <xs:element minOccurs="0" name="Client" nillable="true" type="tns:ClientInfo" />
    68       <xs:element xmlns:q1="http://schemas.datacontract.org/2004/07/System" minOccurs="0" name="Exception" nillable="true" type="q1:Exception" />
    69       <xs:element minOccurs="0" name="Id" type="xs:long" />
    70       <xs:element minOccurs="0" name="Job" nillable="true" type="tns:Job" />
    71       <xs:element minOccurs="0" name="Result" nillable="true" type="xs:base64Binary" />
    72     </xs:sequence>
    73   </xs:complexType>
    74   <xs:element name="JobResult" nillable="true" type="tns:JobResult" />
    7565</xs:schema>

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

    r1007 r1103  
    4141      <xs:enumeration value="NoMessage" />
    4242      <xs:enumeration value="SnapshotReady" />
     43      <xs:enumeration value="Shutdown" />
    4344    </xs:restriction>
    4445  </xs:simpleType>
    … …  
    5960      <xs:extension base="tns:Response">
    6061        <xs:sequence>
    61           <xs:element xmlns:q2="http://schemas.datacontract.org/2004/07/HeuristicLab.Hive.Contracts.BusinessObjects" minOccurs="0" name="Job" nillable="true" type="q2:Job" />
     62          <xs:element minOccurs="0" name="JobId" type="xs:long" />
    6263        </xs:sequence>
    6364      </xs:extension>

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

    r1007 r1103  
    4444       
    4545        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IClientCommunicator/SendJobResult", ReplyAction="http://tempuri.org/IClientCommunicator/SendJobResultResponse")]
    46         HeuristicLab.Hive.Contracts.ResponseResultReceived SendJobResult(HeuristicLab.Hive.Contracts.BusinessObjects.JobResult result, bool finished);
     46        HeuristicLab.Hive.Contracts.ResponseResultReceived SendJobResult(System.Guid clientId, long jobId, byte[] result, System.Exception exception, bool finished);
    4747       
    4848        [System.ServiceModel.OperationContractAttribute(AsyncPattern=true, Action="http://tempuri.org/IClientCommunicator/SendJobResult", ReplyAction="http://tempuri.org/IClientCommunicator/SendJobResultResponse")]
    49         System.IAsyncResult BeginSendJobResult(HeuristicLab.Hive.Contracts.BusinessObjects.JobResult result, bool finished, System.AsyncCallback callback, object asyncState);
     49        System.IAsyncResult BeginSendJobResult(System.Guid clientId, long jobId, byte[] result, System.Exception exception, bool finished, System.AsyncCallback callback, object asyncState);
    5050       
    5151        HeuristicLab.Hive.Contracts.ResponseResultReceived EndSendJobResult(System.IAsyncResult result);
    … …  
    375375        }
    376376       
    377         public HeuristicLab.Hive.Contracts.ResponseResultReceived SendJobResult(HeuristicLab.Hive.Contracts.BusinessObjects.JobResult result, bool finished) {
    378             return base.Channel.SendJobResult(result, finished);
    379         }
    380        
    381         [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
    382         public System.IAsyncResult BeginSendJobResult(HeuristicLab.Hive.Contracts.BusinessObjects.JobResult result, bool finished, System.AsyncCallback callback, object asyncState) {
    383             return base.Channel.BeginSendJobResult(result, finished, callback, asyncState);
     377        public HeuristicLab.Hive.Contracts.ResponseResultReceived SendJobResult(System.Guid clientId, long jobId, byte[] result, System.Exception exception, bool finished) {
     378            return base.Channel.SendJobResult(clientId, jobId, result, exception, finished);
     379        }
     380       
     381        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
     382        public System.IAsyncResult BeginSendJobResult(System.Guid clientId, long jobId, byte[] result, System.Exception exception, bool finished, System.AsyncCallback callback, object asyncState) {
     383            return base.Channel.BeginSendJobResult(clientId, jobId, result, exception, finished, callback, asyncState);
    384384        }
    385385       
    … …  
    390390       
    391391        private System.IAsyncResult OnBeginSendJobResult(object[] inValues, System.AsyncCallback callback, object asyncState) {
    392             HeuristicLab.Hive.Contracts.BusinessObjects.JobResult result = ((HeuristicLab.Hive.Contracts.BusinessObjects.JobResult)(inValues[0]));
    393             bool finished = ((bool)(inValues[1]));
    394             return this.BeginSendJobResult(result, finished, callback, asyncState);
     392            System.Guid clientId = ((System.Guid)(inValues[0]));
     393            long jobId = ((long)(inValues[1]));
     394            byte[] result = ((byte[])(inValues[2]));
     395            System.Exception exception = ((System.Exception)(inValues[3]));
     396            bool finished = ((bool)(inValues[4]));
     397            return this.BeginSendJobResult(clientId, jobId, result, exception, finished, callback, asyncState);
    395398        }
    396399       
    … …  
    408411        }
    409412       
    410         public void SendJobResultAsync(HeuristicLab.Hive.Contracts.BusinessObjects.JobResult result, bool finished) {
    411             this.SendJobResultAsync(result, finished, null);
    412         }
    413        
    414         public void SendJobResultAsync(HeuristicLab.Hive.Contracts.BusinessObjects.JobResult result, bool finished, object userState) {
     413        public void SendJobResultAsync(System.Guid clientId, long jobId, byte[] result, System.Exception exception, bool finished) {
     414            this.SendJobResultAsync(clientId, jobId, result, exception, finished, null);
     415        }
     416       
     417        public void SendJobResultAsync(System.Guid clientId, long jobId, byte[] result, System.Exception exception, bool finished, object userState) {
    415418            if ((this.onBeginSendJobResultDelegate == null)) {
    416419                this.onBeginSendJobResultDelegate = new BeginOperationDelegate(this.OnBeginSendJobResult);
    … …  
    423426            }
    424427            base.InvokeAsync(this.onBeginSendJobResultDelegate, new object[] {
     428                        clientId,
     429                        jobId,
    425430                        result,
     431                        exception,
    426432                        finished}, this.onEndSendJobResultDelegate, this.onSendJobResultCompletedDelegate, userState);
    427433        }

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

    r1007 r1103  
    1818  </ClientOptions>
    1919  <MetadataSources>
    20     <MetadataSource Address="net.tcp://10.20.53.3:9000/HiveServer/mex" Protocol="mex" SourceId="1" />
     20    <MetadataSource Address="net.tcp://10.0.2.15:9000/HiveServer/mex" Protocol="mex" SourceId="1" />
    2121  </MetadataSources>
    2222  <Metadata>
    23     <MetadataFile FileName="service1.wsdl" MetadataType="Wsdl" ID="2f623593-449a-4c2c-a9e9-bc1a508a950f" SourceId="1" SourceUrl="net.tcp://10.20.53.3:9000/HiveServer/mex" />
    24     <MetadataFile FileName="service2.xsd" MetadataType="Schema" ID="236fb6be-0c11-471f-b4ac-31042c5195c2" SourceId="1" SourceUrl="net.tcp://10.20.53.3:9000/HiveServer/mex" />
    25     <MetadataFile FileName="service21.xsd" MetadataType="Schema" ID="54ef7d2b-ee63-4b13-826e-e499a23ed1b1" SourceId="1" SourceUrl="net.tcp://10.20.53.3:9000/HiveServer/mex" />
    26     <MetadataFile FileName="HeuristicLab.Hive.Contracts.BusinessObjects1.xsd" MetadataType="Schema" ID="e9a3c56a-6a38-4d39-96e5-3ea87d8bd93b" SourceId="1" SourceUrl="net.tcp://10.20.53.3:9000/HiveServer/mex" />
    27     <MetadataFile FileName="HeuristicLab.Hive.Contracts1.xsd" MetadataType="Schema" ID="eb33d397-8f91-4200-b95e-e11020189dc7" SourceId="1" SourceUrl="net.tcp://10.20.53.3:9000/HiveServer/mex" />
    28     <MetadataFile FileName="System1.xsd" MetadataType="Schema" ID="8949584a-9a16-4da0-97c5-a41265ff0124" SourceId="1" SourceUrl="net.tcp://10.20.53.3:9000/HiveServer/mex" />
     23    <MetadataFile FileName="service1.wsdl" MetadataType="Wsdl" ID="f56a21ec-7556-4b53-99e2-b57b466f64ad" SourceId="1" SourceUrl="net.tcp://10.0.2.15:9000/HiveServer/mex" />
     24    <MetadataFile FileName="service2.xsd" MetadataType="Schema" ID="c9a3854c-4c5f-46e4-acdd-a9380cdfb904" SourceId="1" SourceUrl="net.tcp://10.0.2.15:9000/HiveServer/mex" />
     25    <MetadataFile FileName="service3.xsd" MetadataType="Schema" ID="d9a1099b-776f-4c24-9125-15644863eedf" SourceId="1" SourceUrl="net.tcp://10.0.2.15:9000/HiveServer/mex" />
     26    <MetadataFile FileName="HeuristicLab.Hive.Contracts.BusinessObjects1.xsd" MetadataType="Schema" ID="5fda1f4a-d579-4445-b291-a6168caf9e83" SourceId="1" SourceUrl="net.tcp://10.0.2.15:9000/HiveServer/mex" />
     27    <MetadataFile FileName="HeuristicLab.Hive.Contracts1.xsd" MetadataType="Schema" ID="b7112dc7-0c1d-40c9-b95f-3a2834972fce" SourceId="1" SourceUrl="net.tcp://10.0.2.15:9000/HiveServer/mex" />
     28    <MetadataFile FileName="System1.xsd" MetadataType="Schema" ID="68a8f9e6-4f06-449e-8cdb-6e89a6323964" SourceId="1" SourceUrl="net.tcp://10.0.2.15:9000/HiveServer/mex" />
    2929  </Metadata>
    3030  <Extensions>

  • trunk/sources/HeuristicLab.Hive.Client.Communication/Service References/ServerService/configuration.svcinfo

    r1007 r1103  
    66  </bindings>
    77  <endpoints>
    8     <endpoint normalizedDigest="&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-16&quot;?&gt;&lt;Data address=&quot;net.tcp://10.20.53.3:9000/HiveServer/ClientCommunicator&quot; binding=&quot;netTcpBinding&quot; bindingConfiguration=&quot;NetTcpBinding_IClientCommunicator&quot; contract=&quot;ServerService.IClientCommunicator&quot; name=&quot;NetTcpBinding_IClientCommunicator&quot;&gt;&lt;identity&gt;&lt;userPrincipalName value=&quot;mse08003@fhs-hagenberg.ac.at&quot; /&gt;&lt;/identity&gt;&lt;/Data&gt;" digest="&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-16&quot;?&gt;&lt;Data address=&quot;net.tcp://10.20.53.3:9000/HiveServer/ClientCommunicator&quot; binding=&quot;netTcpBinding&quot; bindingConfiguration=&quot;NetTcpBinding_IClientCommunicator&quot; contract=&quot;ServerService.IClientCommunicator&quot; name=&quot;NetTcpBinding_IClientCommunicator&quot;&gt;&lt;identity&gt;&lt;userPrincipalName value=&quot;mse08003@fhs-hagenberg.ac.at&quot; /&gt;&lt;/identity&gt;&lt;/Data&gt;" contractName="ServerService.IClientCommunicator" name="NetTcpBinding_IClientCommunicator" />
     8    <endpoint normalizedDigest="&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-16&quot;?&gt;&lt;Data address=&quot;net.tcp://10.0.2.15:9000/HiveServer/ClientCommunicator&quot; binding=&quot;netTcpBinding&quot; bindingConfiguration=&quot;NetTcpBinding_IClientCommunicator&quot; contract=&quot;ServerService.IClientCommunicator&quot; name=&quot;NetTcpBinding_IClientCommunicator&quot;&gt;&lt;identity&gt;&lt;userPrincipalName value=&quot;STEFAN-4710DBDB\Stefan&quot; /&gt;&lt;/identity&gt;&lt;/Data&gt;" digest="&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-16&quot;?&gt;&lt;Data address=&quot;net.tcp://10.0.2.15:9000/HiveServer/ClientCommunicator&quot; binding=&quot;netTcpBinding&quot; bindingConfiguration=&quot;NetTcpBinding_IClientCommunicator&quot; contract=&quot;ServerService.IClientCommunicator&quot; name=&quot;NetTcpBinding_IClientCommunicator&quot;&gt;&lt;identity&gt;&lt;userPrincipalName value=&quot;STEFAN-4710DBDB\Stefan&quot; /&gt;&lt;/identity&gt;&lt;/Data&gt;" contractName="ServerService.IClientCommunicator" name="NetTcpBinding_IClientCommunicator" />
    99  </endpoints>
    1010</configurationSnapshot>

  • trunk/sources/HeuristicLab.Hive.Client.Communication/Service References/ServerService/configuration91.svcinfo

    r1007 r1103  
    11<?xml version="1.0" encoding="utf-8"?>
    2 <SavedWcfConfigurationInformation xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" Version="9.1" CheckSum="kpA4Ej4a4mSz8NqKwKcNB68tDr0=">
     2<SavedWcfConfigurationInformation xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" Version="9.1" CheckSum="SA5Nbw12eg0h/lght5fpEmtG/7E=">
    33  <bindingConfigurations>
    44    <bindingConfiguration bindingType="netTcpBinding" name="NetTcpBinding_IClientCommunicator">
    … …  
    107107  </bindingConfigurations>
    108108  <endpoints>
    109     <endpoint name="NetTcpBinding_IClientCommunicator" contract="ServerService.IClientCommunicator" bindingType="netTcpBinding" address="net.tcp://10.20.53.3:9000/HiveServer/ClientCommunicator" bindingConfiguration="NetTcpBinding_IClientCommunicator">
     109    <endpoint name="NetTcpBinding_IClientCommunicator" contract="ServerService.IClientCommunicator" bindingType="netTcpBinding" address="net.tcp://10.0.2.15:9000/HiveServer/ClientCommunicator" bindingConfiguration="NetTcpBinding_IClientCommunicator">
    110110      <properties>
    111111        <property path="/address" isComplexType="false" isExplicitlyDefined="true" clrType="System.Uri, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    112           <serializedValue>net.tcp://10.20.53.3:9000/HiveServer/ClientCommunicator</serializedValue>
     112          <serializedValue>net.tcp://10.0.2.15:9000/HiveServer/ClientCommunicator</serializedValue>
    113113        </property>
    114114        <property path="/behaviorConfiguration" isComplexType="false" isExplicitlyDefined="false" clrType="System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    … …  
    137137        </property>
    138138        <property path="/identity/userPrincipalName/value" isComplexType="false" isExplicitlyDefined="true" clrType="System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    139           <serializedValue>mse08003@fhs-hagenberg.ac.at</serializedValue>
     139          <serializedValue>STEFAN-4710DBDB\Stefan</serializedValue>
    140140        </property>
    141141        <property path="/identity/servicePrincipalName" isComplexType="true" isExplicitlyDefined="false" clrType="System.ServiceModel.Configuration.ServicePrincipalNameElement, System.ServiceModel, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">

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

    r1007 r1103  
    11<?xml version="1.0" encoding="utf-8"?>
    2 <wsdl:definitions xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing" xmlns:wsap="http://schemas.xmlsoap.org/ws/2004/08/addressing/policy" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msc="http://schemas.microsoft.com/ws/2005/12/wsdl/contract" xmlns:tns="http://tempuri.org/" xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" xmlns:wsa10="http://www.w3.org/2005/08/addressing" xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata" name="ClientCommunicator" targetNamespace="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
     2<wsdl:definitions xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing" xmlns:wsap="http://schemas.xmlsoap.org/ws/2004/08/addressing/policy" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msc="http://schemas.microsoft.com/ws/2005/12/wsdl/contract" xmlns:tns="http://tempuri.org/" xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" xmlns:wsa10="http://www.w3.org/2005/08/addressing" xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata" name="ClientFacade" targetNamespace="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
    33  <wsp:Policy wsu:Id="NetTcpBinding_IClientCommunicator_policy">
    44    <wsp:ExactlyOne>
    … …  
    145145    </wsdl:operation>
    146146  </wsdl:binding>
    147   <wsdl:service name="ClientCommunicator">
     147  <wsdl:service name="ClientFacade">
    148148    <wsdl:port name="NetTcpBinding_IClientCommunicator" binding="tns:NetTcpBinding_IClientCommunicator">
    149       <soap12:address location="net.tcp://10.20.53.3:9000/HiveServer/ClientCommunicator" />
     149      <soap12:address location="net.tcp://10.0.2.15:9000/HiveServer/ClientCommunicator" />
    150150      <wsa10:EndpointReference>
    151         <wsa10:Address>net.tcp://10.20.53.3:9000/HiveServer/ClientCommunicator</wsa10:Address>
     151        <wsa10:Address>net.tcp://10.0.2.15:9000/HiveServer/ClientCommunicator</wsa10:Address>
    152152        <Identity xmlns="http://schemas.xmlsoap.org/ws/2006/02/addressingidentity">
    153           <Upn>mse08003@fhs-hagenberg.ac.at</Upn>
     153          <Upn>STEFAN-4710DBDB\Stefan</Upn>
    154154        </Identity>
    155155      </wsa10:EndpointReference>

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

    r1007 r1103  
    44  <xs:import namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Hive.Contracts" />
    55  <xs:import namespace="http://schemas.microsoft.com/2003/10/Serialization/" />
     6  <xs:import namespace="http://schemas.datacontract.org/2004/07/System" />
    67  <xs:element name="Login">
    78    <xs:complexType>
    … …  
    4950    <xs:complexType>
    5051      <xs:sequence>
    51         <xs:element xmlns:q7="http://schemas.datacontract.org/2004/07/HeuristicLab.Hive.Contracts.BusinessObjects" minOccurs="0" name="result" nillable="true" type="q7:JobResult" />
     52        <xs:element xmlns:q7="http://schemas.microsoft.com/2003/10/Serialization/" minOccurs="0" name="clientId" type="q7:guid" />
     53        <xs:element minOccurs="0" name="jobId" type="xs:long" />
     54        <xs:element minOccurs="0" name="result" nillable="true" type="xs:base64Binary" />
     55        <xs:element xmlns:q8="http://schemas.datacontract.org/2004/07/System" minOccurs="0" name="exception" nillable="true" type="q8:Exception" />
    5256        <xs:element minOccurs="0" name="finished" type="xs:boolean" />
    5357      </xs:sequence>
    … …  
    5761    <xs:complexType>
    5862      <xs:sequence>
    59         <xs:element xmlns:q8="http://schemas.datacontract.org/2004/07/HeuristicLab.Hive.Contracts" minOccurs="0" name="SendJobResultResult" nillable="true" type="q8:ResponseResultReceived" />
     63        <xs:element xmlns:q9="http://schemas.datacontract.org/2004/07/HeuristicLab.Hive.Contracts" minOccurs="0" name="SendJobResultResult" nillable="true" type="q9:ResponseResultReceived" />
    6064      </xs:sequence>
    6165    </xs:complexType>
    … …  
    6468    <xs:complexType>
    6569      <xs:sequence>
    66         <xs:element xmlns:q9="http://schemas.microsoft.com/2003/10/Serialization/" minOccurs="0" name="clientId" type="q9:guid" />
     70        <xs:element xmlns:q10="http://schemas.microsoft.com/2003/10/Serialization/" minOccurs="0" name="clientId" type="q10:guid" />
    6771      </xs:sequence>
    6872    </xs:complexType>
    … …  
    7175    <xs:complexType>
    7276      <xs:sequence>
    73         <xs:element xmlns:q10="http://schemas.datacontract.org/2004/07/HeuristicLab.Hive.Contracts" minOccurs="0" name="LogoutResult" nillable="true" type="q10:Response" />
     77        <xs:element xmlns:q11="http://schemas.datacontract.org/2004/07/HeuristicLab.Hive.Contracts" minOccurs="0" name="LogoutResult" nillable="true" type="q11:Response" />
    7478      </xs:sequence>
    7579    </xs:complexType>

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

    r1097 r1103  
    126126    #region SendJobResults
    127127    public event System.EventHandler<SendJobResultCompletedEventArgs> SendJobResultCompleted;
    128     public void SendJobResultAsync(JobResult result, bool finished) {
     128    public void SendJobResultAsync(Guid clientId,
     129      long jobId,
     130      byte[] result,
     131      Exception exception,
     132      bool finished) {
    129133      if (ConnState == NetworkEnum.WcfConnState.Connected)
    130         proxy.SendJobResultAsync(result, finished);
     134        proxy.SendJobResultAsync(clientId,
     135           jobId,
     136           result,
     137           exception, 
     138           finished);
    131139    }
    132140    private void proxy_SendJobResultCompleted(object sender, SendJobResultCompletedEventArgs e) {

  • trunk/sources/HeuristicLab.Hive.Client.Communication/app.config

    r1007 r1103  
    2222        </bindings>
    2323        <client>
    24             <endpoint address="net.tcp://10.20.53.3:9000/HiveServer/ClientCommunicator"
     24            <endpoint address="net.tcp://10.0.2.15:9000/HiveServer/ClientCommunicator"
    2525                binding="netTcpBinding" bindingConfiguration="NetTcpBinding_IClientCommunicator"
    2626                contract="ServerService.IClientCommunicator" name="NetTcpBinding_IClientCommunicator">
    2727                <identity>
    28                     <userPrincipalName value="mse08003@fhs-hagenberg.ac.at" />
     28                    <userPrincipalName value="STEFAN-4710DBDB\Stefan" />
    2929                </identity>
    3030            </endpoint>

  • trunk/sources/HeuristicLab.Hive.Client.Core/Core.cs

    r1097 r1103  
    132132      byte[] sJob = engines[jId].GetFinishedJob();
    133133
    134       JobResult jobResult = new JobResult { Job = jobs[jId], Result = sJob, Client = ConfigManager.Instance.GetClientInfo() };
    135       wcfService.SendJobResultAsync(jobResult, true);     
     134      wcfService.SendJobResultAsync(ConfigManager.Instance.GetClientInfo().ClientId,
     135        jId,
     136        sJob,
     137        null,
     138        true);
    136139    }
    137140
    … …  
    181184      if (e.Result.Success) {
    182185        lock (Locker) {
    183           AppDomain.Unload(appDomains[e.Result.Job.Id]);
    184           appDomains.Remove(e.Result.Job.Id);
    185           engines.Remove(e.Result.Job.Id);
    186           jobs.Remove(e.Result.Job.Id);
     186          AppDomain.Unload(appDomains[e.Result.JobId]);
     187          appDomains.Remove(e.Result.JobId);
     188          engines.Remove(e.Result.JobId);
     189          jobs.Remove(e.Result.JobId);
    187190          ClientStatusInfo.JobsProcessed++;
    188191        }

  • trunk/sources/HeuristicLab.Hive.Contracts/BusinessObjects/JobResult.cs

    r1092 r1103  
    4040    [DataMember]
    4141    public Exception Exception { get; set; }
    42     [DataMember]
    43     public String Message { get; set; }
    4442  }
    4543}

  • trunk/sources/HeuristicLab.Hive.Contracts/Interfaces/IClientCommunicator.cs

    r1004 r1103  
    4040    ResponseJob PullJob(Guid clientId);
    4141    [OperationContract]
    42     ResponseResultReceived SendJobResult(JobResult result, bool finished);
     42    ResponseResultReceived SendJobResult(Guid clientId,
     43      long jobId,
     44      byte[] result,
     45      Exception exception, 
     46      bool finished);
    4347    [OperationContract]
    4448    Response Logout(Guid clientId);

  • trunk/sources/HeuristicLab.Hive.Contracts/ResponseResultReceived.cs

    r1005 r1103  
    3131  public class ResponseResultReceived : Response {
    3232    [DataMember]
    33     public Job Job { get; set; }
     33    public long JobId { get; set; }
    3434  }
    3535}

  • trunk/sources/HeuristicLab.Hive.Server.ADODataAccess/JobResultsAdapter.cs

    r1092 r1103  
    6565          row.SetResourceIdNull();
    6666
    67         if (result.Message != null)
    68           row.Message = result.Message;
     67        if (result.Exception != null)
     68          row.Message = result.Exception.ToString();
    6969        else
    7070          row.SetMessageNull();
    … …  
    9696
    9797        if (!row.IsMessageNull())
    98           result.Message = row.Message;
     98          result.Exception = new Exception(row.Message);
    9999        else
    100           result.Message = null;
     100          result.Exception = null;
    101101
    102102        return result;

  • trunk/sources/HeuristicLab.Hive.Server.Core/ClientCommunicator.cs

    r1099 r1103  
    147147
    148148    [MethodImpl(MethodImplOptions.Synchronized)]
    149     public ResponseResultReceived SendJobResult(JobResult result, bool finished) {
     149    public ResponseResultReceived SendJobResult(Guid clientId,
     150      long jobId,
     151      byte[] result,
     152      Exception exception, 
     153      bool finished) {
    150154      ResponseResultReceived response = new ResponseResultReceived();
    151       if (result.Id != 0) {
    152         response.Success = false;
    153         response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_ID_MUST_NOT_BE_SET;
    154         return response;
    155       }
    156       Job job = result.Job;
     155      ClientInfo client =
     156        clientAdapter.GetById(clientId);
     157
     158      Job job =
     159        jobAdapter.GetById(jobId);
    157160      if (job == null) {
    158161        response.Success = false;
    … …  
    173176          jobResultAdapter.Delete(currentResult);
    174177      }
    175       jobResultAdapter.Update(result);   
     178
     179      JobResult jobResult =
     180        new JobResult();
     181      jobResult.Client = client;
     182      jobResult.Job = job;
     183      jobResult.Result = result;
     184      jobResult.Exception = exception;
     185
     186      jobResultAdapter.Update(jobResult);   
    176187
    177188      response.Success = true;
    178189      response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_JOBRESULT_RECEIVED;
    179       response.Job = result.Job;
     190      response.JobId = jobId;
    180191
    181192      return response;

  • trunk/sources/HeuristicLab.Hive.Server.Core/ClientFacade.cs

    r1101 r1103  
    4848    }
    4949
    50     public ResponseResultReceived SendJobResult(JobResult result, bool finished) {
    51       return clientCommunicator.SendJobResult(result, finished);
     50    public ResponseResultReceived SendJobResult(Guid clientId,
     51      long jobId,
     52      byte[] result,
     53      Exception exception,
     54      bool finished) {
     55      return clientCommunicator.SendJobResult(clientId, jobId, result, exception, finished);
    5256    }
    5357
Note: See TracChangeset for help on using the changeset viewer.