Changeset 1366


Ignore:
Timestamp:
03/19/09 15:47:37 (12 years ago)
Author:
kgrading
Message:

bugfixes and updated webservice (#529)

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

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.Hive.Client.Communication/HeuristicLab.Hive.Client.Communication.csproj

    r1147 r1366  
    119119    <None Include="Properties\DataSources\HeuristicLab.Hive.Contracts.ResponseJob.datasource" />
    120120    <None Include="Properties\DataSources\HeuristicLab.Hive.Contracts.ResponseResultReceived.datasource" />
    121     <None Include="Service References\ServerService\Arrays.xsd" />
     121    <None Include="Service References\ServerService\Arrays1.xsd" />
    122122    <None Include="Service References\ServerService\HeuristicLab.Hive.Contracts.BusinessObjects1.xsd" />
    123123    <None Include="Service References\ServerService\HeuristicLab.Hive.Contracts1.xsd" />
  • trunk/sources/HeuristicLab.Hive.Client.Communication/Service References/ServerService/HeuristicLab.Hive.Contracts.BusinessObjects1.xsd

    r1147 r1366  
    2121  <xs:element name="ClientInfo" nillable="true" type="tns:ClientInfo" />
    2222  <xs:complexType name="Resource">
     23    <xs:complexContent mixed="false">
     24      <xs:extension base="tns:HiveBaseObject">
     25        <xs:sequence>
     26          <xs:element minOccurs="0" name="Name" nillable="true" type="xs:string" />
     27        </xs:sequence>
     28      </xs:extension>
     29    </xs:complexContent>
     30  </xs:complexType>
     31  <xs:element name="Resource" nillable="true" type="tns:Resource" />
     32  <xs:complexType name="HiveBaseObject">
    2333    <xs:sequence>
    2434      <xs:element minOccurs="0" name="Id" type="xs:long" />
    25       <xs:element minOccurs="0" name="Name" nillable="true" type="xs:string" />
    2635    </xs:sequence>
    2736  </xs:complexType>
    28   <xs:element name="Resource" nillable="true" type="tns:Resource" />
     37  <xs:element name="HiveBaseObject" nillable="true" type="tns:HiveBaseObject" />
    2938  <xs:complexType name="ClientConfig">
    30     <xs:sequence>
    31       <xs:element minOccurs="0" name="HeartBeatIntervall" type="xs:int" />
    32       <xs:element minOccurs="0" name="Id" type="xs:long" />
    33       <xs:element minOccurs="0" name="UpDownTimeCalendar" nillable="true" type="xs:string" />
    34     </xs:sequence>
     39    <xs:complexContent mixed="false">
     40      <xs:extension base="tns:HiveBaseObject">
     41        <xs:sequence>
     42          <xs:element minOccurs="0" name="HeartBeatIntervall" type="xs:int" />
     43          <xs:element minOccurs="0" name="UpDownTimeCalendar" nillable="true" type="xs:string" />
     44        </xs:sequence>
     45      </xs:extension>
     46    </xs:complexContent>
    3547  </xs:complexType>
    3648  <xs:element name="ClientConfig" nillable="true" type="tns:ClientConfig" />
     
    5567  <xs:element name="HeartBeatData" nillable="true" type="tns:HeartBeatData" />
    5668  <xs:complexType name="Job">
    57     <xs:sequence>
    58       <xs:element minOccurs="0" name="Client" nillable="true" type="tns:ClientInfo" />
    59       <xs:element minOccurs="0" name="Id" type="xs:long" />
    60       <xs:element minOccurs="0" name="ParentJob" nillable="true" type="tns:Job" />
    61       <xs:element minOccurs="0" name="Percentage" type="xs:double" />
    62       <xs:element minOccurs="0" name="SerializedJob" nillable="true" type="xs:base64Binary" />
    63       <xs:element minOccurs="0" name="State" type="tns:State" />
    64     </xs:sequence>
     69    <xs:complexContent mixed="false">
     70      <xs:extension base="tns:HiveBaseObject">
     71        <xs:sequence>
     72          <xs:element minOccurs="0" name="Client" nillable="true" type="tns:ClientInfo" />
     73          <xs:element minOccurs="0" name="DateCalculated" type="xs:dateTime" />
     74          <xs:element minOccurs="0" name="DateCreated" type="xs:dateTime" />
     75          <xs:element minOccurs="0" name="ParentJob" nillable="true" type="tns:Job" />
     76          <xs:element minOccurs="0" name="Percentage" type="xs:double" />
     77          <xs:element minOccurs="0" name="Priority" type="xs:int" />
     78          <xs:element minOccurs="0" name="SerializedJob" nillable="true" type="xs:base64Binary" />
     79          <xs:element minOccurs="0" name="State" type="tns:State" />
     80          <xs:element minOccurs="0" name="User" nillable="true" type="tns:User" />
     81        </xs:sequence>
     82      </xs:extension>
     83    </xs:complexContent>
    6584  </xs:complexType>
    6685  <xs:element name="Job" nillable="true" type="tns:Job" />
     86  <xs:complexType name="User">
     87    <xs:complexContent mixed="false">
     88      <xs:extension base="tns:PermissionOwner">
     89        <xs:sequence>
     90          <xs:element minOccurs="0" name="Password" nillable="true" type="xs:string" />
     91        </xs:sequence>
     92      </xs:extension>
     93    </xs:complexContent>
     94  </xs:complexType>
     95  <xs:element name="User" nillable="true" type="tns:User" />
     96  <xs:complexType name="PermissionOwner">
     97    <xs:complexContent mixed="false">
     98      <xs:extension base="tns:HiveBaseObject">
     99        <xs:sequence>
     100          <xs:element minOccurs="0" name="Name" nillable="true" type="xs:string" />
     101        </xs:sequence>
     102      </xs:extension>
     103    </xs:complexContent>
     104  </xs:complexType>
     105  <xs:element name="PermissionOwner" nillable="true" type="tns:PermissionOwner" />
    67106</xs:schema>
  • trunk/sources/HeuristicLab.Hive.Client.Communication/Service References/ServerService/HeuristicLab.Hive.Contracts1.xsd

    r1147 r1366  
    6060        <xs:sequence>
    6161          <xs:element minOccurs="0" name="JobId" type="xs:long" />
     62          <xs:element minOccurs="0" name="finished" type="xs:boolean" />
    6263        </xs:sequence>
    6364      </xs:extension>
  • trunk/sources/HeuristicLab.Hive.Client.Communication/Service References/ServerService/Reference.cs

    r1147 r1366  
    2727        HeuristicLab.Hive.Contracts.Response EndLogin(System.IAsyncResult result);
    2828       
    29         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IClientCommunicator/SendHeartBeat", ReplyAction="http://tempuri.org/IClientCommunicator/SendHeartBeatResponse")]
    30         HeuristicLab.Hive.Contracts.ResponseHB SendHeartBeat(HeuristicLab.Hive.Contracts.BusinessObjects.HeartBeatData hbData);
    31        
    32         [System.ServiceModel.OperationContractAttribute(AsyncPattern=true, Action="http://tempuri.org/IClientCommunicator/SendHeartBeat", ReplyAction="http://tempuri.org/IClientCommunicator/SendHeartBeatResponse")]
    33         System.IAsyncResult BeginSendHeartBeat(HeuristicLab.Hive.Contracts.BusinessObjects.HeartBeatData hbData, System.AsyncCallback callback, object asyncState);
    34        
    35         HeuristicLab.Hive.Contracts.ResponseHB EndSendHeartBeat(System.IAsyncResult result);
    36        
    37         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IClientCommunicator/PullJob", ReplyAction="http://tempuri.org/IClientCommunicator/PullJobResponse")]
    38         HeuristicLab.Hive.Contracts.ResponseJob PullJob(System.Guid clientId);
    39        
    40         [System.ServiceModel.OperationContractAttribute(AsyncPattern=true, Action="http://tempuri.org/IClientCommunicator/PullJob", ReplyAction="http://tempuri.org/IClientCommunicator/PullJobResponse")]
    41         System.IAsyncResult BeginPullJob(System.Guid clientId, System.AsyncCallback callback, object asyncState);
    42        
    43         HeuristicLab.Hive.Contracts.ResponseJob EndPullJob(System.IAsyncResult result);
    44        
    45         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IClientCommunicator/SendJobResult", ReplyAction="http://tempuri.org/IClientCommunicator/SendJobResultResponse")]
    46         HeuristicLab.Hive.Contracts.ResponseResultReceived SendJobResult(System.Guid clientId, long jobId, byte[] result, double percentage, System.Exception exception, bool finished);
    47        
    48         [System.ServiceModel.OperationContractAttribute(AsyncPattern=true, Action="http://tempuri.org/IClientCommunicator/SendJobResult", ReplyAction="http://tempuri.org/IClientCommunicator/SendJobResultResponse")]
    49         System.IAsyncResult BeginSendJobResult(System.Guid clientId, long jobId, byte[] result, double percentage, System.Exception exception, bool finished, System.AsyncCallback callback, object asyncState);
    50        
    51         HeuristicLab.Hive.Contracts.ResponseResultReceived EndSendJobResult(System.IAsyncResult result);
     29        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IClientCommunicator/ProcessHeartBeat", ReplyAction="http://tempuri.org/IClientCommunicator/ProcessHeartBeatResponse")]
     30        HeuristicLab.Hive.Contracts.ResponseHB ProcessHeartBeat(HeuristicLab.Hive.Contracts.BusinessObjects.HeartBeatData hbData);
     31       
     32        [System.ServiceModel.OperationContractAttribute(AsyncPattern=true, Action="http://tempuri.org/IClientCommunicator/ProcessHeartBeat", ReplyAction="http://tempuri.org/IClientCommunicator/ProcessHeartBeatResponse")]
     33        System.IAsyncResult BeginProcessHeartBeat(HeuristicLab.Hive.Contracts.BusinessObjects.HeartBeatData hbData, System.AsyncCallback callback, object asyncState);
     34       
     35        HeuristicLab.Hive.Contracts.ResponseHB EndProcessHeartBeat(System.IAsyncResult result);
     36       
     37        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IClientCommunicator/SendJob", ReplyAction="http://tempuri.org/IClientCommunicator/SendJobResponse")]
     38        HeuristicLab.Hive.Contracts.ResponseJob SendJob(System.Guid clientId);
     39       
     40        [System.ServiceModel.OperationContractAttribute(AsyncPattern=true, Action="http://tempuri.org/IClientCommunicator/SendJob", ReplyAction="http://tempuri.org/IClientCommunicator/SendJobResponse")]
     41        System.IAsyncResult BeginSendJob(System.Guid clientId, System.AsyncCallback callback, object asyncState);
     42       
     43        HeuristicLab.Hive.Contracts.ResponseJob EndSendJob(System.IAsyncResult result);
     44       
     45        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IClientCommunicator/ProcessJobResult", ReplyAction="http://tempuri.org/IClientCommunicator/ProcessJobResultResponse")]
     46        HeuristicLab.Hive.Contracts.ResponseResultReceived ProcessJobResult(System.Guid clientId, long jobId, byte[] result, double percentage, System.Exception exception, bool finished);
     47       
     48        [System.ServiceModel.OperationContractAttribute(AsyncPattern=true, Action="http://tempuri.org/IClientCommunicator/ProcessJobResult", ReplyAction="http://tempuri.org/IClientCommunicator/ProcessJobResultResponse")]
     49        System.IAsyncResult BeginProcessJobResult(System.Guid clientId, long jobId, byte[] result, double percentage, System.Exception exception, bool finished, System.AsyncCallback callback, object asyncState);
     50       
     51        HeuristicLab.Hive.Contracts.ResponseResultReceived EndProcessJobResult(System.IAsyncResult result);
    5252       
    5353        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IClientCommunicator/Logout", ReplyAction="http://tempuri.org/IClientCommunicator/LogoutResponse")]
     
    8888    [System.Diagnostics.DebuggerStepThroughAttribute()]
    8989    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "3.0.0.0")]
    90     public partial class SendHeartBeatCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
     90    public partial class ProcessHeartBeatCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
    9191       
    9292        private object[] results;
    9393       
    94         public SendHeartBeatCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
     94        public ProcessHeartBeatCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
    9595                base(exception, cancelled, userState) {
    9696            this.results = results;
     
    107107    [System.Diagnostics.DebuggerStepThroughAttribute()]
    108108    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "3.0.0.0")]
    109     public partial class PullJobCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
     109    public partial class SendJobCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
    110110       
    111111        private object[] results;
    112112       
    113         public PullJobCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
     113        public SendJobCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
    114114                base(exception, cancelled, userState) {
    115115            this.results = results;
     
    126126    [System.Diagnostics.DebuggerStepThroughAttribute()]
    127127    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "3.0.0.0")]
    128     public partial class SendJobResultCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
     128    public partial class ProcessJobResultCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
    129129       
    130130        private object[] results;
    131131       
    132         public SendJobResultCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
     132        public ProcessJobResultCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
    133133                base(exception, cancelled, userState) {
    134134            this.results = results;
     
    172172        private System.Threading.SendOrPostCallback onLoginCompletedDelegate;
    173173       
    174         private BeginOperationDelegate onBeginSendHeartBeatDelegate;
    175        
    176         private EndOperationDelegate onEndSendHeartBeatDelegate;
    177        
    178         private System.Threading.SendOrPostCallback onSendHeartBeatCompletedDelegate;
    179        
    180         private BeginOperationDelegate onBeginPullJobDelegate;
    181        
    182         private EndOperationDelegate onEndPullJobDelegate;
    183        
    184         private System.Threading.SendOrPostCallback onPullJobCompletedDelegate;
    185        
    186         private BeginOperationDelegate onBeginSendJobResultDelegate;
    187        
    188         private EndOperationDelegate onEndSendJobResultDelegate;
    189        
    190         private System.Threading.SendOrPostCallback onSendJobResultCompletedDelegate;
     174        private BeginOperationDelegate onBeginProcessHeartBeatDelegate;
     175       
     176        private EndOperationDelegate onEndProcessHeartBeatDelegate;
     177       
     178        private System.Threading.SendOrPostCallback onProcessHeartBeatCompletedDelegate;
     179       
     180        private BeginOperationDelegate onBeginSendJobDelegate;
     181       
     182        private EndOperationDelegate onEndSendJobDelegate;
     183       
     184        private System.Threading.SendOrPostCallback onSendJobCompletedDelegate;
     185       
     186        private BeginOperationDelegate onBeginProcessJobResultDelegate;
     187       
     188        private EndOperationDelegate onEndProcessJobResultDelegate;
     189       
     190        private System.Threading.SendOrPostCallback onProcessJobResultCompletedDelegate;
    191191       
    192192        private BeginOperationDelegate onBeginLogoutDelegate;
     
    217217        public event System.EventHandler<LoginCompletedEventArgs> LoginCompleted;
    218218       
    219         public event System.EventHandler<SendHeartBeatCompletedEventArgs> SendHeartBeatCompleted;
    220        
    221         public event System.EventHandler<PullJobCompletedEventArgs> PullJobCompleted;
    222        
    223         public event System.EventHandler<SendJobResultCompletedEventArgs> SendJobResultCompleted;
     219        public event System.EventHandler<ProcessHeartBeatCompletedEventArgs> ProcessHeartBeatCompleted;
     220       
     221        public event System.EventHandler<SendJobCompletedEventArgs> SendJobCompleted;
     222       
     223        public event System.EventHandler<ProcessJobResultCompletedEventArgs> ProcessJobResultCompleted;
    224224       
    225225        public event System.EventHandler<LogoutCompletedEventArgs> LogoutCompleted;
     
    275275        }
    276276       
    277         public HeuristicLab.Hive.Contracts.ResponseHB SendHeartBeat(HeuristicLab.Hive.Contracts.BusinessObjects.HeartBeatData hbData) {
    278             return base.Channel.SendHeartBeat(hbData);
    279         }
    280        
    281         [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
    282         public System.IAsyncResult BeginSendHeartBeat(HeuristicLab.Hive.Contracts.BusinessObjects.HeartBeatData hbData, System.AsyncCallback callback, object asyncState) {
    283             return base.Channel.BeginSendHeartBeat(hbData, callback, asyncState);
    284         }
    285        
    286         [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
    287         public HeuristicLab.Hive.Contracts.ResponseHB EndSendHeartBeat(System.IAsyncResult result) {
    288             return base.Channel.EndSendHeartBeat(result);
    289         }
    290        
    291         private System.IAsyncResult OnBeginSendHeartBeat(object[] inValues, System.AsyncCallback callback, object asyncState) {
     277        public HeuristicLab.Hive.Contracts.ResponseHB ProcessHeartBeat(HeuristicLab.Hive.Contracts.BusinessObjects.HeartBeatData hbData) {
     278            return base.Channel.ProcessHeartBeat(hbData);
     279        }
     280       
     281        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
     282        public System.IAsyncResult BeginProcessHeartBeat(HeuristicLab.Hive.Contracts.BusinessObjects.HeartBeatData hbData, System.AsyncCallback callback, object asyncState) {
     283            return base.Channel.BeginProcessHeartBeat(hbData, callback, asyncState);
     284        }
     285       
     286        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
     287        public HeuristicLab.Hive.Contracts.ResponseHB EndProcessHeartBeat(System.IAsyncResult result) {
     288            return base.Channel.EndProcessHeartBeat(result);
     289        }
     290       
     291        private System.IAsyncResult OnBeginProcessHeartBeat(object[] inValues, System.AsyncCallback callback, object asyncState) {
    292292            HeuristicLab.Hive.Contracts.BusinessObjects.HeartBeatData hbData = ((HeuristicLab.Hive.Contracts.BusinessObjects.HeartBeatData)(inValues[0]));
    293             return this.BeginSendHeartBeat(hbData, callback, asyncState);
    294         }
    295        
    296         private object[] OnEndSendHeartBeat(System.IAsyncResult result) {
    297             HeuristicLab.Hive.Contracts.ResponseHB retVal = this.EndSendHeartBeat(result);
     293            return this.BeginProcessHeartBeat(hbData, callback, asyncState);
     294        }
     295       
     296        private object[] OnEndProcessHeartBeat(System.IAsyncResult result) {
     297            HeuristicLab.Hive.Contracts.ResponseHB retVal = this.EndProcessHeartBeat(result);
    298298            return new object[] {
    299299                    retVal};
    300300        }
    301301       
    302         private void OnSendHeartBeatCompleted(object state) {
    303             if ((this.SendHeartBeatCompleted != null)) {
     302        private void OnProcessHeartBeatCompleted(object state) {
     303            if ((this.ProcessHeartBeatCompleted != null)) {
    304304                InvokeAsyncCompletedEventArgs e = ((InvokeAsyncCompletedEventArgs)(state));
    305                 this.SendHeartBeatCompleted(this, new SendHeartBeatCompletedEventArgs(e.Results, e.Error, e.Cancelled, e.UserState));
    306             }
    307         }
    308        
    309         public void SendHeartBeatAsync(HeuristicLab.Hive.Contracts.BusinessObjects.HeartBeatData hbData) {
    310             this.SendHeartBeatAsync(hbData, null);
    311         }
    312        
    313         public void SendHeartBeatAsync(HeuristicLab.Hive.Contracts.BusinessObjects.HeartBeatData hbData, object userState) {
    314             if ((this.onBeginSendHeartBeatDelegate == null)) {
    315                 this.onBeginSendHeartBeatDelegate = new BeginOperationDelegate(this.OnBeginSendHeartBeat);
    316             }
    317             if ((this.onEndSendHeartBeatDelegate == null)) {
    318                 this.onEndSendHeartBeatDelegate = new EndOperationDelegate(this.OnEndSendHeartBeat);
    319             }
    320             if ((this.onSendHeartBeatCompletedDelegate == null)) {
    321                 this.onSendHeartBeatCompletedDelegate = new System.Threading.SendOrPostCallback(this.OnSendHeartBeatCompleted);
    322             }
    323             base.InvokeAsync(this.onBeginSendHeartBeatDelegate, new object[] {
    324                         hbData}, this.onEndSendHeartBeatDelegate, this.onSendHeartBeatCompletedDelegate, userState);
    325         }
    326        
    327         public HeuristicLab.Hive.Contracts.ResponseJob PullJob(System.Guid clientId) {
    328             return base.Channel.PullJob(clientId);
    329         }
    330        
    331         [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
    332         public System.IAsyncResult BeginPullJob(System.Guid clientId, System.AsyncCallback callback, object asyncState) {
    333             return base.Channel.BeginPullJob(clientId, callback, asyncState);
    334         }
    335        
    336         [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
    337         public HeuristicLab.Hive.Contracts.ResponseJob EndPullJob(System.IAsyncResult result) {
    338             return base.Channel.EndPullJob(result);
    339         }
    340        
    341         private System.IAsyncResult OnBeginPullJob(object[] inValues, System.AsyncCallback callback, object asyncState) {
     305                this.ProcessHeartBeatCompleted(this, new ProcessHeartBeatCompletedEventArgs(e.Results, e.Error, e.Cancelled, e.UserState));
     306            }
     307        }
     308       
     309        public void ProcessHeartBeatAsync(HeuristicLab.Hive.Contracts.BusinessObjects.HeartBeatData hbData) {
     310            this.ProcessHeartBeatAsync(hbData, null);
     311        }
     312       
     313        public void ProcessHeartBeatAsync(HeuristicLab.Hive.Contracts.BusinessObjects.HeartBeatData hbData, object userState) {
     314            if ((this.onBeginProcessHeartBeatDelegate == null)) {
     315                this.onBeginProcessHeartBeatDelegate = new BeginOperationDelegate(this.OnBeginProcessHeartBeat);
     316            }
     317            if ((this.onEndProcessHeartBeatDelegate == null)) {
     318                this.onEndProcessHeartBeatDelegate = new EndOperationDelegate(this.OnEndProcessHeartBeat);
     319            }
     320            if ((this.onProcessHeartBeatCompletedDelegate == null)) {
     321                this.onProcessHeartBeatCompletedDelegate = new System.Threading.SendOrPostCallback(this.OnProcessHeartBeatCompleted);
     322            }
     323            base.InvokeAsync(this.onBeginProcessHeartBeatDelegate, new object[] {
     324                        hbData}, this.onEndProcessHeartBeatDelegate, this.onProcessHeartBeatCompletedDelegate, userState);
     325        }
     326       
     327        public HeuristicLab.Hive.Contracts.ResponseJob SendJob(System.Guid clientId) {
     328            return base.Channel.SendJob(clientId);
     329        }
     330       
     331        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
     332        public System.IAsyncResult BeginSendJob(System.Guid clientId, System.AsyncCallback callback, object asyncState) {
     333            return base.Channel.BeginSendJob(clientId, callback, asyncState);
     334        }
     335       
     336        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
     337        public HeuristicLab.Hive.Contracts.ResponseJob EndSendJob(System.IAsyncResult result) {
     338            return base.Channel.EndSendJob(result);
     339        }
     340       
     341        private System.IAsyncResult OnBeginSendJob(object[] inValues, System.AsyncCallback callback, object asyncState) {
    342342            System.Guid clientId = ((System.Guid)(inValues[0]));
    343             return this.BeginPullJob(clientId, callback, asyncState);
    344         }
    345        
    346         private object[] OnEndPullJob(System.IAsyncResult result) {
    347             HeuristicLab.Hive.Contracts.ResponseJob retVal = this.EndPullJob(result);
     343            return this.BeginSendJob(clientId, callback, asyncState);
     344        }
     345       
     346        private object[] OnEndSendJob(System.IAsyncResult result) {
     347            HeuristicLab.Hive.Contracts.ResponseJob retVal = this.EndSendJob(result);
    348348            return new object[] {
    349349                    retVal};
    350350        }
    351351       
    352         private void OnPullJobCompleted(object state) {
    353             if ((this.PullJobCompleted != null)) {
     352        private void OnSendJobCompleted(object state) {
     353            if ((this.SendJobCompleted != null)) {
    354354                InvokeAsyncCompletedEventArgs e = ((InvokeAsyncCompletedEventArgs)(state));
    355                 this.PullJobCompleted(this, new PullJobCompletedEventArgs(e.Results, e.Error, e.Cancelled, e.UserState));
    356             }
    357         }
    358        
    359         public void PullJobAsync(System.Guid clientId) {
    360             this.PullJobAsync(clientId, null);
    361         }
    362        
    363         public void PullJobAsync(System.Guid clientId, object userState) {
    364             if ((this.onBeginPullJobDelegate == null)) {
    365                 this.onBeginPullJobDelegate = new BeginOperationDelegate(this.OnBeginPullJob);
    366             }
    367             if ((this.onEndPullJobDelegate == null)) {
    368                 this.onEndPullJobDelegate = new EndOperationDelegate(this.OnEndPullJob);
    369             }
    370             if ((this.onPullJobCompletedDelegate == null)) {
    371                 this.onPullJobCompletedDelegate = new System.Threading.SendOrPostCallback(this.OnPullJobCompleted);
    372             }
    373             base.InvokeAsync(this.onBeginPullJobDelegate, new object[] {
    374                         clientId}, this.onEndPullJobDelegate, this.onPullJobCompletedDelegate, userState);
    375         }
    376        
    377         public HeuristicLab.Hive.Contracts.ResponseResultReceived SendJobResult(System.Guid clientId, long jobId, byte[] result, double percentage, System.Exception exception, bool finished) {
    378             return base.Channel.SendJobResult(clientId, jobId, result, percentage, exception, finished);
    379         }
    380        
    381         [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
    382         public System.IAsyncResult BeginSendJobResult(System.Guid clientId, long jobId, byte[] result, double percentage, System.Exception exception, bool finished, System.AsyncCallback callback, object asyncState) {
    383             return base.Channel.BeginSendJobResult(clientId, jobId, result, percentage, exception, finished, callback, asyncState);
    384         }
    385        
    386         [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
    387         public HeuristicLab.Hive.Contracts.ResponseResultReceived EndSendJobResult(System.IAsyncResult result) {
    388             return base.Channel.EndSendJobResult(result);
    389         }
    390        
    391         private System.IAsyncResult OnBeginSendJobResult(object[] inValues, System.AsyncCallback callback, object asyncState) {
     355                this.SendJobCompleted(this, new SendJobCompletedEventArgs(e.Results, e.Error, e.Cancelled, e.UserState));
     356            }
     357        }
     358       
     359        public void SendJobAsync(System.Guid clientId) {
     360            this.SendJobAsync(clientId, null);
     361        }
     362       
     363        public void SendJobAsync(System.Guid clientId, object userState) {
     364            if ((this.onBeginSendJobDelegate == null)) {
     365                this.onBeginSendJobDelegate = new BeginOperationDelegate(this.OnBeginSendJob);
     366            }
     367            if ((this.onEndSendJobDelegate == null)) {
     368                this.onEndSendJobDelegate = new EndOperationDelegate(this.OnEndSendJob);
     369            }
     370            if ((this.onSendJobCompletedDelegate == null)) {
     371                this.onSendJobCompletedDelegate = new System.Threading.SendOrPostCallback(this.OnSendJobCompleted);
     372            }
     373            base.InvokeAsync(this.onBeginSendJobDelegate, new object[] {
     374                        clientId}, this.onEndSendJobDelegate, this.onSendJobCompletedDelegate, userState);
     375        }
     376       
     377        public HeuristicLab.Hive.Contracts.ResponseResultReceived ProcessJobResult(System.Guid clientId, long jobId, byte[] result, double percentage, System.Exception exception, bool finished) {
     378            return base.Channel.ProcessJobResult(clientId, jobId, result, percentage, exception, finished);
     379        }
     380       
     381        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
     382        public System.IAsyncResult BeginProcessJobResult(System.Guid clientId, long jobId, byte[] result, double percentage, System.Exception exception, bool finished, System.AsyncCallback callback, object asyncState) {
     383            return base.Channel.BeginProcessJobResult(clientId, jobId, result, percentage, exception, finished, callback, asyncState);
     384        }
     385       
     386        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
     387        public HeuristicLab.Hive.Contracts.ResponseResultReceived EndProcessJobResult(System.IAsyncResult result) {
     388            return base.Channel.EndProcessJobResult(result);
     389        }
     390       
     391        private System.IAsyncResult OnBeginProcessJobResult(object[] inValues, System.AsyncCallback callback, object asyncState) {
    392392            System.Guid clientId = ((System.Guid)(inValues[0]));
    393393            long jobId = ((long)(inValues[1]));
     
    396396            System.Exception exception = ((System.Exception)(inValues[4]));
    397397            bool finished = ((bool)(inValues[5]));
    398             return this.BeginSendJobResult(clientId, jobId, result, percentage, exception, finished, callback, asyncState);
    399         }
    400        
    401         private object[] OnEndSendJobResult(System.IAsyncResult result) {
    402             HeuristicLab.Hive.Contracts.ResponseResultReceived retVal = this.EndSendJobResult(result);
     398            return this.BeginProcessJobResult(clientId, jobId, result, percentage, exception, finished, callback, asyncState);
     399        }
     400       
     401        private object[] OnEndProcessJobResult(System.IAsyncResult result) {
     402            HeuristicLab.Hive.Contracts.ResponseResultReceived retVal = this.EndProcessJobResult(result);
    403403            return new object[] {
    404404                    retVal};
    405405        }
    406406       
    407         private void OnSendJobResultCompleted(object state) {
    408             if ((this.SendJobResultCompleted != null)) {
     407        private void OnProcessJobResultCompleted(object state) {
     408            if ((this.ProcessJobResultCompleted != null)) {
    409409                InvokeAsyncCompletedEventArgs e = ((InvokeAsyncCompletedEventArgs)(state));
    410                 this.SendJobResultCompleted(this, new SendJobResultCompletedEventArgs(e.Results, e.Error, e.Cancelled, e.UserState));
    411             }
    412         }
    413        
    414         public void SendJobResultAsync(System.Guid clientId, long jobId, byte[] result, double percentage, System.Exception exception, bool finished) {
    415             this.SendJobResultAsync(clientId, jobId, result, percentage, exception, finished, null);
    416         }
    417        
    418         public void SendJobResultAsync(System.Guid clientId, long jobId, byte[] result, double percentage, System.Exception exception, bool finished, object userState) {
    419             if ((this.onBeginSendJobResultDelegate == null)) {
    420                 this.onBeginSendJobResultDelegate = new BeginOperationDelegate(this.OnBeginSendJobResult);
    421             }
    422             if ((this.onEndSendJobResultDelegate == null)) {
    423                 this.onEndSendJobResultDelegate = new EndOperationDelegate(this.OnEndSendJobResult);
    424             }
    425             if ((this.onSendJobResultCompletedDelegate == null)) {
    426                 this.onSendJobResultCompletedDelegate = new System.Threading.SendOrPostCallback(this.OnSendJobResultCompleted);
    427             }
    428             base.InvokeAsync(this.onBeginSendJobResultDelegate, new object[] {
     410                this.ProcessJobResultCompleted(this, new ProcessJobResultCompletedEventArgs(e.Results, e.Error, e.Cancelled, e.UserState));
     411            }
     412        }
     413       
     414        public void ProcessJobResultAsync(System.Guid clientId, long jobId, byte[] result, double percentage, System.Exception exception, bool finished) {
     415            this.ProcessJobResultAsync(clientId, jobId, result, percentage, exception, finished, null);
     416        }
     417       
     418        public void ProcessJobResultAsync(System.Guid clientId, long jobId, byte[] result, double percentage, System.Exception exception, bool finished, object userState) {
     419            if ((this.onBeginProcessJobResultDelegate == null)) {
     420                this.onBeginProcessJobResultDelegate = new BeginOperationDelegate(this.OnBeginProcessJobResult);
     421            }
     422            if ((this.onEndProcessJobResultDelegate == null)) {
     423                this.onEndProcessJobResultDelegate = new EndOperationDelegate(this.OnEndProcessJobResult);
     424            }
     425            if ((this.onProcessJobResultCompletedDelegate == null)) {
     426                this.onProcessJobResultCompletedDelegate = new System.Threading.SendOrPostCallback(this.OnProcessJobResultCompleted);
     427            }
     428            base.InvokeAsync(this.onBeginProcessJobResultDelegate, new object[] {
    429429                        clientId,
    430430                        jobId,
     
    432432                        percentage,
    433433                        exception,
    434                         finished}, this.onEndSendJobResultDelegate, this.onSendJobResultCompletedDelegate, userState);
     434                        finished}, this.onEndProcessJobResultDelegate, this.onProcessJobResultCompletedDelegate, userState);
    435435        }
    436436       
  • trunk/sources/HeuristicLab.Hive.Client.Communication/Service References/ServerService/Reference.svcmap

    r1147 r1366  
    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.20.53.2:9000/HiveServer/mex" Protocol="mex" SourceId="1" />
    2121  </MetadataSources>
    2222  <Metadata>
    23     <MetadataFile FileName="service1.wsdl" MetadataType="Wsdl" ID="fe9629c2-8699-40ca-940b-00c73e66938c" SourceId="1" SourceUrl="net.tcp://10.20.53.3:9000/HiveServer/mex" />
    24     <MetadataFile FileName="service2.xsd" MetadataType="Schema" ID="b7f8f39d-0e7c-422d-a294-433f875d2939" SourceId="1" SourceUrl="net.tcp://10.20.53.3:9000/HiveServer/mex" />
    25     <MetadataFile FileName="service3.xsd" MetadataType="Schema" ID="b050808b-3024-4a8d-be89-ceaf0ee6e420" SourceId="1" SourceUrl="net.tcp://10.20.53.3:9000/HiveServer/mex" />
    26     <MetadataFile FileName="HeuristicLab.Hive.Contracts.BusinessObjects1.xsd" MetadataType="Schema" ID="c15efe09-2f39-4cb9-b819-746aa9ca6c7c" SourceId="1" SourceUrl="net.tcp://10.20.53.3:9000/HiveServer/mex" />
    27     <MetadataFile FileName="HeuristicLab.Hive.Contracts1.xsd" MetadataType="Schema" ID="7746324c-e22e-448e-af4f-50af43b9079f" SourceId="1" SourceUrl="net.tcp://10.20.53.3:9000/HiveServer/mex" />
    28     <MetadataFile FileName="Arrays.xsd" MetadataType="Schema" ID="5dee5984-4a46-4cb4-a8ce-1721442c3342" SourceId="1" SourceUrl="net.tcp://10.20.53.3:9000/HiveServer/mex" />
    29     <MetadataFile FileName="System1.xsd" MetadataType="Schema" ID="1e3d4c2c-afbc-4828-aa3d-9fed927b6606" SourceId="1" SourceUrl="net.tcp://10.20.53.3:9000/HiveServer/mex" />
     23    <MetadataFile FileName="service1.wsdl" MetadataType="Wsdl" ID="82cfa882-0330-4203-b34c-ea82d152db7d" SourceId="1" SourceUrl="net.tcp://10.20.53.2:9000/HiveServer/mex" />
     24    <MetadataFile FileName="service2.xsd" MetadataType="Schema" ID="11d3bb75-8299-4928-b8dc-d716378ed760" SourceId="1" SourceUrl="net.tcp://10.20.53.2:9000/HiveServer/mex" />
     25    <MetadataFile FileName="service3.xsd" MetadataType="Schema" ID="e023ab8b-7af8-4c99-987d-6639735b1600" SourceId="1" SourceUrl="net.tcp://10.20.53.2:9000/HiveServer/mex" />
     26    <MetadataFile FileName="HeuristicLab.Hive.Contracts.BusinessObjects1.xsd" MetadataType="Schema" ID="a2b9f991-9c94-4b82-8de5-3797a066d2a4" SourceId="1" SourceUrl="net.tcp://10.20.53.2:9000/HiveServer/mex" />
     27    <MetadataFile FileName="HeuristicLab.Hive.Contracts1.xsd" MetadataType="Schema" ID="7d7ae733-1ac7-47bc-8215-a17cba2f7f23" SourceId="1" SourceUrl="net.tcp://10.20.53.2:9000/HiveServer/mex" />
     28    <MetadataFile FileName="Arrays1.xsd" MetadataType="Schema" ID="77920668-a89e-49ed-acc6-98584ea7aefb" SourceId="1" SourceUrl="net.tcp://10.20.53.2:9000/HiveServer/mex" />
     29    <MetadataFile FileName="System1.xsd" MetadataType="Schema" ID="681a5cc3-c407-4ae9-8e77-0b0e8efa299d" SourceId="1" SourceUrl="net.tcp://10.20.53.2:9000/HiveServer/mex" />
    3030  </Metadata>
    3131  <Extensions>
  • trunk/sources/HeuristicLab.Hive.Client.Communication/Service References/ServerService/configuration.svcinfo

    r1147 r1366  
    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.20.53.2: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;mse08023@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.2: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;mse08023@fhs-hagenberg.ac.at&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

    r1147 r1366  
    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="Rqe47epOB9kn3CQ5FcfRHLaniGg=">
    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.20.53.2: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.20.53.2: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>mse08023@fhs-hagenberg.ac.at</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

    r1147 r1366  
    5050    <wsdl:part name="parameters" element="tns:LoginResponse" />
    5151  </wsdl:message>
    52   <wsdl:message name="IClientCommunicator_SendHeartBeat_InputMessage">
    53     <wsdl:part name="parameters" element="tns:SendHeartBeat" />
     52  <wsdl:message name="IClientCommunicator_ProcessHeartBeat_InputMessage">
     53    <wsdl:part name="parameters" element="tns:ProcessHeartBeat" />
    5454  </wsdl:message>
    55   <wsdl:message name="IClientCommunicator_SendHeartBeat_OutputMessage">
    56     <wsdl:part name="parameters" element="tns:SendHeartBeatResponse" />
     55  <wsdl:message name="IClientCommunicator_ProcessHeartBeat_OutputMessage">
     56    <wsdl:part name="parameters" element="tns:ProcessHeartBeatResponse" />
    5757  </wsdl:message>
    58   <wsdl:message name="IClientCommunicator_PullJob_InputMessage">
    59     <wsdl:part name="parameters" element="tns:PullJob" />
     58  <wsdl:message name="IClientCommunicator_SendJob_InputMessage">
     59    <wsdl:part name="parameters" element="tns:SendJob" />
    6060  </wsdl:message>
    61   <wsdl:message name="IClientCommunicator_PullJob_OutputMessage">
    62     <wsdl:part name="parameters" element="tns:PullJobResponse" />
     61  <wsdl:message name="IClientCommunicator_SendJob_OutputMessage">
     62    <wsdl:part name="parameters" element="tns:SendJobResponse" />
    6363  </wsdl:message>
    64   <wsdl:message name="IClientCommunicator_SendJobResult_InputMessage">
    65     <wsdl:part name="parameters" element="tns:SendJobResult" />
     64  <wsdl:message name="IClientCommunicator_ProcessJobResult_InputMessage">
     65    <wsdl:part name="parameters" element="tns:ProcessJobResult" />
    6666  </wsdl:message>
    67   <wsdl:message name="IClientCommunicator_SendJobResult_OutputMessage">
    68     <wsdl:part name="parameters" element="tns:SendJobResultResponse" />
     67  <wsdl:message name="IClientCommunicator_ProcessJobResult_OutputMessage">
     68    <wsdl:part name="parameters" element="tns:ProcessJobResultResponse" />
    6969  </wsdl:message>
    7070  <wsdl:message name="IClientCommunicator_Logout_InputMessage">
     
    7979      <wsdl:output wsaw:Action="http://tempuri.org/IClientCommunicator/LoginResponse" message="tns:IClientCommunicator_Login_OutputMessage" />
    8080    </wsdl:operation>
    81     <wsdl:operation name="SendHeartBeat">
    82       <wsdl:input wsaw:Action="http://tempuri.org/IClientCommunicator/SendHeartBeat" message="tns:IClientCommunicator_SendHeartBeat_InputMessage" />
    83       <wsdl:output wsaw:Action="http://tempuri.org/IClientCommunicator/SendHeartBeatResponse" message="tns:IClientCommunicator_SendHeartBeat_OutputMessage" />
     81    <wsdl:operation name="ProcessHeartBeat">
     82      <wsdl:input wsaw:Action="http://tempuri.org/IClientCommunicator/ProcessHeartBeat" message="tns:IClientCommunicator_ProcessHeartBeat_InputMessage" />
     83      <wsdl:output wsaw:Action="http://tempuri.org/IClientCommunicator/ProcessHeartBeatResponse" message="tns:IClientCommunicator_ProcessHeartBeat_OutputMessage" />
    8484    </wsdl:operation>
    85     <wsdl:operation name="PullJob">
    86       <wsdl:input wsaw:Action="http://tempuri.org/IClientCommunicator/PullJob" message="tns:IClientCommunicator_PullJob_InputMessage" />
    87       <wsdl:output wsaw:Action="http://tempuri.org/IClientCommunicator/PullJobResponse" message="tns:IClientCommunicator_PullJob_OutputMessage" />
     85    <wsdl:operation name="SendJob">
     86      <wsdl:input wsaw:Action="http://tempuri.org/IClientCommunicator/SendJob" message="tns:IClientCommunicator_SendJob_InputMessage" />
     87      <wsdl:output wsaw:Action="http://tempuri.org/IClientCommunicator/SendJobResponse" message="tns:IClientCommunicator_SendJob_OutputMessage" />
    8888    </wsdl:operation>
    89     <wsdl:operation name="SendJobResult">
    90       <wsdl:input wsaw:Action="http://tempuri.org/IClientCommunicator/SendJobResult" message="tns:IClientCommunicator_SendJobResult_InputMessage" />
    91       <wsdl:output wsaw:Action="http://tempuri.org/IClientCommunicator/SendJobResultResponse" message="tns:IClientCommunicator_SendJobResult_OutputMessage" />
     89    <wsdl:operation name="ProcessJobResult">
     90      <wsdl:input wsaw:Action="http://tempuri.org/IClientCommunicator/ProcessJobResult" message="tns:IClientCommunicator_ProcessJobResult_InputMessage" />
     91      <wsdl:output wsaw:Action="http://tempuri.org/IClientCommunicator/ProcessJobResultResponse" message="tns:IClientCommunicator_ProcessJobResult_OutputMessage" />
    9292    </wsdl:operation>
    9393    <wsdl:operation name="Logout">
     
    109109      </wsdl:output>
    110110    </wsdl:operation>
    111     <wsdl:operation name="SendHeartBeat">
    112       <soap12:operation soapAction="http://tempuri.org/IClientCommunicator/SendHeartBeat" style="document" />
     111    <wsdl:operation name="ProcessHeartBeat">
     112      <soap12:operation soapAction="http://tempuri.org/IClientCommunicator/ProcessHeartBeat" style="document" />
    113113      <wsdl:input>
    114114        <soap12:body use="literal" />
     
    118118      </wsdl:output>
    119119    </wsdl:operation>
    120     <wsdl:operation name="PullJob">
    121       <soap12:operation soapAction="http://tempuri.org/IClientCommunicator/PullJob" style="document" />
     120    <wsdl:operation name="SendJob">
     121      <soap12:operation soapAction="http://tempuri.org/IClientCommunicator/SendJob" style="document" />
    122122      <wsdl:input>
    123123        <soap12:body use="literal" />
     
    127127      </wsdl:output>
    128128    </wsdl:operation>
    129     <wsdl:operation name="SendJobResult">
    130       <soap12:operation soapAction="http://tempuri.org/IClientCommunicator/SendJobResult" style="document" />
     129    <wsdl:operation name="ProcessJobResult">
     130      <soap12:operation soapAction="http://tempuri.org/IClientCommunicator/ProcessJobResult" style="document" />
    131131      <wsdl:input>
    132132        <soap12:body use="literal" />
     
    148148  <wsdl:service name="ClientFacade">
    149149    <wsdl:port name="NetTcpBinding_IClientCommunicator" binding="tns:NetTcpBinding_IClientCommunicator">
    150       <soap12:address location="net.tcp://10.20.53.3:9000/HiveServer/ClientCommunicator" />
     150      <soap12:address location="net.tcp://10.20.53.2:9000/HiveServer/ClientCommunicator" />
    151151      <wsa10:EndpointReference>
    152         <wsa10:Address>net.tcp://10.20.53.3:9000/HiveServer/ClientCommunicator</wsa10:Address>
     152        <wsa10:Address>net.tcp://10.20.53.2:9000/HiveServer/ClientCommunicator</wsa10:Address>
    153153        <Identity xmlns="http://schemas.xmlsoap.org/ws/2006/02/addressingidentity">
    154           <Upn>mse08003@fhs-hagenberg.ac.at</Upn>
     154          <Upn>mse08023@fhs-hagenberg.ac.at</Upn>
    155155        </Identity>
    156156      </wsa10:EndpointReference>
  • trunk/sources/HeuristicLab.Hive.Client.Communication/Service References/ServerService/service2.xsd

    r1147 r1366  
    1919    </xs:complexType>
    2020  </xs:element>
    21   <xs:element name="SendHeartBeat">
     21  <xs:element name="ProcessHeartBeat">
    2222    <xs:complexType>
    2323      <xs:sequence>
     
    2626    </xs:complexType>
    2727  </xs:element>
    28   <xs:element name="SendHeartBeatResponse">
     28  <xs:element name="ProcessHeartBeatResponse">
    2929    <xs:complexType>
    3030      <xs:sequence>
    31         <xs:element xmlns:q4="http://schemas.datacontract.org/2004/07/HeuristicLab.Hive.Contracts" minOccurs="0" name="SendHeartBeatResult" nillable="true" type="q4:ResponseHB" />
     31        <xs:element xmlns:q4="http://schemas.datacontract.org/2004/07/HeuristicLab.Hive.Contracts" minOccurs="0" name="ProcessHeartBeatResult" nillable="true" type="q4:ResponseHB" />
    3232      </xs:sequence>
    3333    </xs:complexType>
    3434  </xs:element>
    35   <xs:element name="PullJob">
     35  <xs:element name="SendJob">
    3636    <xs:complexType>
    3737      <xs:sequence>
     
    4040    </xs:complexType>
    4141  </xs:element>
    42   <xs:element name="PullJobResponse">
     42  <xs:element name="SendJobResponse">
    4343    <xs:complexType>
    4444      <xs:sequence>
    45         <xs:element xmlns:q6="http://schemas.datacontract.org/2004/07/HeuristicLab.Hive.Contracts" minOccurs="0" name="PullJobResult" nillable="true" type="q6:ResponseJob" />
     45        <xs:element xmlns:q6="http://schemas.datacontract.org/2004/07/HeuristicLab.Hive.Contracts" minOccurs="0" name="SendJobResult" nillable="true" type="q6:ResponseJob" />
    4646      </xs:sequence>
    4747    </xs:complexType>
    4848  </xs:element>
    49   <xs:element name="SendJobResult">
     49  <xs:element name="ProcessJobResult">
    5050    <xs:complexType>
    5151      <xs:sequence>
     
    5959    </xs:complexType>
    6060  </xs:element>
    61   <xs:element name="SendJobResultResponse">
     61  <xs:element name="ProcessJobResultResponse">
    6262    <xs:complexType>
    6363      <xs:sequence>
    64         <xs:element xmlns:q9="http://schemas.datacontract.org/2004/07/HeuristicLab.Hive.Contracts" minOccurs="0" name="SendJobResultResult" nillable="true" type="q9:ResponseResultReceived" />
     64        <xs:element xmlns:q9="http://schemas.datacontract.org/2004/07/HeuristicLab.Hive.Contracts" minOccurs="0" name="ProcessJobResultResult" nillable="true" type="q9:ResponseResultReceived" />
    6565      </xs:sequence>
    6666    </xs:complexType>
  • trunk/sources/HeuristicLab.Hive.Client.Communication/WcfService.cs

    r1340 r1366  
    7979
    8080        proxy.LoginCompleted += new EventHandler<LoginCompletedEventArgs>(proxy_LoginCompleted);
    81         proxy.PullJobCompleted += new EventHandler<PullJobCompletedEventArgs>(proxy_PullJobCompleted);
    82         proxy.SendJobResultCompleted += new EventHandler<SendJobResultCompletedEventArgs>(proxy_SendJobResultCompleted);
    83         proxy.SendHeartBeatCompleted += new EventHandler<SendHeartBeatCompletedEventArgs>(proxy_SendHeartBeatCompleted);
     81        proxy.SendJobCompleted += new EventHandler<SendJobCompletedEventArgs>(proxy_SendJobCompleted);
     82        proxy.ProcessJobResultCompleted += new EventHandler<ProcessJobResultCompletedEventArgs>(proxy_ProcessJobResultCompleted);
     83        proxy.ProcessHeartBeatCompleted += new EventHandler<ProcessHeartBeatCompletedEventArgs>(proxy_ProcessHeartBeatCompleted);
    8484        proxy.Open();
    8585
     
    168168    /// </summary>
    169169    #region PullJob
    170     public event System.EventHandler<PullJobCompletedEventArgs> PullJobCompleted;
     170    public event System.EventHandler<SendJobCompletedEventArgs> PullJobCompleted;
    171171    public void PullJobAsync(Guid guid) {
    172172      if (ConnState == NetworkEnum.WcfConnState.Loggedin)       
    173         proxy.PullJobAsync(guid);
    174     }
    175     void proxy_PullJobCompleted(object sender, PullJobCompletedEventArgs e) {
     173        proxy.SendJobAsync(guid);
     174    }
     175    void proxy_SendJobCompleted(object sender, SendJobCompletedEventArgs e) {
    176176      if (e.Error == null)
    177177        PullJobCompleted(sender, e);
     
    185185    /// </summary>
    186186    #region SendJobResults
    187     public event System.EventHandler<SendJobResultCompletedEventArgs> SendJobResultCompleted;
     187    public event System.EventHandler<ProcessJobResultCompletedEventArgs> SendJobResultCompleted;
    188188    public void SendJobResultAsync(Guid clientId, long jobId, byte[] result, double percentage, Exception exception, bool finished) {
    189189      if (ConnState == NetworkEnum.WcfConnState.Loggedin)
    190         proxy.SendJobResultAsync(clientId, jobId, result, percentage, exception, finished);
    191     }
    192     private void proxy_SendJobResultCompleted(object sender, SendJobResultCompletedEventArgs e) {
     190        proxy.ProcessJobResultAsync(clientId, jobId, result, percentage, exception, finished);
     191    }
     192    private void proxy_ProcessJobResultCompleted(object sender, ProcessJobResultCompletedEventArgs e) {
    193193      if (e.Error == null)
    194194        SendJobResultCompleted(sender, e);
     
    204204    #region Heartbeat
    205205
    206     public event System.EventHandler<SendHeartBeatCompletedEventArgs> SendHeartBeatCompleted;
     206    public event System.EventHandler<ProcessHeartBeatCompletedEventArgs> SendHeartBeatCompleted;
    207207    public void SendHeartBeatAsync(HeartBeatData hbd) {
    208208      if (ConnState == NetworkEnum.WcfConnState.Loggedin)
    209         proxy.SendHeartBeatAsync(hbd);
    210     }
    211 
    212     private void proxy_SendHeartBeatCompleted(object sender, SendHeartBeatCompletedEventArgs e) {
     209        proxy.ProcessHeartBeatAsync(hbd);
     210    }
     211
     212    private void proxy_ProcessHeartBeatCompleted(object sender, ProcessHeartBeatCompletedEventArgs e) {
    213213      if (e.Error == null)
    214214        SendHeartBeatCompleted(sender, e);
     
    223223    /// </summary>
    224224    #region SendJobResults
    225     public event System.EventHandler<SendJobResultCompletedEventArgs> SendStoredJobResultCompleted;
     225    public event System.EventHandler<ProcessJobResultCompletedEventArgs> SendStoredJobResultCompleted;
    226226    public void SendStoredJobResultAsync(Guid clientId, long jobId, byte[] result, double percentage, Exception exception, bool finished) {
    227227      if (ConnState == NetworkEnum.WcfConnState.Loggedin)
    228228        //TODO: some sort of algo for the stored jobs
    229         proxy.SendJobResultAsync(clientId, jobId, result, percentage, exception, finished);
     229        proxy.ProcessJobResultAsync(clientId, jobId, result, percentage, exception, finished);
    230230    } 
    231231    #endregion
    232232
    233233    public ResponseResultReceived SendStoredJobResultsSync(Guid clientId, long jobId, byte[] result, double percentage, Exception exception, bool finished) {
    234       return proxy.SendJobResult(clientId, jobId, result, percentage, exception, finished);
     234      return proxy.ProcessJobResult(clientId, jobId, result, percentage, exception, finished);
    235235    }
    236236  }
  • trunk/sources/HeuristicLab.Hive.Client.Communication/app.config

    r1147 r1366  
    2222        </bindings>
    2323        <client>
    24             <endpoint address="net.tcp://10.20.53.3:9000/HiveServer/ClientCommunicator"
     24            <endpoint address="net.tcp://10.20.53.2: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="mse08023@fhs-hagenberg.ac.at" />
    2929                </identity>
    3030            </endpoint>
  • trunk/sources/HeuristicLab.Hive.Client.Core/Core.cs

    r1364 r1366  
    8282      wcfService = WcfService.Instance;
    8383      wcfService.LoginCompleted += new EventHandler<LoginCompletedEventArgs>(wcfService_LoginCompleted);
    84       wcfService.PullJobCompleted += new EventHandler<PullJobCompletedEventArgs>(wcfService_PullJobCompleted);
    85       wcfService.SendJobResultCompleted += new EventHandler<SendJobResultCompletedEventArgs>(wcfService_SendJobResultCompleted);
     84      wcfService.PullJobCompleted += new EventHandler<SendJobCompletedEventArgs>(wcfService_PullJobCompleted);
     85      wcfService.SendJobResultCompleted += new EventHandler<ProcessJobResultCompletedEventArgs>(wcfService_SendJobResultCompleted);
    8686      wcfService.ConnectionRestored += new EventHandler(wcfService_ConnectionRestored);
    8787      wcfService.ServerChanged += new EventHandler(wcfService_ServerChanged);
     
    199199    }   
    200200
    201     void wcfService_PullJobCompleted(object sender, PullJobCompletedEventArgs e) {
     201    void wcfService_PullJobCompleted(object sender, SendJobCompletedEventArgs e) {
    202202      if (e.Result.StatusMessage != ApplicationConstants.RESPONSE_COMMUNICATOR_NO_JOBS_LEFT) {
    203203        bool sandboxed = true;
     
    227227    //Todo: Remove intellgent stuff from the async event and move it to the main thread (message queue)
    228228    //Todo: Seperate this method into 2: Finished jobs and Snapshots
    229     void wcfService_SendJobResultCompleted(object sender, SendJobResultCompletedEventArgs e) {
     229    void wcfService_SendJobResultCompleted(object sender, ProcessJobResultCompletedEventArgs e) {
    230230      if (e.Result.Success) {       
    231231        lock (Locker) {
  • trunk/sources/HeuristicLab.Hive.Client.Core/Heartbeat.cs

    r1340 r1366  
    6161      heartbeatTimer.Elapsed += new ElapsedEventHandler(heartbeatTimer_Elapsed);
    6262      wcfService = WcfService.Instance;
    63       wcfService.SendHeartBeatCompleted += new EventHandler<SendHeartBeatCompletedEventArgs>(wcfService_SendHeartBeatCompleted);
     63      wcfService.SendHeartBeatCompleted += new EventHandler<ProcessHeartBeatCompletedEventArgs>(wcfService_SendHeartBeatCompleted);
    6464      heartbeatTimer.Start();
    6565    }
     
    8888    }
    8989
    90     void wcfService_SendHeartBeatCompleted(object sender, SendHeartBeatCompletedEventArgs e) {
     90    void wcfService_SendHeartBeatCompleted(object sender, ProcessHeartBeatCompletedEventArgs e) {
    9191      System.Diagnostics.Debug.WriteLine("Heartbeat received! ");
    9292      e.Result.ActionRequest.ForEach(mc => MessageQueue.GetInstance().AddMessage(mc));
Note: See TracChangeset for help on using the changeset viewer.