Free cookie consent management tool by TermsFeed Policy Generator

Changeset 1007


Ignore:
Timestamp:
12/17/08 15:09:25 (16 years ago)
Author:
kgrading
Message:

ws update (#437)

Location:
trunk/sources
Files:
6 added
8 edited

Legend:

Unmodified
Added
Removed

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

    r993 r1007  
    8383    <None Include="HeuristicLab.snk" />
    8484    <None Include="Properties\AssemblyInfo.frame" />
    85     <None Include="Service References\ServerService\HeuristicLab.Hive.Contracts.BusinessObjects.xsd" />
    86     <None Include="Service References\ServerService\HeuristicLab.Hive.Contracts.xsd" />
    87     <None Include="Service References\ServerService\service.wsdl" />
    88     <None Include="Service References\ServerService\service.xsd" />
    89     <None Include="Service References\ServerService\service1.xsd" />
    90     <None Include="Service References\ServerService\System.xsd" />
    9185  </ItemGroup>
    9286  <ItemGroup>
    … …  
    125119    <None Include="Properties\DataSources\HeuristicLab.Hive.Contracts.ResponseJob.datasource" />
    126120    <None Include="Properties\DataSources\HeuristicLab.Hive.Contracts.ResponseResultReceived.datasource" />
     121    <None Include="Service References\ServerService\HeuristicLab.Hive.Contracts.BusinessObjects1.xsd" />
     122    <None Include="Service References\ServerService\HeuristicLab.Hive.Contracts1.xsd" />
    127123    <None Include="Service References\ServerService\Reference.svcmap">
    128124      <Generator>WCF Proxy Generator</Generator>
    129125      <LastGenOutput>Reference.cs</LastGenOutput>
    130126    </None>
     127    <None Include="Service References\ServerService\service1.wsdl" />
     128    <None Include="Service References\ServerService\service2.xsd" />
     129    <None Include="Service References\ServerService\service21.xsd" />
     130    <None Include="Service References\ServerService\System1.xsd" />
    131131  </ItemGroup>
    132132  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

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

    r993 r1007  
    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(HeuristicLab.Hive.Contracts.BusinessObjects.JobResult result, 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(HeuristicLab.Hive.Contracts.BusinessObjects.JobResult result, 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(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);
    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]));
     392            HeuristicLab.Hive.Contracts.BusinessObjects.JobResult result = ((HeuristicLab.Hive.Contracts.BusinessObjects.JobResult)(inValues[0]));
    393393            bool finished = ((bool)(inValues[1]));
    394             return this.BeginSendJobResult(Result, finished, callback, asyncState);
     394            return this.BeginSendJobResult(result, finished, callback, asyncState);
    395395        }
    396396       
    … …  
    408408        }
    409409       
    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) {
     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) {
    415415            if ((this.onBeginSendJobResultDelegate == null)) {
    416416                this.onBeginSendJobResultDelegate = new BeginOperationDelegate(this.OnBeginSendJobResult);
    … …  
    423423            }
    424424            base.InvokeAsync(this.onBeginSendJobResultDelegate, new object[] {
    425                         Result,
     425                        result,
    426426                        finished}, this.onEndSendJobResultDelegate, this.onSendJobResultCompletedDelegate, userState);
    427427        }

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

    r993 r1007  
    1818  </ClientOptions>
    1919  <MetadataSources>
    20     <MetadataSource Address="net.tcp://10.0.0.64:9000/HiveServer/mex" Protocol="mex" SourceId="1" />
     20    <MetadataSource Address="net.tcp://10.20.53.3:9000/HiveServer/mex" Protocol="mex" SourceId="1" />
    2121  </MetadataSources>
    2222  <Metadata>
    23     <MetadataFile FileName="service.wsdl" MetadataType="Wsdl" ID="6bbba849-1ffe-4854-bdd4-448cdc7c1f27" SourceId="1" SourceUrl="net.tcp://10.0.0.64:9000/HiveServer/mex" />
    24     <MetadataFile FileName="service.xsd" MetadataType="Schema" ID="04d8adba-75fa-43ec-be1a-4f47d65b127a" SourceId="1" SourceUrl="net.tcp://10.0.0.64:9000/HiveServer/mex" />
    25     <MetadataFile FileName="service1.xsd" MetadataType="Schema" ID="e737465f-b816-4df8-ab5d-42997bd9ec5b" SourceId="1" SourceUrl="net.tcp://10.0.0.64:9000/HiveServer/mex" />
    26     <MetadataFile FileName="HeuristicLab.Hive.Contracts.BusinessObjects.xsd" MetadataType="Schema" ID="22f23fdc-ce32-4813-bd0e-41b0b8ddadf7" SourceId="1" SourceUrl="net.tcp://10.0.0.64:9000/HiveServer/mex" />
    27     <MetadataFile FileName="HeuristicLab.Hive.Contracts.xsd" MetadataType="Schema" ID="2cc94d25-09bb-43c9-8f01-06f3f08714e7" SourceId="1" SourceUrl="net.tcp://10.0.0.64:9000/HiveServer/mex" />
    28     <MetadataFile FileName="System.xsd" MetadataType="Schema" ID="51f1a63c-0cce-4736-a71c-4fbdca1926b4" SourceId="1" SourceUrl="net.tcp://10.0.0.64:9000/HiveServer/mex" />
     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" />
    2929  </Metadata>
    3030  <Extensions>

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

    r993 r1007  
    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.0.0.64: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;sem-PC\sem&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.0.64: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;sem-PC\sem&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.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" />
    99  </endpoints>
    1010</configurationSnapshot>

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

    r993 r1007  
    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="emH4xWqYQm4GeIAMUhWYPT4/tzs=">
     2<SavedWcfConfigurationInformation xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" Version="9.1" CheckSum="kpA4Ej4a4mSz8NqKwKcNB68tDr0=">
    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.0.0.64:9000/HiveServer/ClientCommunicator" bindingConfiguration="NetTcpBinding_IClientCommunicator">
     109    <endpoint name="NetTcpBinding_IClientCommunicator" contract="ServerService.IClientCommunicator" bindingType="netTcpBinding" address="net.tcp://10.20.53.3: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.0.0.64:9000/HiveServer/ClientCommunicator</serializedValue>
     112          <serializedValue>net.tcp://10.20.53.3: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>sem-PC\sem</serializedValue>
     139          <serializedValue>mse08003@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/WcfService.cs

    r1001 r1007  
    9696    public event System.EventHandler<PullJobCompletedEventArgs> PullJobCompleted;
    9797    public void PullJobAsync(Guid guid) {
    98       if (ConnState == NetworkEnum.WcfConnState.Connected)
     98      if (ConnState == NetworkEnum.WcfConnState.Connected)       
    9999        proxy.PullJobAsync(guid);
    100100    }

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

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

  • trunk/sources/HeuristicLab/CopyAssemblies.cmd

    r1001 r1007  
    6161copy "%SolutionDir%\HeuristicLab.Visualization\%Outdir%\HeuristicLab.Visualization-3.2.dll" .\plugins
    6262copy "%SolutionDir%\HeuristicLab.Visualization.Test\%Outdir%\HeuristicLab.Visualization.Test-3.2.dll" .\plugins
    63 copy "%SolutionDir%\HeuristicLab.Hive.Job\%Outdir%\HeuristicLab.Hive.Job-3.2.dll" .\plugins
     63copy "%SolutionDir%\HeuristicLab.Hive.JobBase\%Outdir%\HeuristicLab.Hive.JobBase-3.2.dll" .\plugins
    6464copy "%SolutionDir%\HeuristicLab.Hive.Server\%Outdir%\HeuristicLab.Hive.Server-3.2.dll" .\plugins
    6565copy "%SolutionDir%\HeuristicLab.Hive.Server.ADODataAccess\%Outdir%\HeuristicLab.Hive.Server.ADODataAccess-3.2.dll" .\plugins
Note: See TracChangeset for help on using the changeset viewer.