Changeset 2811


Ignore:
Timestamp:
02/16/10 12:44:12 (11 years ago)
Author:
gkronber
Message:

Fixed service references in plugin infrastructure. #860 (Deployment server for plugin installation from web locations)

Location:
trunk/sources/HeuristicLab.PluginInfrastructure
Files:
6 added
1 deleted
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.PluginInfrastructure/Advanced/InstallationManager.cs

    r2790 r2811  
    2727using System.IO;
    2828using System.ComponentModel;
    29 using UpdateService = HeuristicLab.PluginInfrastructure.PluginUpdateService;
    3029using System.Reflection;
    3130
     
    185184      var pluginDescriptions = from name in pluginNames
    186185                               select GetPluginDescription(name);
    187       Dictionary<UpdateService.PluginDescription, string> matchingPlugins = new Dictionary<UpdateService.PluginDescription, string>();
     186      Dictionary<DeploymentService.PluginDescription, string> matchingPlugins = new Dictionary<DeploymentService.PluginDescription, string>();
    188187      foreach (var updateLocation in HeuristicLab.PluginInfrastructure.Properties.Settings.Default.UpdateLocations) {
    189         using (var client = new UpdateService.UpdateClient("", updateLocation)) {
     188        using (var client = new DeploymentService.UpdateClient("", updateLocation)) {
    190189          var updateLocationMatchingPlugins = from desc in pluginDescriptions
    191190                                              from info in client.GetPlugins()
    192191                                              where desc.Name == info.Name
    193192                                              select info;
    194           foreach (UpdateService.PluginDescription info in updateLocationMatchingPlugins) {
     193          foreach (DeploymentService.PluginDescription info in updateLocationMatchingPlugins) {
    195194            // keep only the highest version of any plugin
    196195            var existingPlugin = matchingPlugins.Keys.FirstOrDefault(x => x.Name == info.Name);
     
    207206        var groupedInfos = matchingPlugins.GroupBy(x => x.Value);
    208207        foreach (var group in groupedInfos) {
    209           using (var client = new UpdateService.UpdateClient(group.Key)) {
     208          using (var client = new DeploymentService.UpdateClient(group.Key)) {
    210209            foreach (var info in group) {
    211210              client.GetPlugin(info.Key);
  • trunk/sources/HeuristicLab.PluginInfrastructure/Advanced/InstallationManagerConsole.cs

    r2790 r2811  
    2727using System.IO;
    2828using System.ComponentModel;
    29 using UpdateService = HeuristicLab.PluginInfrastructure.PluginUpdateService;
     29
    3030
    3131namespace HeuristicLab.PluginInfrastructure.Advanced {
     
    4444    void installManager_PreUpdatePlugin(object sender, PluginInfrastructureCancelEventArgs e) {
    4545      Console.WriteLine("Following plugins are updated:");
    46       var infos = (IEnumerable<UpdateService.PluginDescription>)e.Entity;
     46      var infos = (IEnumerable<PluginDescription>)e.Entity;
    4747      foreach (var info in infos) {
    4848        Console.WriteLine(info.Name + " " + info.Version);
     
    5454
    5555    void installManager_PluginUpdated(object sender, PluginInfrastructureEventArgs e) {
    56       foreach (var info in (IEnumerable<UpdateService.PluginDescription>)e.Entity)
     56      foreach (var info in (IEnumerable<PluginDescription>)e.Entity)
    5757        Console.WriteLine("Updated: {0}", info.Name);
    5858    }
  • trunk/sources/HeuristicLab.PluginInfrastructure/HeuristicLab.PluginInfrastructure.csproj

    r2783 r2811  
    9292  </ItemGroup>
    9393  <ItemGroup>
     94    <Compile Include="Advanced\DeploymentService\DeploymentService.cs" />
    9495    <Compile Include="Advanced\InstallationManagerConsole.cs" />
    9596    <Compile Include="Advanced\InstallationManager.cs" />
     
    99100    <Compile Include="Advanced\InstallationManagerForm.Designer.cs">
    100101      <DependentUpon>InstallationManagerForm.cs</DependentUpon>
     102    </Compile>
     103    <Compile Include="Advanced\DeploymentService\PluginDescription.cs">
     104      <SubType>Code</SubType>
     105    </Compile>
     106    <Compile Include="Advanced\DeploymentService\ProductDescription.cs">
     107      <SubType>Code</SubType>
    101108    </Compile>
    102109    <Compile Include="Attributes\ApplicationAttribute.cs" />
     
    155162      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
    156163    </None>
    157     <None Include="Service References\PluginUpdateService\HeuristicLab.Services.Deployment.DataAccess.xsd" />
    158     <None Include="Service References\PluginUpdateService\service.wsdl" />
    159     <None Include="Service References\PluginUpdateService\service.xsd" />
    160     <None Include="Service References\PluginUpdateService\service1.xsd" />
    161     <None Include="Service References\PluginUpdateService\System.xsd" />
    162164    <Compile Include="Properties\Settings.Designer.cs">
    163165      <AutoGen>True</AutoGen>
     
    166168    </Compile>
    167169    <Compile Include="Sandboxing\SandboxManager.cs" />
    168     <Compile Include="Service References\PluginUpdateService\Reference.cs">
    169       <AutoGen>True</AutoGen>
    170       <DesignTime>True</DesignTime>
    171       <DependentUpon>Reference.svcmap</DependentUpon>
    172     </Compile>
    173170    <Compile Include="Starter\SplashScreen.cs">
    174171      <SubType>Form</SubType>
     
    196193    <Content Include="Resources\List.gif" />
    197194    <Content Include="Resources\Logo_white.gif" />
    198     <None Include="Service References\PluginUpdateService\HeuristicLab.PluginInfrastructure.PluginUpdateService.PluginDescription.datasource">
    199       <DependentUpon>Reference.svcmap</DependentUpon>
    200     </None>
    201     <None Include="Service References\PluginUpdateService\HeuristicLab.PluginInfrastructure.PluginUpdateService.ProductDescription.datasource">
    202       <DependentUpon>Reference.svcmap</DependentUpon>
    203     </None>
    204     <None Include="Service References\PluginUpdateService\Reference.svcmap">
    205       <Generator>WCF Proxy Generator</Generator>
    206       <LastGenOutput>Reference.cs</LastGenOutput>
    207     </None>
    208     <None Include="Service References\PluginUpdateService\configuration.svcinfo" />
    209     <None Include="Service References\PluginUpdateService\configuration91.svcinfo" />
     195    <None Include="Advanced\DeploymentService\output.config" />
     196    <None Include="Advanced\DeploymentService\RegenerateServiceClasses.cmd" />
    210197  </ItemGroup>
    211198  <ItemGroup>
    212199    <WCFMetadata Include="Service References\" />
    213   </ItemGroup>
    214   <ItemGroup>
    215     <WCFMetadataStorage Include="Service References\PluginUpdateService\" />
    216200  </ItemGroup>
    217201  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
  • trunk/sources/HeuristicLab.PluginInfrastructure/app.config

    r2783 r2811  
    2525    </applicationSettings>
    2626    <system.serviceModel>
    27         <bindings>
    28             <wsHttpBinding>
    29                 <binding name="WSHttpBinding_IUpdate" closeTimeout="00:01:00"
    30                     openTimeout="00:01:00" receiveTimeout="00:10:00" sendTimeout="00:01:00"
    31                     bypassProxyOnLocal="false" transactionFlow="false" hostNameComparisonMode="StrongWildcard"
    32                     maxBufferPoolSize="524288" maxReceivedMessageSize="65536"
    33                     messageEncoding="Text" textEncoding="utf-8" useDefaultWebProxy="true"
    34                     allowCookies="false">
    35                     <readerQuotas maxDepth="32" maxStringContentLength="8192" maxArrayLength="16384"
    36                         maxBytesPerRead="4096" maxNameTableCharCount="16384" />
    37                     <reliableSession ordered="true" inactivityTimeout="00:10:00"
    38                         enabled="false" />
    39                     <security mode="Message">
    40                         <transport clientCredentialType="Windows" proxyCredentialType="None"
    41                             realm="" />
    42                         <message clientCredentialType="Windows" negotiateServiceCredential="true"
    43                             algorithmSuite="Default" establishSecurityContext="true" />
    44                     </security>
    45                 </binding>
    46             </wsHttpBinding>
    47         </bindings>
    48         <client>
    49             <endpoint address="http://localhost:8731/Design_Time_Addresses/HeuristicLab.Services.Deployment/Update/"
    50                 binding="wsHttpBinding" bindingConfiguration="WSHttpBinding_IUpdate"
    51                 contract="PluginUpdateService.IUpdate" name="WSHttpBinding_IUpdate">
    52                 <identity>
    53                     <dns value="localhost" />
    54                 </identity>
    55             </endpoint>
    56         </client>
     27        <bindings />
     28        <client />
    5729    </system.serviceModel>
    5830</configuration>
Note: See TracChangeset for help on using the changeset viewer.