Changeset 2811

Timestamp:

02/16/10 12:44:12 (14 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:

• Advanced/DeploymentService (added)
• Advanced/DeploymentService/DeploymentService.cs (added)
• Advanced/DeploymentService/PluginDescription.cs (added)
• Advanced/DeploymentService/ProductDescription.cs (added)
• Advanced/DeploymentService/RegenerateServiceClasses.cmd (added)
• Advanced/DeploymentService/output.config (added)
• Advanced/InstallationManager.cs (modified) (3 diffs)
• Advanced/InstallationManagerConsole.cs (modified) (3 diffs)
• HeuristicLab.PluginInfrastructure.csproj (modified) (5 diffs)
• Service References (deleted)
• app.config (modified) (1 diff)

trunk/sources/HeuristicLab.PluginInfrastructure/Advanced/InstallationManager.cs

@@ -27 +27 @@
 using System.IO;
 using System.ComponentModel;
-using UpdateService = HeuristicLab.PluginInfrastructure.PluginUpdateService;
 using System.Reflection;
 
@@ -185 +184 @@
       var pluginDescriptions = from name in pluginNames
                                select GetPluginDescription(name);
-      Dictionary<UpdateService.PluginDescription, string> matchingPlugins = new Dictionary<UpdateService.PluginDescription, string>();
+      Dictionary<DeploymentService.PluginDescription, string> matchingPlugins = new Dictionary<DeploymentService.PluginDescription, string>();
       foreach (var updateLocation in HeuristicLab.PluginInfrastructure.Properties.Settings.Default.UpdateLocations) {
-        using (var client = new UpdateService.UpdateClient("", updateLocation)) {
+        using (var client = new DeploymentService.UpdateClient("", updateLocation)) {
           var updateLocationMatchingPlugins = from desc in pluginDescriptions
                                               from info in client.GetPlugins()
                                               where desc.Name == info.Name
                                               select info;
-          foreach (UpdateService.PluginDescription info in updateLocationMatchingPlugins) {
+          foreach (DeploymentService.PluginDescription info in updateLocationMatchingPlugins) {
             // keep only the highest version of any plugin
             var existingPlugin = matchingPlugins.Keys.FirstOrDefault(x => x.Name == info.Name);
@@ -207 +206 @@
         var groupedInfos = matchingPlugins.GroupBy(x => x.Value);
         foreach (var group in groupedInfos) {
-          using (var client = new UpdateService.UpdateClient(group.Key)) {
+          using (var client = new DeploymentService.UpdateClient(group.Key)) {
             foreach (var info in group) {
               client.GetPlugin(info.Key);

trunk/sources/HeuristicLab.PluginInfrastructure/Advanced/InstallationManagerConsole.cs

@@ -27 +27 @@
 using System.IO;
 using System.ComponentModel;
-using UpdateService = HeuristicLab.PluginInfrastructure.PluginUpdateService;
+
 
 namespace HeuristicLab.PluginInfrastructure.Advanced {
@@ -44 +44 @@
     void installManager_PreUpdatePlugin(object sender, PluginInfrastructureCancelEventArgs e) {
       Console.WriteLine("Following plugins are updated:");
-      var infos = (IEnumerable<UpdateService.PluginDescription>)e.Entity;
+      var infos = (IEnumerable<PluginDescription>)e.Entity;
       foreach (var info in infos) {
         Console.WriteLine(info.Name + " " + info.Version);
@@ -54 +54 @@
 
     void installManager_PluginUpdated(object sender, PluginInfrastructureEventArgs e) {
-      foreach (var info in (IEnumerable<UpdateService.PluginDescription>)e.Entity)
+      foreach (var info in (IEnumerable<PluginDescription>)e.Entity)
         Console.WriteLine("Updated: {0}", info.Name);
     }

trunk/sources/HeuristicLab.PluginInfrastructure/HeuristicLab.PluginInfrastructure.csproj

@@ -92 +92 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Advanced\DeploymentService\DeploymentService.cs" />
     <Compile Include="Advanced\InstallationManagerConsole.cs" />
     <Compile Include="Advanced\InstallationManager.cs" />
@@ -99 +100 @@
     <Compile Include="Advanced\InstallationManagerForm.Designer.cs">
       <DependentUpon>InstallationManagerForm.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Advanced\DeploymentService\PluginDescription.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Advanced\DeploymentService\ProductDescription.cs">
+      <SubType>Code</SubType>
     </Compile>
     <Compile Include="Attributes\ApplicationAttribute.cs" />
@@ -155 +162 @@
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
     </None>
-    <None Include="Service References\PluginUpdateService\HeuristicLab.Services.Deployment.DataAccess.xsd" />
-    <None Include="Service References\PluginUpdateService\service.wsdl" />
-    <None Include="Service References\PluginUpdateService\service.xsd" />
-    <None Include="Service References\PluginUpdateService\service1.xsd" />
-    <None Include="Service References\PluginUpdateService\System.xsd" />
     <Compile Include="Properties\Settings.Designer.cs">
       <AutoGen>True</AutoGen>
@@ -166 +168 @@
     </Compile>
     <Compile Include="Sandboxing\SandboxManager.cs" />
-    <Compile Include="Service References\PluginUpdateService\Reference.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Reference.svcmap</DependentUpon>
-    </Compile>
     <Compile Include="Starter\SplashScreen.cs">
       <SubType>Form</SubType>
@@ -196 +193 @@
     <Content Include="Resources\List.gif" />
     <Content Include="Resources\Logo_white.gif" />
-    <None Include="Service References\PluginUpdateService\HeuristicLab.PluginInfrastructure.PluginUpdateService.PluginDescription.datasource">
-      <DependentUpon>Reference.svcmap</DependentUpon>
-    </None>
-    <None Include="Service References\PluginUpdateService\HeuristicLab.PluginInfrastructure.PluginUpdateService.ProductDescription.datasource">
-      <DependentUpon>Reference.svcmap</DependentUpon>
-    </None>
-    <None Include="Service References\PluginUpdateService\Reference.svcmap">
-      <Generator>WCF Proxy Generator</Generator>
-      <LastGenOutput>Reference.cs</LastGenOutput>
-    </None>
-    <None Include="Service References\PluginUpdateService\configuration.svcinfo" />
-    <None Include="Service References\PluginUpdateService\configuration91.svcinfo" />
+    <None Include="Advanced\DeploymentService\output.config" />
+    <None Include="Advanced\DeploymentService\RegenerateServiceClasses.cmd" />
   </ItemGroup>
   <ItemGroup>
     <WCFMetadata Include="Service References\" />
-  </ItemGroup>
-  <ItemGroup>
-    <WCFMetadataStorage Include="Service References\PluginUpdateService\" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

trunk/sources/HeuristicLab.PluginInfrastructure/app.config

@@ -25 +25 @@
     </applicationSettings>
     <system.serviceModel>
-        <bindings>
-            <wsHttpBinding>
-                <binding name="WSHttpBinding_IUpdate" closeTimeout="00:01:00"
-                    openTimeout="00:01:00" receiveTimeout="00:10:00" sendTimeout="00:01:00"
-                    bypassProxyOnLocal="false" transactionFlow="false" hostNameComparisonMode="StrongWildcard"
-                    maxBufferPoolSize="524288" maxReceivedMessageSize="65536"
-                    messageEncoding="Text" textEncoding="utf-8" useDefaultWebProxy="true"
-                    allowCookies="false">
-                    <readerQuotas maxDepth="32" maxStringContentLength="8192" maxArrayLength="16384"
-                        maxBytesPerRead="4096" maxNameTableCharCount="16384" />
-                    <reliableSession ordered="true" inactivityTimeout="00:10:00"
-                        enabled="false" />
-                    <security mode="Message">
-                        <transport clientCredentialType="Windows" proxyCredentialType="None"
-                            realm="" />
-                        <message clientCredentialType="Windows" negotiateServiceCredential="true"
-                            algorithmSuite="Default" establishSecurityContext="true" />
-                    </security>
-                </binding>
-            </wsHttpBinding>
-        </bindings>
-        <client>
-            <endpoint address="http://localhost:8731/Design_Time_Addresses/HeuristicLab.Services.Deployment/Update/"
-                binding="wsHttpBinding" bindingConfiguration="WSHttpBinding_IUpdate"
-                contract="PluginUpdateService.IUpdate" name="WSHttpBinding_IUpdate">
-                <identity>
-                    <dns value="localhost" />
-                </identity>
-            </endpoint>
-        </client>
+        <bindings />
+        <client />
     </system.serviceModel>
 </configuration>