Changeset 1594


Ignore:
Timestamp:
04/17/09 13:36:18 (12 years ago)
Author:
kgrading
Message:

updated the runner class & webservice interfaces (#547)

Location:
trunk/sources
Files:
4 added
1 deleted
12 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.Hive.Client.Communication/3.2/Service References/ServerService/HeuristicLab.Hive.Contracts.BusinessObjects1.xsd

    r1449 r1594  
    1010          <xs:element minOccurs="0" name="Config" nillable="true" type="tns:ClientConfig" />
    1111          <xs:element minOccurs="0" name="CpuSpeedPerCore" type="xs:int" />
     12          <xs:element minOccurs="0" name="FreeMemory" type="xs:int" />
    1213          <xs:element minOccurs="0" name="Login" type="xs:dateTime" />
    1314          <xs:element minOccurs="0" name="Memory" type="xs:int" />
    1415          <xs:element minOccurs="0" name="NrOfCores" type="xs:int" />
     16          <xs:element minOccurs="0" name="NrOfFreeCores" type="xs:int" />
    1517          <xs:element minOccurs="0" name="State" type="tns:State" />
    1618        </xs:sequence>
     
    4749      <xs:enumeration value="offline" />
    4850      <xs:enumeration value="finished" />
     51      <xs:enumeration value="abort" />
     52      <xs:enumeration value="requestSnapshot" />
    4953    </xs:restriction>
    5054  </xs:simpleType>
     
    6468        <xs:sequence>
    6569          <xs:element minOccurs="0" name="Client" nillable="true" type="tns:ClientInfo" />
     70          <xs:element minOccurs="0" name="CoresNeeded" type="xs:int" />
    6671          <xs:element minOccurs="0" name="DateCalculated" type="xs:dateTime" />
    6772          <xs:element minOccurs="0" name="DateCreated" type="xs:dateTime" />
     73          <xs:element minOccurs="0" name="MemoryNeeded" type="xs:int" />
    6874          <xs:element minOccurs="0" name="ParentJob" nillable="true" type="tns:Job" />
    6975          <xs:element minOccurs="0" name="Percentage" type="xs:double" />
     76          <xs:element minOccurs="0" name="PluginsNeeded" nillable="true" type="tns:ArrayOfHivePluginInfo" />
    7077          <xs:element minOccurs="0" name="Priority" type="xs:int" />
    7178          <xs:element minOccurs="0" name="SerializedJob" nillable="true" type="xs:base64Binary" />
     
    7784  </xs:complexType>
    7885  <xs:element name="Job" nillable="true" type="tns:Job" />
     86  <xs:complexType name="ArrayOfHivePluginInfo">
     87    <xs:sequence>
     88      <xs:element minOccurs="0" maxOccurs="unbounded" name="HivePluginInfo" nillable="true" type="tns:HivePluginInfo" />
     89    </xs:sequence>
     90  </xs:complexType>
     91  <xs:element name="ArrayOfHivePluginInfo" nillable="true" type="tns:ArrayOfHivePluginInfo" />
     92  <xs:complexType name="HivePluginInfo">
     93    <xs:complexContent mixed="false">
     94      <xs:extension xmlns:q5="http://schemas.datacontract.org/2004/07/HeuristicLab.DataAccess" base="q5:PersistableObject">
     95        <xs:sequence>
     96          <xs:element minOccurs="0" name="BuildDate" type="xs:dateTime" />
     97          <xs:element minOccurs="0" name="Name" nillable="true" type="xs:string" />
     98          <xs:element minOccurs="0" name="Version" nillable="true" type="xs:string" />
     99        </xs:sequence>
     100      </xs:extension>
     101    </xs:complexContent>
     102  </xs:complexType>
     103  <xs:element name="HivePluginInfo" nillable="true" type="tns:HivePluginInfo" />
    79104</xs:schema>
  • trunk/sources/HeuristicLab.Hive.Client.Communication/3.2/Service References/ServerService/HeuristicLab.Hive.Contracts1.xsd

    r1450 r1594  
    7272      <xs:extension base="tns:Response">
    7373        <xs:sequence>
    74           <xs:element xmlns:q2="http://schemas.datacontract.org/2004/07/HeuristicLab.PluginInfrastructure" minOccurs="0" name="Plugins" nillable="true" type="q2:ArrayOfCachedPlugin" />
     74          <xs:element xmlns:q2="http://schemas.datacontract.org/2004/07/HeuristicLab.PluginInfrastructure" minOccurs="0" name="Plugins" nillable="true" type="q2:ArrayOfCachedHivePluginInfo" />
    7575        </xs:sequence>
    7676      </xs:extension>
  • trunk/sources/HeuristicLab.Hive.Client.Communication/3.2/Service References/ServerService/Reference.cs

    r1450 r1594  
    22// <auto-generated>
    33//     This code was generated by a tool.
    4 //     Runtime Version:2.0.50727.3082
     4//     Runtime Version:2.0.50727.3053
    55//
    66//     Changes to this file may cause incorrect behavior and will be lost if
     
    8585       
    8686        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IClientCommunicator/SendPlugins", ReplyAction="http://tempuri.org/IClientCommunicator/SendPluginsResponse")]
    87         HeuristicLab.Hive.Contracts.ResponsePlugin SendPlugins(HeuristicLab.PluginInfrastructure.PluginInfo[] pluginList);
     87        HeuristicLab.Hive.Contracts.ResponsePlugin SendPlugins(HeuristicLab.Hive.Contracts.BusinessObjects.HivePluginInfo[] pluginList);
    8888       
    8989        [System.ServiceModel.OperationContractAttribute(AsyncPattern=true, Action="http://tempuri.org/IClientCommunicator/SendPlugins", ReplyAction="http://tempuri.org/IClientCommunicator/SendPluginsResponse")]
    90         System.IAsyncResult BeginSendPlugins(HeuristicLab.PluginInfrastructure.PluginInfo[] pluginList, System.AsyncCallback callback, object asyncState);
     90        System.IAsyncResult BeginSendPlugins(HeuristicLab.Hive.Contracts.BusinessObjects.HivePluginInfo[] pluginList, System.AsyncCallback callback, object asyncState);
    9191       
    9292        HeuristicLab.Hive.Contracts.ResponsePlugin EndSendPlugins(System.IAsyncResult result);
     
    702702        }
    703703       
    704         public HeuristicLab.Hive.Contracts.ResponsePlugin SendPlugins(HeuristicLab.PluginInfrastructure.PluginInfo[] pluginList) {
     704        public HeuristicLab.Hive.Contracts.ResponsePlugin SendPlugins(HeuristicLab.Hive.Contracts.BusinessObjects.HivePluginInfo[] pluginList) {
    705705            return base.Channel.SendPlugins(pluginList);
    706706        }
    707707       
    708708        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
    709         public System.IAsyncResult BeginSendPlugins(HeuristicLab.PluginInfrastructure.PluginInfo[] pluginList, System.AsyncCallback callback, object asyncState) {
     709        public System.IAsyncResult BeginSendPlugins(HeuristicLab.Hive.Contracts.BusinessObjects.HivePluginInfo[] pluginList, System.AsyncCallback callback, object asyncState) {
    710710            return base.Channel.BeginSendPlugins(pluginList, callback, asyncState);
    711711        }
     
    717717       
    718718        private System.IAsyncResult OnBeginSendPlugins(object[] inValues, System.AsyncCallback callback, object asyncState) {
    719             HeuristicLab.PluginInfrastructure.PluginInfo[] pluginList = ((HeuristicLab.PluginInfrastructure.PluginInfo[])(inValues[0]));
     719            HeuristicLab.Hive.Contracts.BusinessObjects.HivePluginInfo[] pluginList = ((HeuristicLab.Hive.Contracts.BusinessObjects.HivePluginInfo[])(inValues[0]));
    720720            return this.BeginSendPlugins(pluginList, callback, asyncState);
    721721        }
     
    734734        }
    735735       
    736         public void SendPluginsAsync(HeuristicLab.PluginInfrastructure.PluginInfo[] pluginList) {
     736        public void SendPluginsAsync(HeuristicLab.Hive.Contracts.BusinessObjects.HivePluginInfo[] pluginList) {
    737737            this.SendPluginsAsync(pluginList, null);
    738738        }
    739739       
    740         public void SendPluginsAsync(HeuristicLab.PluginInfrastructure.PluginInfo[] pluginList, object userState) {
     740        public void SendPluginsAsync(HeuristicLab.Hive.Contracts.BusinessObjects.HivePluginInfo[] pluginList, object userState) {
    741741            if ((this.onBeginSendPluginsDelegate == null)) {
    742742                this.onBeginSendPluginsDelegate = new BeginOperationDelegate(this.OnBeginSendPlugins);
  • trunk/sources/HeuristicLab.Hive.Client.Communication/3.2/Service References/ServerService/Reference.svcmap

    r1450 r1594  
    1818  </ClientOptions>
    1919  <MetadataSources>
    20     <MetadataSource Address="net.tcp://10.20.53.7: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="ceb125d3-f4d3-4af5-8fbf-11cb3a2a2651" SourceId="1" SourceUrl="net.tcp://10.20.53.7:9000/HiveServer/mex" />
    24     <MetadataFile FileName="service2.xsd" MetadataType="Schema" ID="b397e011-e88d-4a05-acb2-a7ff59cba729" SourceId="1" SourceUrl="net.tcp://10.20.53.7:9000/HiveServer/mex" />
    25     <MetadataFile FileName="service3.xsd" MetadataType="Schema" ID="c410fac9-aa83-4b25-924f-896bbb7e41d9" SourceId="1" SourceUrl="net.tcp://10.20.53.7:9000/HiveServer/mex" />
    26     <MetadataFile FileName="HeuristicLab.Hive.Contracts.BusinessObjects1.xsd" MetadataType="Schema" ID="3e897fc0-f222-46e3-a03a-7afd47f6419b" SourceId="1" SourceUrl="net.tcp://10.20.53.7:9000/HiveServer/mex" />
    27     <MetadataFile FileName="HeuristicLab.DataAccess1.xsd" MetadataType="Schema" ID="eafbe601-c045-41f4-b2dd-7fcf4ec1feef" SourceId="1" SourceUrl="net.tcp://10.20.53.7:9000/HiveServer/mex" />
    28     <MetadataFile FileName="HeuristicLab.Hive.Contracts1.xsd" MetadataType="Schema" ID="679f24c7-bc6c-45b8-a1cc-9339911bddc9" SourceId="1" SourceUrl="net.tcp://10.20.53.7:9000/HiveServer/mex" />
    29     <MetadataFile FileName="Arrays1.xsd" MetadataType="Schema" ID="53f47e2f-ca2b-4f21-9457-037e222fefaf" SourceId="1" SourceUrl="net.tcp://10.20.53.7:9000/HiveServer/mex" />
    30     <MetadataFile FileName="System1.xsd" MetadataType="Schema" ID="6a87c5f1-b08b-4dea-b2b3-bd10a1f13d52" SourceId="1" SourceUrl="net.tcp://10.20.53.7:9000/HiveServer/mex" />
    31     <MetadataFile FileName="HeuristicLab.PluginInfrastructure.xsd" MetadataType="Schema" ID="2dafc69c-27f2-456d-80d7-303362ac8b68" SourceId="1" SourceUrl="net.tcp://10.20.53.3:9000/HiveServer/mex" />
     23    <MetadataFile FileName="service1.wsdl" MetadataType="Wsdl" ID="3e312443-dbf2-4fea-83bf-061680f77672" SourceId="1" SourceUrl="net.tcp://10.20.53.2:9000/HiveServer/mex" />
     24    <MetadataFile FileName="service2.xsd" MetadataType="Schema" ID="a779c2ad-9688-4d69-b8d9-4646934978f7" SourceId="1" SourceUrl="net.tcp://10.20.53.2:9000/HiveServer/mex" />
     25    <MetadataFile FileName="service3.xsd" MetadataType="Schema" ID="beb401a3-0cfd-425e-a988-929712770fe6" SourceId="1" SourceUrl="net.tcp://10.20.53.2:9000/HiveServer/mex" />
     26    <MetadataFile FileName="HeuristicLab.Hive.Contracts.BusinessObjects1.xsd" MetadataType="Schema" ID="ca6a32ca-2685-4840-8a21-27071617387b" SourceId="1" SourceUrl="net.tcp://10.20.53.2:9000/HiveServer/mex" />
     27    <MetadataFile FileName="HeuristicLab.DataAccess.xsd" MetadataType="Schema" ID="b525b917-9b1e-4fa9-bbae-860f5bfcdaed" SourceId="1" SourceUrl="net.tcp://10.20.53.2:9000/HiveServer/mex" />
     28    <MetadataFile FileName="HeuristicLab.Hive.Contracts1.xsd" MetadataType="Schema" ID="5daa43c0-3c44-4734-ab5d-dcdf89126c13" SourceId="1" SourceUrl="net.tcp://10.20.53.2:9000/HiveServer/mex" />
     29    <MetadataFile FileName="Arrays1.xsd" MetadataType="Schema" ID="c0bbfc71-65d9-470c-9350-c588b628c1cf" SourceId="1" SourceUrl="net.tcp://10.20.53.2:9000/HiveServer/mex" />
     30    <MetadataFile FileName="System1.xsd" MetadataType="Schema" ID="13a2f08c-6842-4409-894d-0a86add68173" SourceId="1" SourceUrl="net.tcp://10.20.53.2:9000/HiveServer/mex" />
     31    <MetadataFile FileName="HeuristicLab.PluginInfrastructure1.xsd" MetadataType="Schema" ID="3b1f3008-1103-4efe-9d56-dc8d55109c87" SourceId="1" SourceUrl="net.tcp://10.20.53.2:9000/HiveServer/mex" />
    3232  </Metadata>
    3333  <Extensions>
  • trunk/sources/HeuristicLab.Hive.Client.Communication/3.2/Service References/ServerService/System1.xsd

    r1450 r1594  
    99  </xs:complexType>
    1010  <xs:element name="Exception" nillable="true" type="tns:Exception" />
    11   <xs:complexType name="Version">
    12     <xs:sequence>
    13       <xs:element name="_Build" type="xs:int" />
    14       <xs:element name="_Major" type="xs:int" />
    15       <xs:element name="_Minor" type="xs:int" />
    16       <xs:element name="_Revision" type="xs:int" />
    17     </xs:sequence>
    18   </xs:complexType>
    19   <xs:element name="Version" nillable="true" type="tns:Version" />
    2011</xs:schema>
  • trunk/sources/HeuristicLab.Hive.Client.Communication/3.2/Service References/ServerService/configuration.svcinfo

    r1449 r1594  
    33  <behaviors />
    44  <bindings>
    5     <binding digest="System.ServiceModel.Configuration.NetTcpBindingElement, System.ServiceModel, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089:&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-16&quot;?&gt;&lt;Data hostNameComparisonMode=&quot;StrongWildcard&quot; listenBacklog=&quot;10&quot; maxBufferSize=&quot;65536&quot; maxConnections=&quot;10&quot; name=&quot;NetTcpBinding_IClientCommunicator&quot; transactionFlow=&quot;false&quot; transactionProtocol=&quot;OleTransactions&quot; transferMode=&quot;Buffered&quot;&gt;&lt;readerQuotas maxArrayLength=&quot;16384&quot; maxBytesPerRead=&quot;4096&quot; maxDepth=&quot;32&quot; maxNameTableCharCount=&quot;16384&quot; maxStringContentLength=&quot;8192&quot; /&gt;&lt;reliableSession enabled=&quot;true&quot; inactivityTimeout=&quot;00:10:00&quot; ordered=&quot;true&quot; /&gt;&lt;security mode=&quot;None&quot;&gt;&lt;message clientCredentialType=&quot;Windows&quot; /&gt;&lt;transport clientCredentialType=&quot;Windows&quot; protectionLevel=&quot;EncryptAndSign&quot; /&gt;&lt;/security&gt;&lt;/Data&gt;" bindingType="netTcpBinding" name="NetTcpBinding_IClientCommunicator" />
     5    <binding digest="System.ServiceModel.Configuration.NetTcpBindingElement, System.ServiceModel, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089:&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-16&quot;?&gt;&lt;Data hostNameComparisonMode=&quot;StrongWildcard&quot; listenBacklog=&quot;10&quot; maxBufferSize=&quot;65536&quot; maxConnections=&quot;10&quot; name=&quot;NetTcpBinding_IClientCommunicator&quot; transactionFlow=&quot;false&quot; transactionProtocol=&quot;OleTransactions&quot; transferMode=&quot;Buffered&quot;&gt;&lt;readerQuotas maxArrayLength=&quot;16384&quot; maxBytesPerRead=&quot;4096&quot; maxDepth=&quot;32&quot; maxNameTableCharCount=&quot;16384&quot; maxStringContentLength=&quot;8192&quot; /&gt;&lt;reliableSession enabled=&quot;false&quot; inactivityTimeout=&quot;00:10:00&quot; ordered=&quot;true&quot; /&gt;&lt;security mode=&quot;Transport&quot;&gt;&lt;message clientCredentialType=&quot;Windows&quot; /&gt;&lt;transport clientCredentialType=&quot;Windows&quot; protectionLevel=&quot;EncryptAndSign&quot; /&gt;&lt;/security&gt;&lt;/Data&gt;" bindingType="netTcpBinding" name="NetTcpBinding_IClientCommunicator" />
    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.7:9000/HiveServer/ClientCommunicator&quot; binding=&quot;netTcpBinding&quot; bindingConfiguration=&quot;NetTcpBinding_IClientCommunicator&quot; contract=&quot;ServerService.IClientCommunicator&quot; name=&quot;NetTcpBinding_IClientCommunicator&quot; /&gt;" digest="&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-16&quot;?&gt;&lt;Data address=&quot;net.tcp://10.20.53.7:9000/HiveServer/ClientCommunicator&quot; binding=&quot;netTcpBinding&quot; bindingConfiguration=&quot;NetTcpBinding_IClientCommunicator&quot; contract=&quot;ServerService.IClientCommunicator&quot; name=&quot;NetTcpBinding_IClientCommunicator&quot; /&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/3.2/Service References/ServerService/configuration91.svcinfo

    r1449 r1594  
    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="dvRlSnVoK7OKlonsSUHj7d3kYQ4=">
     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">
     
    7777        </property>
    7878        <property path="/reliableSession/enabled" isComplexType="false" isExplicitlyDefined="true" clrType="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    79           <serializedValue>True</serializedValue>
     79          <serializedValue>False</serializedValue>
    8080        </property>
    8181        <property path="/security" isComplexType="true" isExplicitlyDefined="false" clrType="System.ServiceModel.Configuration.NetTcpSecurityElement, System.ServiceModel, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     
    8383        </property>
    8484        <property path="/security/mode" isComplexType="false" isExplicitlyDefined="true" clrType="System.ServiceModel.SecurityMode, System.ServiceModel, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    85           <serializedValue>None</serializedValue>
     85          <serializedValue>Transport</serializedValue>
    8686        </property>
    8787        <property path="/security/transport" isComplexType="true" isExplicitlyDefined="false" clrType="System.ServiceModel.Configuration.TcpTransportSecurityElement, System.ServiceModel, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     
    107107  </bindingConfigurations>
    108108  <endpoints>
    109     <endpoint name="NetTcpBinding_IClientCommunicator" contract="ServerService.IClientCommunicator" bindingType="netTcpBinding" address="net.tcp://10.20.53.7: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.7: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">
     
    136136          <serializedValue>System.ServiceModel.Configuration.UserPrincipalNameElement</serializedValue>
    137137        </property>
    138         <property path="/identity/userPrincipalName/value" isComplexType="false" isExplicitlyDefined="false" clrType="System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    139           <serializedValue />
     138        <property path="/identity/userPrincipalName/value" isComplexType="false" isExplicitlyDefined="true" clrType="System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     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/3.2/Service References/ServerService/service1.wsdl

    r1450 r1594  
    44    <wsp:ExactlyOne>
    55      <wsp:All>
    6         <wsrm:RMAssertion xmlns:wsrm="http://schemas.xmlsoap.org/ws/2005/02/rm/policy">
    7           <wsrm:InactivityTimeout Milliseconds="600000">
    8           </wsrm:InactivityTimeout>
    9           <wsrm:AcknowledgementInterval Milliseconds="200">
    10           </wsrm:AcknowledgementInterval>
    11         </wsrm:RMAssertion>
    126        <msb:BinaryEncoding xmlns:msb="http://schemas.microsoft.com/ws/06/2004/mspolicy/netbinary1">
    137        </msb:BinaryEncoding>
     8        <sp:TransportBinding xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
     9          <wsp:Policy>
     10            <sp:TransportToken>
     11              <wsp:Policy>
     12                <msf:WindowsTransportSecurity xmlns:msf="http://schemas.microsoft.com/ws/2006/05/framing/policy">
     13                  <msf:ProtectionLevel>EncryptAndSign</msf:ProtectionLevel>
     14                </msf:WindowsTransportSecurity>
     15              </wsp:Policy>
     16            </sp:TransportToken>
     17            <sp:AlgorithmSuite>
     18              <wsp:Policy>
     19                <sp:Basic256>
     20                </sp:Basic256>
     21              </wsp:Policy>
     22            </sp:AlgorithmSuite>
     23            <sp:Layout>
     24              <wsp:Policy>
     25                <sp:Strict>
     26                </sp:Strict>
     27              </wsp:Policy>
     28            </sp:Layout>
     29          </wsp:Policy>
     30        </sp:TransportBinding>
    1431        <wsaw:UsingAddressing>
    1532        </wsaw:UsingAddressing>
     
    190207  <wsdl:service name="ClientFacade">
    191208    <wsdl:port name="NetTcpBinding_IClientCommunicator" binding="tns:NetTcpBinding_IClientCommunicator">
    192       <soap12:address location="net.tcp://10.20.53.7:9000/HiveServer/ClientCommunicator" />
     209      <soap12:address location="net.tcp://10.20.53.2:9000/HiveServer/ClientCommunicator" />
    193210      <wsa10:EndpointReference>
    194         <wsa10:Address>net.tcp://10.20.53.7:9000/HiveServer/ClientCommunicator</wsa10:Address>
     211        <wsa10:Address>net.tcp://10.20.53.2:9000/HiveServer/ClientCommunicator</wsa10:Address>
     212        <Identity xmlns="http://schemas.xmlsoap.org/ws/2006/02/addressingidentity">
     213          <Upn>mse08023@fhs-hagenberg.ac.at</Upn>
     214        </Identity>
    195215      </wsa10:EndpointReference>
    196216    </wsdl:port>
  • trunk/sources/HeuristicLab.Hive.Client.Communication/3.2/Service References/ServerService/service2.xsd

    r1450 r1594  
    55  <xs:import namespace="http://schemas.microsoft.com/2003/10/Serialization/" />
    66  <xs:import namespace="http://schemas.datacontract.org/2004/07/System" />
    7   <xs:import namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.PluginInfrastructure" />
    87  <xs:element name="Login">
    98    <xs:complexType>
     
    115114    <xs:complexType>
    116115      <xs:sequence>
    117         <xs:element xmlns:q16="http://schemas.datacontract.org/2004/07/HeuristicLab.PluginInfrastructure" minOccurs="0" name="pluginList" nillable="true" type="q16:ArrayOfPluginInfo" />
     116        <xs:element xmlns:q19="http://schemas.datacontract.org/2004/07/HeuristicLab.Hive.Contracts.BusinessObjects" minOccurs="0" name="pluginList" nillable="true" type="q19:ArrayOfHivePluginInfo" />
    118117      </xs:sequence>
    119118    </xs:complexType>
  • trunk/sources/HeuristicLab.Hive.Client.Communication/3.2/WcfService.cs

    r1589 r1594  
    253253    }
    254254
    255     public List<CachedHivePluginInfo> RequestPlugins(List<PluginInfo> requestedPlugins) {
     255    public List<CachedHivePluginInfo> RequestPlugins(List<HivePluginInfo> requestedPlugins) {
    256256      try {
    257257        return proxy.SendPlugins(requestedPlugins.ToArray()).Plugins;
  • trunk/sources/HeuristicLab.Hive.Client.Core/3.2/PluginCache.cs

    r1589 r1594  
    66using HeuristicLab.Hive.Client.Communication;
    77using HeuristicLab.Hive.Client.Common;
     8using HeuristicLab.Hive.Contracts.BusinessObjects;
    89
    910namespace HeuristicLab.Hive.Client.Core {
     
    1920    }
    2021
    21     public List<CachedHivePluginInfo> GetPlugins(List<PluginInfo> requests) {
     22    public List<CachedHivePluginInfo> GetPlugins(List<HivePluginInfo> requests) {
    2223      List<CachedHivePluginInfo> neededPlugins = new List<CachedHivePluginInfo>();
    23       List<PluginInfo> missingPlugins = new List<PluginInfo>();
     24      List<HivePluginInfo> missingPlugins = new List<HivePluginInfo>();
    2425      bool found = false;
    25       foreach (PluginInfo info in requests) {
     26      foreach (HivePluginInfo info in requests) {
    2627        foreach (CachedHivePluginInfo cache in pluginCache) {
    2728          if (info.Equals(cache)) {
  • trunk/sources/HeuristicLab.PluginInfrastructure/Runner.cs

    r1229 r1594  
    4242      PluginManager.Manager.LoadedPlugins = plugins;
    4343    }
     44    /// <summary>
     45    /// Loads plugins from a byte array
     46    /// </summary>
     47    /// <param name="plugins">bytearray of all plugins that should be loaded</param>
     48    public void LoadPlugins(ICollection<byte[]> plugins) {
     49      foreach (byte[] plugin in plugins)
     50        Assembly.Load(plugin);
     51    }
    4452
    4553    public void Run(ApplicationInfo appInfo) {
Note: See TracChangeset for help on using the changeset viewer.