Changeset 2802 for branches/DeploymentServer Prototype/HeuristicLab.Services/HeuristicLab.Services.Deployment.DataAccess

Timestamp:

02/15/10 15:41:38 (14 years ago)

Author:

gkronber

Message:

Worked on administration front-end for deployment service. #860 (Deployment server for plugin installation from web locations)

Location:

branches/DeploymentServer Prototype/HeuristicLab.Services/HeuristicLab.Services.Deployment.DataAccess

Files:

• HeuristicLab.Services.Deployment.DataAccess.csproj (modified) (2 diffs)
• PluginDescription.cs (modified) (2 diffs)
• PluginStore.cs (modified) (9 diffs)
• ProductDescription.cs (modified) (2 diffs)

branches/DeploymentServer Prototype/HeuristicLab.Services/HeuristicLab.Services.Deployment.DataAccess/HeuristicLab.Services.Deployment.DataAccess.csproj

@@ -53 +53 @@
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="ProductDescription.cs" />
     <Compile Include="PluginDescription.cs" />
     <Compile Include="PluginStore.cs" />
@@ -64 +63 @@
       <DependentUpon>PluginStoreClasses.dbml</DependentUpon>
     </Compile>
+    <Compile Include="ProductDescription.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Properties\Settings.Designer.cs">

branches/DeploymentServer Prototype/HeuristicLab.Services/HeuristicLab.Services.Deployment.DataAccess/PluginDescription.cs

@@ -8 +8 @@
   [DataContract(Name = "PluginDescription")]
   public class PluginDescription {
-
-    [DataMember(Name = "Id")]
-    private long id;
-    internal long Id {
-      get {
-        return id;
-      }
-      set {
-        id = value;
-      }
-    }
 
     [DataMember(Name = "Name")]
@@ -39 +28 @@
     }
 
-    //[DataMember(Name = "IsDatabaseInstance")]
-    //private bool isDatabaseInstance;
-    //internal bool IsDatabaseInstance {
-    //  get {
-    //    return isDatabaseInstance;
-    //  }
-    //}
-
-    internal PluginDescription(long id, string name, Version version, IEnumerable<PluginDescription> dependencies) {
-      this.id = id;
+    public PluginDescription(string name, Version version, IEnumerable<PluginDescription> dependencies) {
       this.name = name;
       this.version = version;
       this.dependencies = new List<PluginDescription>(dependencies); //.AsReadOnly();
-      //this.isDatabaseInstance = true;
-    }
-
-    public PluginDescription(string name, Version version, IEnumerable<PluginDescription> dependencies)
-      : this(0, name, version, dependencies) {
-      //this.isDatabaseInstance = false;
     }
 
     public PluginDescription(string name, Version version)
       : this(name, version, Enumerable.Empty<PluginDescription>()) {
-      //this.isDatabaseInstance = false;
     }
   }

branches/DeploymentServer Prototype/HeuristicLab.Services/HeuristicLab.Services.Deployment.DataAccess/PluginStore.cs

@@ -50 +50 @@
             if (pluginEntity.PluginPackage == null) {
               // insert
-              pluginEntity.PluginPackage = MakePluginPackage(pluginDescription, pluginPackage);
+              pluginEntity.PluginPackage = MakePluginPackage(pluginEntity, pluginPackage);
             } else {
               // update
@@ -104 +104 @@
       }
 
-      product.Id = productEntity.Id;
-
       DeleteOldPlugins(ctx, productEntity);
 
@@ -112 +110 @@
         ProductPlugin prodPlugin = new ProductPlugin();
         prodPlugin.PluginId = existingPlugin.Id;
-        prodPlugin.ProductId = product.Id;
+        prodPlugin.ProductId = productEntity.Id;
         ctx.ProductPlugins.InsertOnSubmit(prodPlugin);
       }
@@ -146 +144 @@
       if (pluginDescriptions.ContainsKey(pluginEntity)) pluginDescriptions.Remove(pluginEntity);
 
-      pluginDescription.Id = pluginEntity.Id;
-
       DeleteOldDependencies(ctx, pluginEntity);
 
@@ -153 +149 @@
         var dependencyEntity = GetExistingPlugin(ctx, dependency.Name, dependency.Version);
         Dependency d = new Dependency();
-        d.PluginId = pluginDescription.Id;
+        d.PluginId = pluginEntity.Id;
         d.DependencyId = dependencyEntity.Id;
         ctx.Dependencies.InsertOnSubmit(d);
@@ -173 +169 @@
     #region product <-> productDescription transformation
     private ProductDescription MakeProductDescription(PluginStoreClassesDataContext ctx, Product p, IQueryable<Plugin> plugins) {
-      var desc = new ProductDescription(p.Id, p.Name, new Version(p.Version), from plugin in plugins
-                                                                              select MakePluginDescription(ctx, plugin));
+      var desc = new ProductDescription(p.Name, new Version(p.Version), from plugin in plugins
+                                                                        select MakePluginDescription(ctx, plugin));
       return desc;
     }
     private Product MakeProductFromDescription(ProductDescription desc) {
       var product = new Product();
-      product.Id = desc.Id;
       product.Name = desc.Name;
       product.Version = desc.Version.ToString();
@@ -192 +187 @@
       if (!pluginDescriptions.ContainsKey(plugin)) {
         // no cached description -> create new
-        var desc = new PluginDescription(plugin.Id, plugin.Name, new Version(plugin.Version), from dep in GetDependencies(ctx, plugin)
-                                                                                              select MakePluginDescription(ctx, dep));
+        var desc = new PluginDescription(plugin.Name, new Version(plugin.Version), from dep in GetDependencies(ctx, plugin)
+                                                                                   select MakePluginDescription(ctx, dep));
         pluginDescriptions[plugin] = desc;
       }
@@ -201 +196 @@
     private Plugin MakePluginFromDescription(PluginDescription pluginDescription) {
       var plugin = new Plugin();
-      plugin.Id = pluginDescription.Id;
       plugin.Name = pluginDescription.Name;
       plugin.Version = pluginDescription.Version.ToString();
@@ -207 +201 @@
     }
 
-    private PluginPackage MakePluginPackage(PluginDescription pluginDescription, byte[] pluginPackage) {
+    private PluginPackage MakePluginPackage(Plugin plugin, byte[] pluginPackage) {
       var package = new PluginPackage();
       package.Data = pluginPackage;
-      package.PluginId = pluginDescription.Id;
+      package.PluginId = plugin.Id;
       package.FileName = string.Empty;
       return package;

branches/DeploymentServer Prototype/HeuristicLab.Services/HeuristicLab.Services.Deployment.DataAccess/ProductDescription.cs

@@ -8 +8 @@
   [DataContract(Name = "ProductDescription")]
   public class ProductDescription {
-
-    [DataMember(Name = "Id")]
-    private long id;
-    internal long Id {
-      get { return id; }
-      set { id = value; }
-    }
-
     [DataMember(Name = "Name")]
     private string name;
@@ -34 +26 @@
     }
 
-    internal ProductDescription(long id, string name, Version version, IEnumerable<PluginDescription> plugins) {
-      this.id = id;
+    public ProductDescription(string name, Version version, IEnumerable<PluginDescription> plugins) {
       this.name = name;
       this.version = version;
       this.plugins = new List<PluginDescription>(plugins).AsReadOnly();
     }
-
-    public ProductDescription(string name, Version version, IEnumerable<PluginDescription> plugins)
-      : this(0, name, version, plugins) {
-    }
-
+  
     public ProductDescription(string name, Version version) : this(name, version, Enumerable.Empty<PluginDescription>()) { }
   }