Changeset 3006
- Timestamp:
- 03/11/10 18:23:52 (15 years ago)
- Files:
-
- 34 added
- 11 deleted
- 34 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/DeploymentServer Prototype/HeuristicLab.Services/CreateDeploymentServiceDatabase.sql
r2767 r3006 1 USE [ master]1 USE [HeuristicLab.Deployment] 2 2 GO 3 4 /****** Object: Database [HeuristicLab.PluginStore] Script Date: 02/08/2010 19:01:45 ******/ 5 CREATE DATABASE [HeuristicLab.PluginStore] ON PRIMARY 6 ( NAME = N'HeuristicLab.PluginStore', FILENAME = N'C:\Program Files\Microsoft SQL Server\MSSQL.1\MSSQL\DATA\HeuristicLab.PluginStore.mdf' , SIZE = 22528KB , MAXSIZE = UNLIMITED, FILEGROWTH = 1024KB ) 7 LOG ON 8 ( NAME = N'HeuristicLab.PluginStore_log', FILENAME = N'C:\Program Files\Microsoft SQL Server\MSSQL.1\MSSQL\DATA\HeuristicLab.PluginStore_log.ldf' , SIZE = 2816KB , MAXSIZE = 2048GB , FILEGROWTH = 10%) 3 /****** Object: User [DeploymentService] Script Date: 03/11/2010 17:43:43 ******/ 4 CREATE USER [DeploymentService] FOR LOGIN [SERVDEV\DeploymentService] WITH DEFAULT_SCHEMA=[dbo] 9 5 GO 10 11 ALTER DATABASE [HeuristicLab.PluginStore] SET COMPATIBILITY_LEVEL = 90 12 GO 13 14 IF (1 = FULLTEXTSERVICEPROPERTY('IsFullTextInstalled')) 15 begin 16 EXEC [HeuristicLab.PluginStore].[dbo].[sp_fulltext_database] @action = 'enable' 17 end 18 GO 19 20 ALTER DATABASE [HeuristicLab.PluginStore] SET ANSI_NULL_DEFAULT OFF 21 GO 22 23 ALTER DATABASE [HeuristicLab.PluginStore] SET ANSI_NULLS OFF 24 GO 25 26 ALTER DATABASE [HeuristicLab.PluginStore] SET ANSI_PADDING OFF 27 GO 28 29 ALTER DATABASE [HeuristicLab.PluginStore] SET ANSI_WARNINGS OFF 30 GO 31 32 ALTER DATABASE [HeuristicLab.PluginStore] SET ARITHABORT OFF 33 GO 34 35 ALTER DATABASE [HeuristicLab.PluginStore] SET AUTO_CLOSE OFF 36 GO 37 38 ALTER DATABASE [HeuristicLab.PluginStore] SET AUTO_CREATE_STATISTICS ON 39 GO 40 41 ALTER DATABASE [HeuristicLab.PluginStore] SET AUTO_SHRINK OFF 42 GO 43 44 ALTER DATABASE [HeuristicLab.PluginStore] SET AUTO_UPDATE_STATISTICS ON 45 GO 46 47 ALTER DATABASE [HeuristicLab.PluginStore] SET CURSOR_CLOSE_ON_COMMIT OFF 48 GO 49 50 ALTER DATABASE [HeuristicLab.PluginStore] SET CURSOR_DEFAULT GLOBAL 51 GO 52 53 ALTER DATABASE [HeuristicLab.PluginStore] SET CONCAT_NULL_YIELDS_NULL OFF 54 GO 55 56 ALTER DATABASE [HeuristicLab.PluginStore] SET NUMERIC_ROUNDABORT OFF 57 GO 58 59 ALTER DATABASE [HeuristicLab.PluginStore] SET QUOTED_IDENTIFIER OFF 60 GO 61 62 ALTER DATABASE [HeuristicLab.PluginStore] SET RECURSIVE_TRIGGERS OFF 63 GO 64 65 ALTER DATABASE [HeuristicLab.PluginStore] SET DISABLE_BROKER 66 GO 67 68 ALTER DATABASE [HeuristicLab.PluginStore] SET AUTO_UPDATE_STATISTICS_ASYNC OFF 69 GO 70 71 ALTER DATABASE [HeuristicLab.PluginStore] SET DATE_CORRELATION_OPTIMIZATION OFF 72 GO 73 74 ALTER DATABASE [HeuristicLab.PluginStore] SET TRUSTWORTHY OFF 75 GO 76 77 ALTER DATABASE [HeuristicLab.PluginStore] SET ALLOW_SNAPSHOT_ISOLATION OFF 78 GO 79 80 ALTER DATABASE [HeuristicLab.PluginStore] SET PARAMETERIZATION SIMPLE 81 GO 82 83 ALTER DATABASE [HeuristicLab.PluginStore] SET READ_COMMITTED_SNAPSHOT OFF 84 GO 85 86 ALTER DATABASE [HeuristicLab.PluginStore] SET READ_WRITE 87 GO 88 89 ALTER DATABASE [HeuristicLab.PluginStore] SET RECOVERY SIMPLE 90 GO 91 92 ALTER DATABASE [HeuristicLab.PluginStore] SET MULTI_USER 93 GO 94 95 ALTER DATABASE [HeuristicLab.PluginStore] SET PAGE_VERIFY CHECKSUM 96 GO 97 98 ALTER DATABASE [HeuristicLab.PluginStore] SET DB_CHAINING OFF 99 GO 100 101 USE [HeuristicLab.PluginStore] 102 GO 103 104 /****** Object: Table [dbo].[Dependencies] Script Date: 02/08/2010 19:02:19 ******/ 6 /****** Object: Table [dbo].[Plugin] Script Date: 03/11/2010 17:43:45 ******/ 105 7 SET ANSI_NULLS ON 106 8 GO 107 108 9 SET QUOTED_IDENTIFIER ON 109 10 GO 110 111 CREATE TABLE [dbo].[Dependencies](112 [PluginId] [bigint] NOT NULL,113 [DependencyId] [bigint] NOT NULL,114 CONSTRAINT [PK_Dependencies] PRIMARY KEY CLUSTERED115 (116 [PluginId] ASC,117 [DependencyId] ASC118 )WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]119 ) ON [PRIMARY]120 121 GO122 123 ALTER TABLE [dbo].[Dependencies] WITH CHECK ADD CONSTRAINT [FK_Dependencies_Plugin] FOREIGN KEY([DependencyId])124 REFERENCES [dbo].[Plugin] ([Id])125 GO126 127 ALTER TABLE [dbo].[Dependencies] CHECK CONSTRAINT [FK_Dependencies_Plugin]128 GO129 130 ALTER TABLE [dbo].[Dependencies] WITH CHECK ADD CONSTRAINT [FK_Dependencies_Plugin2] FOREIGN KEY([PluginId])131 REFERENCES [dbo].[Plugin] ([Id])132 GO133 134 ALTER TABLE [dbo].[Dependencies] CHECK CONSTRAINT [FK_Dependencies_Plugin2]135 GO136 137 138 USE [HeuristicLab.PluginStore]139 GO140 141 /****** Object: Table [dbo].[Plugin] Script Date: 02/08/2010 19:02:48 ******/142 SET ANSI_NULLS ON143 GO144 145 SET QUOTED_IDENTIFIER ON146 GO147 148 11 CREATE TABLE [dbo].[Plugin]( 149 12 [Id] [bigint] IDENTITY(1,1) NOT NULL, 150 13 [Name] [nvarchar](300) NOT NULL, 151 14 [Version] [nvarchar](50) NOT NULL, 15 [ContactName] [text] NULL, 16 [ContactEmail] [text] NULL, 17 [License] [text] NULL, 152 18 CONSTRAINT [PK_Plugin] PRIMARY KEY CLUSTERED 153 19 ( … … 159 25 [Version] ASC 160 26 )WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] 161 ) ON [PRIMARY] 162 27 ) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY] 163 28 GO 164 165 166 USE [HeuristicLab.PluginStore] 167 GO 168 169 /****** Object: Table [dbo].[PluginPackage] Script Date: 02/08/2010 19:02:53 ******/ 29 /****** Object: Table [dbo].[Product] Script Date: 03/11/2010 17:43:45 ******/ 170 30 SET ANSI_NULLS ON 171 31 GO 172 173 32 SET QUOTED_IDENTIFIER ON 174 33 GO 175 176 CREATE TABLE [dbo].[PluginPackage](177 [PluginId] [bigint] NOT NULL,178 [FileName] [text] NOT NULL,179 [Data] [image] NOT NULL,180 CONSTRAINT [PK_PluginPackage] PRIMARY KEY CLUSTERED181 (182 [PluginId] ASC183 )WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]184 ) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]185 186 GO187 188 ALTER TABLE [dbo].[PluginPackage] WITH CHECK ADD CONSTRAINT [FK_PluginPackage_Plugin] FOREIGN KEY([PluginId])189 REFERENCES [dbo].[Plugin] ([Id])190 GO191 192 ALTER TABLE [dbo].[PluginPackage] CHECK CONSTRAINT [FK_PluginPackage_Plugin]193 GO194 195 196 197 USE [HeuristicLab.PluginStore]198 GO199 200 /****** Object: Table [dbo].[Product] Script Date: 02/08/2010 19:02:56 ******/201 SET ANSI_NULLS ON202 GO203 204 SET QUOTED_IDENTIFIER ON205 GO206 207 34 CREATE TABLE [dbo].[Product]( 208 35 [Id] [bigint] IDENTITY(1,1) NOT NULL, … … 219 46 )WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] 220 47 ) ON [PRIMARY] 221 222 48 GO 223 224 225 USE [HeuristicLab.PluginStore] 226 GO 227 228 /****** Object: Table [dbo].[ProductPlugin] Script Date: 02/08/2010 19:03:01 ******/ 49 /****** Object: Table [dbo].[ProductPlugin] Script Date: 03/11/2010 17:43:45 ******/ 229 50 SET ANSI_NULLS ON 230 51 GO 231 232 52 SET QUOTED_IDENTIFIER ON 233 53 GO 234 235 54 CREATE TABLE [dbo].[ProductPlugin]( 236 55 [ProductId] [bigint] NOT NULL, … … 242 61 )WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] 243 62 ) ON [PRIMARY] 244 245 63 GO 246 64 /****** Object: Table [dbo].[PluginPackage] Script Date: 03/11/2010 17:43:45 ******/ 65 SET ANSI_NULLS ON 66 GO 67 SET QUOTED_IDENTIFIER ON 68 GO 69 CREATE TABLE [dbo].[PluginPackage]( 70 [PluginId] [bigint] NOT NULL, 71 [Data] [image] NOT NULL, 72 CONSTRAINT [PK_PluginPackage] PRIMARY KEY CLUSTERED 73 ( 74 [PluginId] ASC 75 )WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] 76 ) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY] 77 GO 78 /****** Object: Table [dbo].[Dependencies] Script Date: 03/11/2010 17:43:45 ******/ 79 SET ANSI_NULLS ON 80 GO 81 SET QUOTED_IDENTIFIER ON 82 GO 83 CREATE TABLE [dbo].[Dependencies]( 84 [PluginId] [bigint] NOT NULL, 85 [DependencyId] [bigint] NOT NULL, 86 CONSTRAINT [PK_Dependencies] PRIMARY KEY CLUSTERED 87 ( 88 [PluginId] ASC, 89 [DependencyId] ASC 90 )WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] 91 ) ON [PRIMARY] 92 GO 93 /****** Object: Check [CK_Dependencies] Script Date: 03/11/2010 17:43:45 ******/ 94 ALTER TABLE [dbo].[Dependencies] WITH CHECK ADD CONSTRAINT [CK_Dependencies] CHECK (([PluginId]<>[DependencyId])) 95 GO 96 ALTER TABLE [dbo].[Dependencies] CHECK CONSTRAINT [CK_Dependencies] 97 GO 98 /****** Object: ForeignKey [FK_ProductPlugin_Plugin] Script Date: 03/11/2010 17:43:45 ******/ 247 99 ALTER TABLE [dbo].[ProductPlugin] WITH CHECK ADD CONSTRAINT [FK_ProductPlugin_Plugin] FOREIGN KEY([PluginId]) 248 100 REFERENCES [dbo].[Plugin] ([Id]) 249 101 GO 250 251 102 ALTER TABLE [dbo].[ProductPlugin] CHECK CONSTRAINT [FK_ProductPlugin_Plugin] 252 103 GO 253 104 /****** Object: ForeignKey [FK_ProductPlugin_Product] Script Date: 03/11/2010 17:43:45 ******/ 254 105 ALTER TABLE [dbo].[ProductPlugin] WITH CHECK ADD CONSTRAINT [FK_ProductPlugin_Product] FOREIGN KEY([ProductId]) 255 106 REFERENCES [dbo].[Product] ([Id]) 256 107 GO 257 258 108 ALTER TABLE [dbo].[ProductPlugin] CHECK CONSTRAINT [FK_ProductPlugin_Product] 259 109 GO 260 261 110 /****** Object: ForeignKey [FK_PluginPackage_Plugin] Script Date: 03/11/2010 17:43:45 ******/ 111 ALTER TABLE [dbo].[PluginPackage] WITH CHECK ADD CONSTRAINT [FK_PluginPackage_Plugin] FOREIGN KEY([PluginId]) 112 REFERENCES [dbo].[Plugin] ([Id]) 113 GO 114 ALTER TABLE [dbo].[PluginPackage] CHECK CONSTRAINT [FK_PluginPackage_Plugin] 115 GO 116 /****** Object: ForeignKey [FK_Dependencies_Plugin] Script Date: 03/11/2010 17:43:45 ******/ 117 ALTER TABLE [dbo].[Dependencies] WITH CHECK ADD CONSTRAINT [FK_Dependencies_Plugin] FOREIGN KEY([DependencyId]) 118 REFERENCES [dbo].[Plugin] ([Id]) 119 GO 120 ALTER TABLE [dbo].[Dependencies] CHECK CONSTRAINT [FK_Dependencies_Plugin] 121 GO 122 /****** Object: ForeignKey [FK_Dependencies_Plugin2] Script Date: 03/11/2010 17:43:45 ******/ 123 ALTER TABLE [dbo].[Dependencies] WITH CHECK ADD CONSTRAINT [FK_Dependencies_Plugin2] FOREIGN KEY([PluginId]) 124 REFERENCES [dbo].[Plugin] ([Id]) 125 GO 126 ALTER TABLE [dbo].[Dependencies] CHECK CONSTRAINT [FK_Dependencies_Plugin2] 127 GO -
branches/DeploymentServer Prototype/HeuristicLab.Services/HeuristicLab.DeploymentService.AdminClient/HeuristicLab.DeploymentService.AdminClient.csproj
r2860 r3006 74 74 </ItemGroup> 75 75 <ItemGroup> 76 <Compile Include="ConnectionSetupView.cs"> 77 <SubType>UserControl</SubType> 78 </Compile> 79 <Compile Include="ConnectionSetupView.Designer.cs"> 80 <DependentUpon>ConnectionSetupView.cs</DependentUpon> 81 </Compile> 82 <Compile Include="LicenseView.cs"> 83 <SubType>UserControl</SubType> 84 </Compile> 85 <Compile Include="LicenseView.Designer.cs"> 86 <DependentUpon>LicenseView.cs</DependentUpon> 87 </Compile> 76 88 <Compile Include="PluginComparisonView.cs"> 77 89 <SubType>UserControl</SubType> … … 85 97 <Compile Include="PluginView.Designer.cs"> 86 98 <DependentUpon>PluginView.cs</DependentUpon> 87 </Compile>88 <Compile Include="LicenseView.cs">89 <SubType>UserControl</SubType>90 </Compile>91 <Compile Include="LicenseView.Designer.cs">92 <DependentUpon>LicenseView.cs</DependentUpon>93 99 </Compile> 94 100 <Compile Include="ProductEditor.cs"> … … 133 139 </ItemGroup> 134 140 <ItemGroup> 135 <None Include="app.config" />136 141 <None Include="HeuristicLabDeploymentServiceAdminClientPlugin.cs.frame" /> 137 142 <None Include="Properties\AssemblyInfo.frame" /> 138 143 </ItemGroup> 139 144 <ItemGroup> 145 <EmbeddedResource Include="ConnectionSetupView.resx"> 146 <DependentUpon>ConnectionSetupView.cs</DependentUpon> 147 </EmbeddedResource> 148 <EmbeddedResource Include="LicenseView.resx"> 149 <DependentUpon>LicenseView.cs</DependentUpon> 150 </EmbeddedResource> 140 151 <EmbeddedResource Include="MainForm.resx"> 141 152 <DependentUpon>MainForm.cs</DependentUpon> … … 146 157 <EmbeddedResource Include="PluginView.resx"> 147 158 <DependentUpon>PluginView.cs</DependentUpon> 148 </EmbeddedResource>149 <EmbeddedResource Include="LicenseView.resx">150 <DependentUpon>LicenseView.cs</DependentUpon>151 159 </EmbeddedResource> 152 160 <EmbeddedResource Include="ProductEditor.resx"> -
branches/DeploymentServer Prototype/HeuristicLab.Services/HeuristicLab.DeploymentService.AdminClient/LicenseView.cs
r2816 r3006 7 7 using System.Text; 8 8 using System.Windows.Forms; 9 using HeuristicLab.MainForm;10 9 using HeuristicLab.PluginInfrastructure; 11 10 … … 18 17 } 19 18 20 public LicenseView( string name, string version, string licenseText) {19 public LicenseView(IPluginDescription plugin) { 21 20 InitializeComponent(); 22 Caption = "License of: " + name + " " + version;23 textBox.Text = licenseText;21 Caption = "License of: " + plugin; 22 textBox.Text = plugin.LicenseText; 24 23 } 25 24 } -
branches/DeploymentServer Prototype/HeuristicLab.Services/HeuristicLab.DeploymentService.AdminClient/PluginListView.Designer.cs
r2860 r3006 30 30 this.serverVersion = new System.Windows.Forms.ColumnHeader(); 31 31 this.imageList = new System.Windows.Forms.ImageList(this.components); 32 this.serverUrlLabel = new System.Windows.Forms.Label(); 33 this.serverUrlTextBox = new System.Windows.Forms.TextBox(); 34 this.connectButton = new System.Windows.Forms.Button(); 32 this.connectionSetupButton = new System.Windows.Forms.Button(); 35 33 this.refreshButton = new System.Windows.Forms.Button(); 36 34 this.uploadButton = new System.Windows.Forms.Button(); … … 83 81 this.imageList.TransparentColor = System.Drawing.Color.Transparent; 84 82 // 85 // serverUrlLabel83 // connectionSetupButton 86 84 // 87 this.serverUrlLabel.AutoSize = true; 88 this.serverUrlLabel.Location = new System.Drawing.Point(3, 6); 89 this.serverUrlLabel.Name = "serverUrlLabel"; 90 this.serverUrlLabel.Size = new System.Drawing.Size(98, 13); 91 this.serverUrlLabel.TabIndex = 5; 92 this.serverUrlLabel.Text = "Deployment server:"; 93 // 94 // serverUrlTextBox 95 // 96 this.serverUrlTextBox.Location = new System.Drawing.Point(107, 3); 97 this.serverUrlTextBox.Name = "serverUrlTextBox"; 98 this.serverUrlTextBox.Size = new System.Drawing.Size(246, 20); 99 this.serverUrlTextBox.TabIndex = 4; 100 // 101 // connectButton 102 // 103 this.connectButton.Location = new System.Drawing.Point(359, 1); 104 this.connectButton.Name = "connectButton"; 105 this.connectButton.Size = new System.Drawing.Size(75, 23); 106 this.connectButton.TabIndex = 3; 107 this.connectButton.Text = "Connect"; 108 this.connectButton.UseVisualStyleBackColor = true; 109 this.connectButton.Click += new System.EventHandler(this.connectButton_Click); 85 this.connectionSetupButton.Location = new System.Drawing.Point(84, 3); 86 this.connectionSetupButton.Name = "connectionSetupButton"; 87 this.connectionSetupButton.Size = new System.Drawing.Size(118, 23); 88 this.connectionSetupButton.TabIndex = 3; 89 this.connectionSetupButton.Text = "Edit Connection..."; 90 this.connectionSetupButton.UseVisualStyleBackColor = true; 91 this.connectionSetupButton.Click += new System.EventHandler(this.connectButton_Click); 110 92 // 111 93 // refreshButton 112 94 // 113 this.refreshButton.Location = new System.Drawing.Point( 440, 1);95 this.refreshButton.Location = new System.Drawing.Point(3, 3); 114 96 this.refreshButton.Name = "refreshButton"; 115 97 this.refreshButton.Size = new System.Drawing.Size(75, 23); … … 136 118 this.Controls.Add(this.uploadButton); 137 119 this.Controls.Add(this.refreshButton); 138 this.Controls.Add(this.connectButton); 139 this.Controls.Add(this.serverUrlTextBox); 140 this.Controls.Add(this.serverUrlLabel); 120 this.Controls.Add(this.connectionSetupButton); 141 121 this.Controls.Add(this.listView); 142 122 this.Name = "PluginListView"; 143 123 this.Size = new System.Drawing.Size(539, 508); 144 124 this.ResumeLayout(false); 145 this.PerformLayout();146 125 147 126 } … … 152 131 private System.Windows.Forms.ColumnHeader nameHeader; 153 132 private System.Windows.Forms.ColumnHeader localVersion; 154 private System.Windows.Forms.Button connectButton; 155 private System.Windows.Forms.Label serverUrlLabel; 156 private System.Windows.Forms.TextBox serverUrlTextBox; 133 private System.Windows.Forms.Button connectionSetupButton; 157 134 private System.Windows.Forms.ColumnHeader serverVersion; 158 135 private System.Windows.Forms.Button refreshButton; -
branches/DeploymentServer Prototype/HeuristicLab.Services/HeuristicLab.DeploymentService.AdminClient/PluginListView.cs
r2860 r3006 27 27 Caption = "Plugins"; 28 28 29 using (var client = new PluginDeploymentService.UpdateClient()) {30 serverUrlTextBox.Text = client.Endpoint.Address.ToString();31 }32 33 29 localAndServerPlugins = new Dictionary<IPluginDescription, PluginDeploymentService.PluginDescription>(); 34 30 … … 79 75 void updateServerPluginsWorker_DoWork(object sender, DoWorkEventArgs e) { 80 76 try { 81 using (var client = new PluginDeploymentService.UpdateClient()) { 82 e.Result = client.GetPlugins(); 83 e.Cancel = false; 84 } 77 var client = PluginDeploymentService.UpdateClientFactory.CreateClient(); 78 e.Result = client.GetPlugins(); 79 e.Cancel = false; 85 80 } 86 81 catch (EndpointNotFoundException) { … … 110 105 try { 111 106 var selectedPlugins = (IEnumerable<IPluginDescription>)e.Argument; 112 using (PluginDeploymentService.AdminClient adminClient = new PluginDeploymentService.AdminClient()) { 113 114 foreach (var plugin in IteratePlugins(selectedPlugins)) { 115 adminClient.DeployPlugin(MakePluginDescription(plugin), CreateZipPackage(plugin)); 116 } 107 PluginDeploymentService.AdminClient adminClient = PluginDeploymentService.AdminClientFactory.CreateClient(); 108 109 foreach (var plugin in IteratePlugins(selectedPlugins)) { 110 adminClient.DeployPlugin(MakePluginDescription(plugin), CreateZipPackage(plugin)); 117 111 } 118 112 e.Cancel = false; … … 142 136 143 137 private void connectButton_Click(object sender, EventArgs e) { 144 if (connectButton.Text == "Connect") { 145 DisableControl(); 146 RefreshPluginsAsync(); 147 } else { 148 UpdateControlsDisconnectedState(); 149 } 138 var connectionSetupView = new ConnectionSetupView(); 139 connectionSetupView.Show(); 150 140 } 151 141 … … 226 216 var dependencies = from dep in plugin.Dependencies 227 217 select MakePluginDescription(dep); 228 if (string.IsNullOrEmpty(plugin.ContactName) || string.IsNullOrEmpty(plugin.ContactEmail)) { 229 return new PluginDeploymentService.PluginDescription(plugin.Name, plugin.Version, dependencies); 230 } else return new PluginDeploymentService.PluginDescription(plugin.Name, plugin.Version, dependencies, plugin.ContactName, plugin.ContactEmail, plugin.LicenseText); 218 return new PluginDeploymentService.PluginDescription(plugin.Name, plugin.Version, dependencies, plugin.ContactName, plugin.ContactEmail, plugin.LicenseText); 231 219 } 232 220 … … 256 244 257 245 private void UpdateControlsDisconnectedState() { 258 connectButton.Text = "Connect"; 259 serverUrlTextBox.Enabled = true; 260 serverUrlLabel.Enabled = true; 246 connectionSetupButton.Text = "Connect"; 261 247 refreshButton.Enabled = false; 262 248 … … 269 255 270 256 private void UpdateControlsConnectedState() { 271 connectButton.Text = "Disconnect"; 272 connectButton.Enabled = true; 273 serverUrlTextBox.Enabled = false; 274 serverUrlLabel.Enabled = false; 257 connectionSetupButton.Text = "Disconnect"; 258 connectionSetupButton.Enabled = true; 275 259 refreshButton.Enabled = true; 276 260 listView.Enabled = true; -
branches/DeploymentServer Prototype/HeuristicLab.Services/HeuristicLab.DeploymentService.AdminClient/PluginView.Designer.cs
r2860 r3006 139 139 this.dependenciesListView.UseCompatibleStateImageBehavior = false; 140 140 this.dependenciesListView.View = System.Windows.Forms.View.Details; 141 this.dependenciesListView.ItemActivate += new System.EventHandler(this.dependenciesListView_ItemActivate); 141 142 // 142 143 // pluginNameHeader -
branches/DeploymentServer Prototype/HeuristicLab.Services/HeuristicLab.DeploymentService.AdminClient/PluginView.cs
r2860 r3006 28 28 29 29 this.plugin = plugin; 30 this.Name = "Plugin Details: " + plugin.ToString(); 30 31 UpdateControls(); 31 32 } … … 44 45 foreach (IPluginDescription dependency in plugin.Dependencies) { 45 46 var depItem = new ListViewItem(new string[] { dependency.Name, dependency.Version.ToString() }); 47 depItem.Tag = dependency; 46 48 depItem.ImageKey = IMAGE_KEY_ASSEMBLY; 47 49 dependenciesListView.Items.Add(depItem); … … 73 75 74 76 private void licenseButton_Click(object sender, EventArgs e) { 75 LicenseView view = new LicenseView(plugin .Name, plugin.Version.ToString(), plugin.LicenseText);77 LicenseView view = new LicenseView(plugin); 76 78 view.Show(); 79 } 80 81 private void dependenciesListView_ItemActivate(object sender, EventArgs e) { 82 if (dependenciesListView.SelectedItems.Count > 0) { 83 var dep = (IPluginDescription)dependenciesListView.SelectedItems[0].Tag; 84 PluginView view = new PluginView(dep); 85 view.Show(); 86 } 77 87 } 78 88 } -
branches/DeploymentServer Prototype/HeuristicLab.Services/HeuristicLab.Services.Deployment.Test/HeuristicLab.Services.Deployment.Test.csproj
r2804 r3006 106 106 <None Include="Properties\DataSources\HeuristicLab.Services.Deployment.PluginDescription.datasource" /> 107 107 <None Include="Properties\DataSources\HeuristicLab.Services.Deployment.ProductDescription.datasource" /> 108 <None Include="Service References\AdminService\HeuristicLab.Services.Deployment .xsd" />109 <None Include="Service References\AdminService\service .wsdl" />110 <None Include="Service References\AdminService\service .xsd" />111 <None Include="Service References\AdminService\service 1.xsd" />112 <None Include="Service References\AdminService\System .xsd" />113 <None Include="Service References\UpdateService\HeuristicLab.Services.Deployment .xsd" />114 <None Include="Service References\UpdateService\service .wsdl" />115 <None Include="Service References\UpdateService\service .xsd" />116 <None Include="Service References\UpdateService\service 1.xsd" />117 <None Include="Service References\UpdateService\System .xsd" />108 <None Include="Service References\AdminService\HeuristicLab.Services.Deployment1.xsd" /> 109 <None Include="Service References\AdminService\service1.wsdl" /> 110 <None Include="Service References\AdminService\service2.xsd" /> 111 <None Include="Service References\AdminService\service21.xsd" /> 112 <None Include="Service References\AdminService\System1.xsd" /> 113 <None Include="Service References\UpdateService\HeuristicLab.Services.Deployment1.xsd" /> 114 <None Include="Service References\UpdateService\service1.wsdl" /> 115 <None Include="Service References\UpdateService\service2.xsd" /> 116 <None Include="Service References\UpdateService\service21.xsd" /> 117 <None Include="Service References\UpdateService\System1.xsd" /> 118 118 </ItemGroup> 119 119 <ItemGroup> -
branches/DeploymentServer Prototype/HeuristicLab.Services/HeuristicLab.Services.Deployment.Test/Service References/AdminService/Reference.svcmap
r2804 r3006 18 18 </ClientOptions> 19 19 <MetadataSources> 20 <MetadataSource Address="http:// localhost:8731/Design_Time_Addresses/HeuristicLab.Services.Deployment/Admin/mex" Protocol="mex" SourceId="1" />20 <MetadataSource Address="http://servdev.heuristiclab.com/HeuristicLab.Deployment/Admin.svc/mex" Protocol="mex" SourceId="1" /> 21 21 </MetadataSources> 22 22 <Metadata> 23 <MetadataFile FileName="service .wsdl" MetadataType="Wsdl" ID="f9aa7841-9f78-43d9-9008-0decd3d12993" SourceId="1" SourceUrl="http://localhost:8731/Design_Time_Addresses/HeuristicLab.Services.Deployment/Admin/mex" />24 <MetadataFile FileName="service .xsd" MetadataType="Schema" ID="c0d733c0-fa7a-4965-bf67-e04efdf79732" SourceId="1" SourceUrl="http://localhost:8731/Design_Time_Addresses/HeuristicLab.Services.Deployment/Admin/mex" />25 <MetadataFile FileName="service 1.xsd" MetadataType="Schema" ID="8b323fa0-af4b-4db2-95c7-caf4621ded43" SourceId="1" SourceUrl="http://localhost:8731/Design_Time_Addresses/HeuristicLab.Services.Deployment/Admin/mex" />26 <MetadataFile FileName="HeuristicLab.Services.Deployment .xsd" MetadataType="Schema" ID="b359957d-39eb-4fda-b855-9cf0efe56074" SourceId="1" SourceUrl="http://localhost:8731/Design_Time_Addresses/HeuristicLab.Services.Deployment/Admin/mex" />27 <MetadataFile FileName="System .xsd" MetadataType="Schema" ID="de5b0b79-4ace-49d6-9d08-a352d353beef" SourceId="1" SourceUrl="http://localhost:8731/Design_Time_Addresses/HeuristicLab.Services.Deployment/Admin/mex" />23 <MetadataFile FileName="service1.wsdl" MetadataType="Wsdl" ID="5b9ee4af-f905-45c3-84e1-34c1643068f0" SourceId="1" SourceUrl="http://servdev.heuristiclab.com/HeuristicLab.Deployment/Admin.svc/mex" /> 24 <MetadataFile FileName="service2.xsd" MetadataType="Schema" ID="0d75803f-50a2-4508-823b-e301c1b0f341" SourceId="1" SourceUrl="http://servdev.heuristiclab.com/HeuristicLab.Deployment/Admin.svc/mex" /> 25 <MetadataFile FileName="service21.xsd" MetadataType="Schema" ID="7804cf00-b181-4ddd-9d07-dee4a427e49a" SourceId="1" SourceUrl="http://servdev.heuristiclab.com/HeuristicLab.Deployment/Admin.svc/mex" /> 26 <MetadataFile FileName="HeuristicLab.Services.Deployment1.xsd" MetadataType="Schema" ID="5aae270e-18b4-4210-bb2f-59f49ca45774" SourceId="1" SourceUrl="http://servdev.heuristiclab.com/HeuristicLab.Deployment/Admin.svc/mex" /> 27 <MetadataFile FileName="System1.xsd" MetadataType="Schema" ID="5d49ee73-a023-4e41-a0fd-1d76ecce0177" SourceId="1" SourceUrl="http://servdev.heuristiclab.com/HeuristicLab.Deployment/Admin.svc/mex" /> 28 28 </Metadata> 29 29 <Extensions> -
branches/DeploymentServer Prototype/HeuristicLab.Services/HeuristicLab.Services.Deployment.Test/Service References/AdminService/configuration.svcinfo
r2771 r3006 3 3 <behaviors /> 4 4 <bindings> 5 <binding digest="System.ServiceModel.Configuration.WSHttpBindingElement, System.ServiceModel, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089:<?xml version="1.0" encoding="utf-16"?><Data hostNameComparisonMode="StrongWildcard" messageEncoding="Text" name="WSHttpBinding_IAdmin" textEncoding="utf-8" transactionFlow="false"><readerQuotas maxArrayLength="16384" maxBytesPerRead="4096" maxDepth="32" maxNameTableCharCount="16384" maxStringContentLength="8192" /><reliableSession enabled="false" inactivityTimeout="00:10:00" ordered="true" /><security mode="Message"><message algorithmSuite="Default" clientCredentialType=" Windows" establishSecurityContext="true" negotiateServiceCredential="true" /><transport clientCredentialType="Windows" proxyCredentialType="None" realm="" /></security></Data>" bindingType="wsHttpBinding" name="WSHttpBinding_IAdmin" />5 <binding digest="System.ServiceModel.Configuration.WSHttpBindingElement, System.ServiceModel, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089:<?xml version="1.0" encoding="utf-16"?><Data hostNameComparisonMode="StrongWildcard" messageEncoding="Text" name="WSHttpBinding_IAdmin" textEncoding="utf-8" transactionFlow="false"><readerQuotas maxArrayLength="16384" maxBytesPerRead="4096" maxDepth="32" maxNameTableCharCount="16384" maxStringContentLength="8192" /><reliableSession enabled="false" inactivityTimeout="00:10:00" ordered="true" /><security mode="Message"><message algorithmSuite="Default" clientCredentialType="UserName" establishSecurityContext="true" negotiateServiceCredential="true" /><transport clientCredentialType="Windows" proxyCredentialType="None" realm="" /></security></Data>" bindingType="wsHttpBinding" name="WSHttpBinding_IAdmin" /> 6 6 </bindings> 7 7 <endpoints> 8 <endpoint normalizedDigest="<?xml version="1.0" encoding="utf-16"?><Data address="http:// localhost:8731/Design_Time_Addresses/HeuristicLab.Services.Deployment/Admin/" binding="wsHttpBinding" bindingConfiguration="WSHttpBinding_IAdmin" contract="AdminService.IAdmin" name="WSHttpBinding_IAdmin"><identity><dns value="localhost" /></identity></Data>" digest="<?xml version="1.0" encoding="utf-16"?><Data address="http://localhost:8731/Design_Time_Addresses/HeuristicLab.Services.Deployment/Admin/" binding="wsHttpBinding" bindingConfiguration="WSHttpBinding_IAdmin" contract="AdminService.IAdmin" name="WSHttpBinding_IAdmin"><identity><dns value="localhost" /></identity></Data>" contractName="AdminService.IAdmin" name="WSHttpBinding_IAdmin" />8 <endpoint normalizedDigest="<?xml version="1.0" encoding="utf-16"?><Data address="http://servdev.heuristiclab.com/HeuristicLab.Deployment/Admin.svc" binding="wsHttpBinding" bindingConfiguration="WSHttpBinding_IAdmin" contract="AdminService.IAdmin" name="WSHttpBinding_IAdmin"><identity><certificate encodedValue="AwAAAAEAAAAUAAAA6BqitFxQFezmOGMs4hfDnxmUaNkgAAAAAQAAANYCAAAwggLSMIIBuqADAgECAhBTkXiUNnyLi0hZzHvfnFSpMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNVBAMTB3NlcnZkZXYwHhcNMTAwMzA5MTE1MzAzWhcNMTEwMzA5MDAwMDAwWjASMRAwDgYDVQQDEwdzZXJ2ZGV2MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAth2UcoEiKuzOoj80IySFzg5AchkCdezyWn1QRVHtxD0AcY0aHOjf8UGTsMi8nA9T5VHEdDfvF7S5QJNWo8dcSvgs2wvi5HYatiU4/AT8J3Sb1hhDyyqJqI+zqs/Z446tMGPB7bTta/Fi+AIjrnvW6cOqbcO/ZkpUUjkhQvCC89QZkSsXGOMlxUWZU8mN70JoOeFNoQ4KE7+0L0OnC4p9L609LUfByfXobWnB9mhIMtnW1n8XKNfBVWp9b3D960Ks+nKZ6xWUVqAc+OtREHFunDRbrKaMmMNRsIsgpyFEWA9jEnKUsui/kIpvK3OyPa+jqOzNfpNz6VNBrVV+e3uenwIDAQABoyQwIjALBgNVHQ8EBAMCBDAwEwYDVR0lBAwwCgYIKwYBBQUHAwEwDQYJKoZIhvcNAQEFBQADggEBAD7rEM74jtLImYCp/0Okncn0MEBwCP7XlHwC1KYSZzHs8vUIFyH8V1CLgQCq5tZV7GbT9N1/4XmFZrwxScZxkiWb6vnpv2yFPi4LX68unDTdTKaOaknblLc4HQ/9moOa+cMyQDOrqLLZYHuAwg2DwOljDGzvbOmLRNlrnDyJLYSRiD4RxRmAxI+qgiAVg2GCXIbR+BBz7H5z1kn0O6YUk9SPeMondAxU6JmYfhB3334Ie1hGBiAx2gAnkFsF781/E/lbd+nobhSazdfEo3+pwkyhwkpU3JKKLRHU72I9lCXvOMWjEcH6yZfEzgVg1UboPs+AyK7wPa5nPbStmM7dxjE=" /></identity></Data>" digest="<?xml version="1.0" encoding="utf-16"?><Data address="http://servdev.heuristiclab.com/HeuristicLab.Deployment/Admin.svc" binding="wsHttpBinding" bindingConfiguration="WSHttpBinding_IAdmin" contract="AdminService.IAdmin" name="WSHttpBinding_IAdmin"><identity><certificate encodedValue="AwAAAAEAAAAUAAAA6BqitFxQFezmOGMs4hfDnxmUaNkgAAAAAQAAANYCAAAwggLSMIIBuqADAgECAhBTkXiUNnyLi0hZzHvfnFSpMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNVBAMTB3NlcnZkZXYwHhcNMTAwMzA5MTE1MzAzWhcNMTEwMzA5MDAwMDAwWjASMRAwDgYDVQQDEwdzZXJ2ZGV2MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAth2UcoEiKuzOoj80IySFzg5AchkCdezyWn1QRVHtxD0AcY0aHOjf8UGTsMi8nA9T5VHEdDfvF7S5QJNWo8dcSvgs2wvi5HYatiU4/AT8J3Sb1hhDyyqJqI+zqs/Z446tMGPB7bTta/Fi+AIjrnvW6cOqbcO/ZkpUUjkhQvCC89QZkSsXGOMlxUWZU8mN70JoOeFNoQ4KE7+0L0OnC4p9L609LUfByfXobWnB9mhIMtnW1n8XKNfBVWp9b3D960Ks+nKZ6xWUVqAc+OtREHFunDRbrKaMmMNRsIsgpyFEWA9jEnKUsui/kIpvK3OyPa+jqOzNfpNz6VNBrVV+e3uenwIDAQABoyQwIjALBgNVHQ8EBAMCBDAwEwYDVR0lBAwwCgYIKwYBBQUHAwEwDQYJKoZIhvcNAQEFBQADggEBAD7rEM74jtLImYCp/0Okncn0MEBwCP7XlHwC1KYSZzHs8vUIFyH8V1CLgQCq5tZV7GbT9N1/4XmFZrwxScZxkiWb6vnpv2yFPi4LX68unDTdTKaOaknblLc4HQ/9moOa+cMyQDOrqLLZYHuAwg2DwOljDGzvbOmLRNlrnDyJLYSRiD4RxRmAxI+qgiAVg2GCXIbR+BBz7H5z1kn0O6YUk9SPeMondAxU6JmYfhB3334Ie1hGBiAx2gAnkFsF781/E/lbd+nobhSazdfEo3+pwkyhwkpU3JKKLRHU72I9lCXvOMWjEcH6yZfEzgVg1UboPs+AyK7wPa5nPbStmM7dxjE=" /></identity></Data>" contractName="AdminService.IAdmin" name="WSHttpBinding_IAdmin" /> 9 9 </endpoints> 10 10 </configurationSnapshot> -
branches/DeploymentServer Prototype/HeuristicLab.Services/HeuristicLab.Services.Deployment.Test/Service References/AdminService/configuration91.svcinfo
r2771 r3006 1 1 <?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=" LNue/oD5IMsfCgoXP3byqdtnfSk=">2 <SavedWcfConfigurationInformation xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" Version="9.1" CheckSum="3CD5zso1obyNQzDqdMgaobikT0U="> 3 3 <bindingConfigurations> 4 4 <bindingConfiguration bindingType="wsHttpBinding" name="WSHttpBinding_IAdmin"> … … 101 101 </property> 102 102 <property path="/security/message/clientCredentialType" isComplexType="false" isExplicitlyDefined="true" clrType="System.ServiceModel.MessageCredentialType, System.ServiceModel, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> 103 <serializedValue> Windows</serializedValue>103 <serializedValue>UserName</serializedValue> 104 104 </property> 105 105 <property path="/security/message/negotiateServiceCredential" isComplexType="false" isExplicitlyDefined="true" clrType="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> … … 116 116 </bindingConfigurations> 117 117 <endpoints> 118 <endpoint name="WSHttpBinding_IAdmin" contract="AdminService.IAdmin" bindingType="wsHttpBinding" address="http:// localhost:8731/Design_Time_Addresses/HeuristicLab.Services.Deployment/Admin/" bindingConfiguration="WSHttpBinding_IAdmin">118 <endpoint name="WSHttpBinding_IAdmin" contract="AdminService.IAdmin" bindingType="wsHttpBinding" address="http://servdev.heuristiclab.com/HeuristicLab.Deployment/Admin.svc" bindingConfiguration="WSHttpBinding_IAdmin"> 119 119 <properties> 120 120 <property path="/address" isComplexType="false" isExplicitlyDefined="true" clrType="System.Uri, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> 121 <serializedValue>http:// localhost:8731/Design_Time_Addresses/HeuristicLab.Services.Deployment/Admin/</serializedValue>121 <serializedValue>http://servdev.heuristiclab.com/HeuristicLab.Deployment/Admin.svc</serializedValue> 122 122 </property> 123 123 <property path="/behaviorConfiguration" isComplexType="false" isExplicitlyDefined="false" clrType="System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> … … 157 157 <serializedValue>System.ServiceModel.Configuration.DnsElement</serializedValue> 158 158 </property> 159 <property path="/identity/dns/value" isComplexType="false" isExplicitlyDefined=" true" clrType="System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">160 <serializedValue >localhost</serializedValue>159 <property path="/identity/dns/value" isComplexType="false" isExplicitlyDefined="false" clrType="System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> 160 <serializedValue /> 161 161 </property> 162 162 <property path="/identity/rsa" isComplexType="true" isExplicitlyDefined="false" clrType="System.ServiceModel.Configuration.RsaElement, System.ServiceModel, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> … … 169 169 <serializedValue>System.ServiceModel.Configuration.CertificateElement</serializedValue> 170 170 </property> 171 <property path="/identity/certificate/encodedValue" isComplexType="false" isExplicitlyDefined=" false" clrType="System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">172 <serializedValue />171 <property path="/identity/certificate/encodedValue" isComplexType="false" isExplicitlyDefined="true" clrType="System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> 172 <serializedValue>AwAAAAEAAAAUAAAA6BqitFxQFezmOGMs4hfDnxmUaNkgAAAAAQAAANYCAAAwggLSMIIBuqADAgECAhBTkXiUNnyLi0hZzHvfnFSpMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNVBAMTB3NlcnZkZXYwHhcNMTAwMzA5MTE1MzAzWhcNMTEwMzA5MDAwMDAwWjASMRAwDgYDVQQDEwdzZXJ2ZGV2MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAth2UcoEiKuzOoj80IySFzg5AchkCdezyWn1QRVHtxD0AcY0aHOjf8UGTsMi8nA9T5VHEdDfvF7S5QJNWo8dcSvgs2wvi5HYatiU4/AT8J3Sb1hhDyyqJqI+zqs/Z446tMGPB7bTta/Fi+AIjrnvW6cOqbcO/ZkpUUjkhQvCC89QZkSsXGOMlxUWZU8mN70JoOeFNoQ4KE7+0L0OnC4p9L609LUfByfXobWnB9mhIMtnW1n8XKNfBVWp9b3D960Ks+nKZ6xWUVqAc+OtREHFunDRbrKaMmMNRsIsgpyFEWA9jEnKUsui/kIpvK3OyPa+jqOzNfpNz6VNBrVV+e3uenwIDAQABoyQwIjALBgNVHQ8EBAMCBDAwEwYDVR0lBAwwCgYIKwYBBQUHAwEwDQYJKoZIhvcNAQEFBQADggEBAD7rEM74jtLImYCp/0Okncn0MEBwCP7XlHwC1KYSZzHs8vUIFyH8V1CLgQCq5tZV7GbT9N1/4XmFZrwxScZxkiWb6vnpv2yFPi4LX68unDTdTKaOaknblLc4HQ/9moOa+cMyQDOrqLLZYHuAwg2DwOljDGzvbOmLRNlrnDyJLYSRiD4RxRmAxI+qgiAVg2GCXIbR+BBz7H5z1kn0O6YUk9SPeMondAxU6JmYfhB3334Ie1hGBiAx2gAnkFsF781/E/lbd+nobhSazdfEo3+pwkyhwkpU3JKKLRHU72I9lCXvOMWjEcH6yZfEzgVg1UboPs+AyK7wPa5nPbStmM7dxjE=</serializedValue> 173 173 </property> 174 174 <property path="/identity/certificateReference" isComplexType="true" isExplicitlyDefined="false" clrType="System.ServiceModel.Configuration.CertificateReferenceElement, System.ServiceModel, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> -
branches/DeploymentServer Prototype/HeuristicLab.Services/HeuristicLab.Services.Deployment.Test/Service References/UpdateService/Reference.cs
r2804 r3006 24 24 [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IUpdate/GetPlugins", ReplyAction="http://tempuri.org/IUpdate/GetPluginsResponse")] 25 25 HeuristicLab.Services.Deployment.PluginDescription[] GetPlugins(); 26 27 [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IUpdate/DoTheShit", ReplyAction="http://tempuri.org/IUpdate/DoTheShitResponse")] 28 string DoTheShit(); 26 29 } 27 30 … … 64 67 return base.Channel.GetPlugins(); 65 68 } 69 70 public string DoTheShit() { 71 return base.Channel.DoTheShit(); 72 } 66 73 } 67 74 } -
branches/DeploymentServer Prototype/HeuristicLab.Services/HeuristicLab.Services.Deployment.Test/Service References/UpdateService/Reference.svcmap
r2804 r3006 18 18 </ClientOptions> 19 19 <MetadataSources> 20 <MetadataSource Address="http:// localhost:8731/Design_Time_Addresses/HeuristicLab.Services.Deployment/Update/mex" Protocol="mex" SourceId="1" />20 <MetadataSource Address="http://servdev.heuristiclab.com/HeuristicLab.Deployment/Update.svc/mex" Protocol="mex" SourceId="1" /> 21 21 </MetadataSources> 22 22 <Metadata> 23 <MetadataFile FileName="service .wsdl" MetadataType="Wsdl" ID="8e5d7689-adea-4747-9a70-0ac7b6d53f45" SourceId="1" SourceUrl="http://localhost:8731/Design_Time_Addresses/HeuristicLab.Services.Deployment/Update/mex" />24 <MetadataFile FileName="service .xsd" MetadataType="Schema" ID="3ecb07b5-a96d-4407-89dd-1e042527a912" SourceId="1" SourceUrl="http://localhost:8731/Design_Time_Addresses/HeuristicLab.Services.Deployment/Update/mex" />25 <MetadataFile FileName="service 1.xsd" MetadataType="Schema" ID="a49c6318-2559-4c8b-901c-d677ebcea2cb" SourceId="1" SourceUrl="http://localhost:8731/Design_Time_Addresses/HeuristicLab.Services.Deployment/Update/mex" />26 <MetadataFile FileName="HeuristicLab.Services.Deployment .xsd" MetadataType="Schema" ID="95669cc5-5ec5-467d-9a09-464c14558b64" SourceId="1" SourceUrl="http://localhost:8731/Design_Time_Addresses/HeuristicLab.Services.Deployment/Update/mex" />27 <MetadataFile FileName="System .xsd" MetadataType="Schema" ID="c6636f98-e644-40dd-a862-3a38c2950f79" SourceId="1" SourceUrl="http://localhost:8731/Design_Time_Addresses/HeuristicLab.Services.Deployment/Update/mex" />23 <MetadataFile FileName="service1.wsdl" MetadataType="Wsdl" ID="f3c1f538-057c-414d-8509-9e981525de05" SourceId="1" SourceUrl="http://servdev.heuristiclab.com/HeuristicLab.Deployment/Update.svc/mex" /> 24 <MetadataFile FileName="service2.xsd" MetadataType="Schema" ID="b8cba586-c574-471e-8405-46ec9815e185" SourceId="1" SourceUrl="http://servdev.heuristiclab.com/HeuristicLab.Deployment/Update.svc/mex" /> 25 <MetadataFile FileName="service21.xsd" MetadataType="Schema" ID="bd1caeef-f9a6-4975-9f27-8c30e6379651" SourceId="1" SourceUrl="http://servdev.heuristiclab.com/HeuristicLab.Deployment/Update.svc/mex" /> 26 <MetadataFile FileName="HeuristicLab.Services.Deployment1.xsd" MetadataType="Schema" ID="280fce76-387d-466d-92a4-580eeeef3756" SourceId="1" SourceUrl="http://servdev.heuristiclab.com/HeuristicLab.Deployment/Update.svc/mex" /> 27 <MetadataFile FileName="System1.xsd" MetadataType="Schema" ID="bf54ca0e-a22e-4e2d-b3c3-6957c9be244e" SourceId="1" SourceUrl="http://servdev.heuristiclab.com/HeuristicLab.Deployment/Update.svc/mex" /> 28 28 </Metadata> 29 29 <Extensions> -
branches/DeploymentServer Prototype/HeuristicLab.Services/HeuristicLab.Services.Deployment.Test/Service References/UpdateService/configuration.svcinfo
r2771 r3006 3 3 <behaviors /> 4 4 <bindings> 5 <binding digest="System.ServiceModel.Configuration.WSHttpBindingElement, System.ServiceModel, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089:<?xml version="1.0" encoding="utf-16"?><Data hostNameComparisonMode="StrongWildcard" messageEncoding="Text" name="WSHttpBinding_IUpdate" textEncoding="utf-8" transactionFlow="false"><readerQuotas maxArrayLength="16384" maxBytesPerRead="4096" maxDepth="32" maxNameTableCharCount="16384" maxStringContentLength="8192" /><reliableSession enabled="false" inactivityTimeout="00:10:00" ordered="true" /><security mode="Message"><message algorithmSuite="Default" clientCredentialType=" Windows" establishSecurityContext="true" negotiateServiceCredential="true" /><transport clientCredentialType="Windows" proxyCredentialType="None" realm="" /></security></Data>" bindingType="wsHttpBinding" name="WSHttpBinding_IUpdate" />5 <binding digest="System.ServiceModel.Configuration.WSHttpBindingElement, System.ServiceModel, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089:<?xml version="1.0" encoding="utf-16"?><Data hostNameComparisonMode="StrongWildcard" messageEncoding="Text" name="WSHttpBinding_IUpdate" textEncoding="utf-8" transactionFlow="false"><readerQuotas maxArrayLength="16384" maxBytesPerRead="4096" maxDepth="32" maxNameTableCharCount="16384" maxStringContentLength="8192" /><reliableSession enabled="false" inactivityTimeout="00:10:00" ordered="true" /><security mode="Message"><message algorithmSuite="Default" clientCredentialType="UserName" establishSecurityContext="true" negotiateServiceCredential="true" /><transport clientCredentialType="Windows" proxyCredentialType="None" realm="" /></security></Data>" bindingType="wsHttpBinding" name="WSHttpBinding_IUpdate" /> 6 6 </bindings> 7 7 <endpoints> 8 <endpoint normalizedDigest="<?xml version="1.0" encoding="utf-16"?><Data address="http:// localhost:8731/Design_Time_Addresses/HeuristicLab.Services.Deployment/Update/" binding="wsHttpBinding" bindingConfiguration="WSHttpBinding_IUpdate" contract="UpdateService.IUpdate" name="WSHttpBinding_IUpdate"><identity><dns value="localhost" /></identity></Data>" digest="<?xml version="1.0" encoding="utf-16"?><Data address="http://localhost:8731/Design_Time_Addresses/HeuristicLab.Services.Deployment/Update/" binding="wsHttpBinding" bindingConfiguration="WSHttpBinding_IUpdate" contract="UpdateService.IUpdate" name="WSHttpBinding_IUpdate"><identity><dns value="localhost" /></identity></Data>" contractName="UpdateService.IUpdate" name="WSHttpBinding_IUpdate" />8 <endpoint normalizedDigest="<?xml version="1.0" encoding="utf-16"?><Data address="http://servdev.heuristiclab.com/HeuristicLab.Deployment/Update.svc" binding="wsHttpBinding" bindingConfiguration="WSHttpBinding_IUpdate" contract="UpdateService.IUpdate" name="WSHttpBinding_IUpdate"><identity><userPrincipalName value="&#xD;&#xA; " /></identity></Data>" digest="<?xml version="1.0" encoding="utf-16"?><Data address="http://servdev.heuristiclab.com/HeuristicLab.Deployment/Update.svc" binding="wsHttpBinding" bindingConfiguration="WSHttpBinding_IUpdate" contract="UpdateService.IUpdate" name="WSHttpBinding_IUpdate"><identity><userPrincipalName value="&#xD;&#xA; " /></identity></Data>" contractName="UpdateService.IUpdate" name="WSHttpBinding_IUpdate" /> 9 9 </endpoints> 10 10 </configurationSnapshot> -
branches/DeploymentServer Prototype/HeuristicLab.Services/HeuristicLab.Services.Deployment.Test/Service References/UpdateService/configuration91.svcinfo
r2771 r3006 1 1 <?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=" gVI/ZurkT1S+L3Ln9j34sdO/2KM=">2 <SavedWcfConfigurationInformation xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" Version="9.1" CheckSum="Qfnk39kVgFXcclYnAAZ4QxwJ2v8="> 3 3 <bindingConfigurations> 4 4 <bindingConfiguration bindingType="wsHttpBinding" name="WSHttpBinding_IUpdate"> … … 101 101 </property> 102 102 <property path="/security/message/clientCredentialType" isComplexType="false" isExplicitlyDefined="true" clrType="System.ServiceModel.MessageCredentialType, System.ServiceModel, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> 103 <serializedValue> Windows</serializedValue>103 <serializedValue>UserName</serializedValue> 104 104 </property> 105 105 <property path="/security/message/negotiateServiceCredential" isComplexType="false" isExplicitlyDefined="true" clrType="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> … … 116 116 </bindingConfigurations> 117 117 <endpoints> 118 <endpoint name="WSHttpBinding_IUpdate" contract="UpdateService.IUpdate" bindingType="wsHttpBinding" address="http:// localhost:8731/Design_Time_Addresses/HeuristicLab.Services.Deployment/Update/" bindingConfiguration="WSHttpBinding_IUpdate">118 <endpoint name="WSHttpBinding_IUpdate" contract="UpdateService.IUpdate" bindingType="wsHttpBinding" address="http://servdev.heuristiclab.com/HeuristicLab.Deployment/Update.svc" bindingConfiguration="WSHttpBinding_IUpdate"> 119 119 <properties> 120 120 <property path="/address" isComplexType="false" isExplicitlyDefined="true" clrType="System.Uri, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> 121 <serializedValue>http:// localhost:8731/Design_Time_Addresses/HeuristicLab.Services.Deployment/Update/</serializedValue>121 <serializedValue>http://servdev.heuristiclab.com/HeuristicLab.Deployment/Update.svc</serializedValue> 122 122 </property> 123 123 <property path="/behaviorConfiguration" isComplexType="false" isExplicitlyDefined="false" clrType="System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> … … 145 145 <serializedValue>System.ServiceModel.Configuration.UserPrincipalNameElement</serializedValue> 146 146 </property> 147 <property path="/identity/userPrincipalName/value" isComplexType="false" isExplicitlyDefined="false" clrType="System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> 148 <serializedValue /> 147 <property path="/identity/userPrincipalName/value" isComplexType="false" isExplicitlyDefined="true" clrType="System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> 148 <serializedValue> 149 </serializedValue> 149 150 </property> 150 151 <property path="/identity/servicePrincipalName" isComplexType="true" isExplicitlyDefined="false" clrType="System.ServiceModel.Configuration.ServicePrincipalNameElement, System.ServiceModel, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> … … 157 158 <serializedValue>System.ServiceModel.Configuration.DnsElement</serializedValue> 158 159 </property> 159 <property path="/identity/dns/value" isComplexType="false" isExplicitlyDefined=" true" clrType="System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">160 <serializedValue >localhost</serializedValue>160 <property path="/identity/dns/value" isComplexType="false" isExplicitlyDefined="false" clrType="System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> 161 <serializedValue /> 161 162 </property> 162 163 <property path="/identity/rsa" isComplexType="true" isExplicitlyDefined="false" clrType="System.ServiceModel.Configuration.RsaElement, System.ServiceModel, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> -
branches/DeploymentServer Prototype/HeuristicLab.Services/HeuristicLab.Services.Deployment.Test/app.config
r2771 r3006 17 17 <transport clientCredentialType="Windows" proxyCredentialType="None" 18 18 realm="" /> 19 <message clientCredentialType=" Windows" negotiateServiceCredential="true"19 <message clientCredentialType="UserName" negotiateServiceCredential="true" 20 20 algorithmSuite="Default" establishSecurityContext="true" /> 21 21 </security> … … 34 34 <transport clientCredentialType="Windows" proxyCredentialType="None" 35 35 realm="" /> 36 <message clientCredentialType=" Windows" negotiateServiceCredential="true"36 <message clientCredentialType="UserName" negotiateServiceCredential="true" 37 37 algorithmSuite="Default" establishSecurityContext="true" /> 38 38 </security> … … 41 41 </bindings> 42 42 <client> 43 <endpoint address="http://localhost:8731/Design_Time_Addresses/HeuristicLab.Services.Deployment/Update/" 43 <endpoint address="http://servdev.heuristiclab.com/HeuristicLab.Deployment/Admin.svc" 44 binding="wsHttpBinding" bindingConfiguration="WSHttpBinding_IAdmin" 45 contract="AdminService.IAdmin" name="WSHttpBinding_IAdmin"> 46 <identity> 47 <certificate encodedValue="AwAAAAEAAAAUAAAA6BqitFxQFezmOGMs4hfDnxmUaNkgAAAAAQAAANYCAAAwggLSMIIBuqADAgECAhBTkXiUNnyLi0hZzHvfnFSpMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNVBAMTB3NlcnZkZXYwHhcNMTAwMzA5MTE1MzAzWhcNMTEwMzA5MDAwMDAwWjASMRAwDgYDVQQDEwdzZXJ2ZGV2MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAth2UcoEiKuzOoj80IySFzg5AchkCdezyWn1QRVHtxD0AcY0aHOjf8UGTsMi8nA9T5VHEdDfvF7S5QJNWo8dcSvgs2wvi5HYatiU4/AT8J3Sb1hhDyyqJqI+zqs/Z446tMGPB7bTta/Fi+AIjrnvW6cOqbcO/ZkpUUjkhQvCC89QZkSsXGOMlxUWZU8mN70JoOeFNoQ4KE7+0L0OnC4p9L609LUfByfXobWnB9mhIMtnW1n8XKNfBVWp9b3D960Ks+nKZ6xWUVqAc+OtREHFunDRbrKaMmMNRsIsgpyFEWA9jEnKUsui/kIpvK3OyPa+jqOzNfpNz6VNBrVV+e3uenwIDAQABoyQwIjALBgNVHQ8EBAMCBDAwEwYDVR0lBAwwCgYIKwYBBQUHAwEwDQYJKoZIhvcNAQEFBQADggEBAD7rEM74jtLImYCp/0Okncn0MEBwCP7XlHwC1KYSZzHs8vUIFyH8V1CLgQCq5tZV7GbT9N1/4XmFZrwxScZxkiWb6vnpv2yFPi4LX68unDTdTKaOaknblLc4HQ/9moOa+cMyQDOrqLLZYHuAwg2DwOljDGzvbOmLRNlrnDyJLYSRiD4RxRmAxI+qgiAVg2GCXIbR+BBz7H5z1kn0O6YUk9SPeMondAxU6JmYfhB3334Ie1hGBiAx2gAnkFsF781/E/lbd+nobhSazdfEo3+pwkyhwkpU3JKKLRHU72I9lCXvOMWjEcH6yZfEzgVg1UboPs+AyK7wPa5nPbStmM7dxjE=" /> 48 </identity> 49 </endpoint> 50 <endpoint address="http://servdev.heuristiclab.com/HeuristicLab.Deployment/Update.svc" 44 51 binding="wsHttpBinding" bindingConfiguration="WSHttpBinding_IUpdate" 45 52 contract="UpdateService.IUpdate" name="WSHttpBinding_IUpdate"> 46 53 <identity> 47 <dns value="localhost" /> 48 </identity> 49 </endpoint> 50 <endpoint address="http://localhost:8731/Design_Time_Addresses/HeuristicLab.Services.Deployment/Admin/" 51 binding="wsHttpBinding" bindingConfiguration="WSHttpBinding_IAdmin" 52 contract="AdminService.IAdmin" name="WSHttpBinding_IAdmin"> 53 <identity> 54 <dns value="localhost" /> 54 <userPrincipalName value="
 " /> 55 55 </identity> 56 56 </endpoint> -
branches/DeploymentServer Prototype/HeuristicLab.Services/HeuristicLab.Services.Deployment/Admin.cs
r2771 r3006 6 6 using System.Text; 7 7 using HeuristicLab.Services.Deployment.DataAccess; 8 using System.Security.Permissions; 8 9 9 10 namespace HeuristicLab.Services.Deployment { … … 11 12 public class Admin : IAdmin { 12 13 #region IAdmin Members 13 14 [PrincipalPermission(SecurityAction.Demand, Role = "Managers")] 14 15 public void DeployProduct(ProductDescription product) { 15 16 var store = new PluginStore(); 16 17 store.Persist(product); 17 18 } 18 19 [PrincipalPermission(SecurityAction.Demand, Role = "Managers")] 19 20 public void DeployPlugin(PluginDescription plugin, byte[] zipFile) { 20 21 var store = new PluginStore(); -
branches/DeploymentServer Prototype/HeuristicLab.Services/HeuristicLab.Services.Deployment/App.config
r2771 r3006 4 4 </configSections> 5 5 <system.diagnostics> 6 <sources>7 <source name="System.ServiceModel.MessageLogging" switchValue="Warning, ActivityTracing">8 <listeners>9 <add type="System.Diagnostics.DefaultTraceListener" name="Default">10 <filter type="" />11 </add>12 <add name="ServiceModelMessageLoggingListener">13 <filter type="" />14 </add>15 </listeners>16 </source>17 <source name="System.ServiceModel" switchValue="Warning, ActivityTracing"18 propagateActivity="true">19 <listeners>20 <add type="System.Diagnostics.DefaultTraceListener" name="Default">21 <filter type="" />22 </add>23 <add name="ServiceModelTraceListener">24 <filter type="" />25 </add>26 </listeners>27 </source>28 </sources>29 <sharedListeners>30 <add initializeData="c:\users\p40086\documents\heuristiclab\hl3-core\branches\deploymentserver prototype\heuristiclab.services\heuristiclab.services.deployment\app_messages.svclog"31 type="System.Diagnostics.XmlWriterTraceListener, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"32 name="ServiceModelMessageLoggingListener" traceOutputOptions="Timestamp">33 <filter type="" />34 </add>35 <add initializeData="c:\users\p40086\documents\heuristiclab\hl3-core\branches\deploymentserver prototype\heuristiclab.services\heuristiclab.services.deployment\app_tracelog.svclog"36 type="System.Diagnostics.XmlWriterTraceListener, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"37 name="ServiceModelTraceListener" traceOutputOptions="Timestamp">38 <filter type="" />39 </add>40 </sharedListeners>41 6 </system.diagnostics> 42 7 <connectionStrings> 43 < add name="HeuristicLab.Services.Deployment.Properties.Settings.HeuristicLab_PluginStoreConnectionString"44 connectionString="Data Source=HEUREKA01\SQLEXPRESS;Initial Catalog=HeuristicLab.PluginStore;Integrated Security=True"45 providerName="System.Data.SqlClient" />8 <remove name="LocalSqlServer" /> 9 <add connectionString="Server=SERVDEV;Database=HeuristicLab.Deployment;Integrated Security=SSPI" name="HeuristicLab.Services.Deployment.DataAccess.Properties.Settings.HeuristicLab_PluginStoreConnectionString" /> 10 <add name="MyLocalSQLServer" connectionString="Initial Catalog=aspnetdb;data source=localhost;Integrated Security=SSPI;" /> 46 11 </connectionStrings> 47 12 <system.web> 48 <compilation debug="true" /> 13 <compilation debug="false" /> 14 <membership defaultProvider="MySqlMembershipProvider"> 15 <providers> 16 <clear /> 17 <add name="MySqlMemberShipProvider" type="System.Web.Security.SqlMembershipProvider, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" connectionStringName="MyLocalSqlServer" enablePasswordReset="false" enablePasswordRetrieval="false" passwordFormat="Hashed" requiresQuestionAndAnswer="false" requiresUniqueEmail="false" minRequiredNonalphanumericCharacters="0" minRequiredPasswordLength="8" /> 18 </providers> 19 </membership> 20 <authentication mode="Windows" /> 21 <roleManager enabled="true" defaultProvider="MySqlRoleProvider"> 22 <providers> 23 <clear /> 24 <add name="MySqlRoleProvider" connectionStringName="MyLocalSQLServer" applicationName="HeuristicLab.Deployment" type="System.Web.Security.SqlRoleProvider, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> 25 </providers> 26 </roleManager> 49 27 </system.web> 50 28 <!-- When deploying the service library project, the content of the config file must be added to the host's … … 53 31 <bindings> 54 32 <wsHttpBinding> 55 <binding name="DefaultWsHttpBinding" maxBufferPoolSize="10000000" 56 maxReceivedMessageSize="1000000"> 57 <readerQuotas maxDepth="1000" maxStringContentLength="16000" 58 maxArrayLength="10000000" maxBytesPerRead="10000000" maxNameTableCharCount="16000" /> 33 <binding name="DefaultWsHttpBinding" maxBufferPoolSize="10000000" maxReceivedMessageSize="1000000"> 34 <readerQuotas maxDepth="1000" maxStringContentLength="16000" maxArrayLength="10000000" maxBytesPerRead="10000000" maxNameTableCharCount="16000" /> 35 <security mode="Message"> 36 <message clientCredentialType="UserName" /> 37 </security> 59 38 </binding> 60 39 </wsHttpBinding> … … 64 43 </bindings> 65 44 <diagnostics performanceCounters="Default"> 66 <messageLogging logMalformedMessages=" true" logMessagesAtTransportLevel="true" />45 <messageLogging logMalformedMessages="false" logMessagesAtTransportLevel="false" /> 67 46 </diagnostics> 68 47 <services> 69 <service behaviorConfiguration="HeuristicLab.Services.Deployment.UpdateBehavior" 70 name="HeuristicLab.Services.Deployment.Update"> 71 <endpoint address="" binding="wsHttpBinding" bindingConfiguration="DefaultWsHttpBinding" 72 contract="HeuristicLab.Services.Deployment.IUpdate"> 73 <identity> 74 <dns value="localhost" /> 75 </identity> 48 <service behaviorConfiguration="HeuristicLab.Services.Deployment.UpdateBehavior" name="HeuristicLab.Services.Deployment.Update"> 49 <endpoint address="" binding="wsHttpBinding" bindingConfiguration="DefaultWsHttpBinding" contract="HeuristicLab.Services.Deployment.IUpdate"> 76 50 </endpoint> 77 <endpoint address="mex" binding="mexHttpBinding" bindingConfiguration="DefaultMexHttpBinding" 78 contract="IMetadataExchange" /> 79 <host> 80 <baseAddresses> 81 <add baseAddress="http://localhost:8731/Design_Time_Addresses/HeuristicLab.Services.Deployment/Update/" /> 82 </baseAddresses> 83 </host> 51 <endpoint address="mex" binding="mexHttpBinding" bindingConfiguration="DefaultMexHttpBinding" contract="IMetadataExchange" /> 84 52 </service> 85 <service behaviorConfiguration="HeuristicLab.Services.Deployment.AdminBehavior" 86 name="HeuristicLab.Services.Deployment.Admin"> 87 <endpoint address="" binding="wsHttpBinding" bindingConfiguration="DefaultWsHttpBinding" 88 contract="HeuristicLab.Services.Deployment.IAdmin"> 89 <identity> 90 <dns value="localhost" /> 91 </identity> 53 <service behaviorConfiguration="HeuristicLab.Services.Deployment.AdminBehavior" name="HeuristicLab.Services.Deployment.Admin"> 54 <endpoint address="" binding="wsHttpBinding" bindingConfiguration="DefaultWsHttpBinding" contract="HeuristicLab.Services.Deployment.IAdmin"> 92 55 </endpoint> 93 <endpoint address="mex" binding="mexHttpBinding" bindingConfiguration="DefaultMexHttpBinding" 94 contract="IMetadataExchange" /> 95 <host> 96 <baseAddresses> 97 <add baseAddress="http://localhost:8731/Design_Time_Addresses/HeuristicLab.Services.Deployment/Admin/" /> 98 </baseAddresses> 99 </host> 56 <endpoint address="mex" binding="mexHttpBinding" bindingConfiguration="DefaultMexHttpBinding" contract="IMetadataExchange" /> 100 57 </service> 101 58 </services> … … 105 62 <serviceMetadata httpGetEnabled="true" /> 106 63 <serviceDebug includeExceptionDetailInFaults="false" /> 64 <serviceCredentials> 65 <serviceCertificate findValue="servdev.heuristiclab.com" storeLocation="LocalMachine" storeName="My" x509FindType="FindBySubjectName" /> 66 <userNameAuthentication userNamePasswordValidationMode="MembershipProvider" membershipProviderName="MySqlMembershipProvider" /> 67 </serviceCredentials> 68 <serviceAuthorization principalPermissionMode="UseAspNetRoles" roleProviderName="MySqlRoleProvider" /> 107 69 </behavior> 108 70 <behavior name="HeuristicLab.Services.Deployment.AdminBehavior"> 109 71 <serviceMetadata httpGetEnabled="true" /> 110 72 <serviceDebug includeExceptionDetailInFaults="false" /> 73 <serviceCredentials> 74 <serviceCertificate findValue="servdev.heuristiclab.com" storeLocation="LocalMachine" storeName="My" x509FindType="FindBySubjectName" /> 75 <userNameAuthentication userNamePasswordValidationMode="MembershipProvider" membershipProviderName="MySqlMembershipProvider" /> 76 </serviceCredentials> 77 <serviceAuthorization principalPermissionMode="UseAspNetRoles" roleProviderName="MySqlRoleProvider" /> 111 78 </behavior> 112 79 </serviceBehaviors> -
branches/DeploymentServer Prototype/HeuristicLab.Services/HeuristicLab.Services.Deployment/Update.cs
r2771 r3006 27 27 return store.Plugins; 28 28 } 29 30 29 #endregion 31 30 } -
trunk/sources/HeuristicLab.PluginInfrastructure/Advanced/DeploymentService/RegenerateServiceClasses.cmd
r2812 r3006 1 1 # 2 svcutil http:// localhost:8731/Design_Time_Addresses/HeuristicLab.Services.Deployment/Update/mex http://localhost:8731/Design_Time_Addresses/HeuristicLab.Services.Deployment/Admin/mex /language:C# /targetClientVersion:Version35 /out:DeploymentService /namespace:*,HeuristicLab.PluginInfrastructure.Advanced.DeploymentService /mergeConfig /config:../../app.config2 svcutil http://servdev.heuristiclab.com/Deployment/Update.svc/mex http://servdev.heuristiclab.com/Deployment/Admin.svc/mex /language:C# /targetClientVersion:Version35 /out:DeploymentService /namespace:*,HeuristicLab.PluginInfrastructure.Advanced.DeploymentService /mergeConfig /config:../../app.config -
trunk/sources/HeuristicLab.PluginInfrastructure/Advanced/InstallationManager.cs
r2922 r3006 29 29 using System.Reflection; 30 30 using ICSharpCode.SharpZipLib.Zip; 31 using System.ServiceModel; 31 32 32 33 namespace HeuristicLab.PluginInfrastructure.Advanced { … … 129 130 /// <param name="connectionString"></param> 130 131 /// <returns></returns> 131 public IEnumerable<IPluginDescription> GetRemotePluginList(string connectionString) { 132 using (var client = new DeploymentService.UpdateClient()) { 133 return client.GetPlugins(); 132 public IEnumerable<IPluginDescription> GetRemotePluginList() { 133 var client = DeploymentService.UpdateClientFactory.CreateClient(); 134 try { 135 List<IPluginDescription> plugins = new List<IPluginDescription>(client.GetPlugins()); 136 client.Close(); 137 return plugins; 138 } 139 catch (FaultException) { 140 client.Abort(); 141 return new IPluginDescription[] { }; 134 142 } 135 143 } … … 140 148 /// <param name="connectionString"></param> 141 149 /// <returns></returns> 142 public IEnumerable<DeploymentService.ProductDescription> GetRemoteProductList(string connectionString) { 143 using (var client = new DeploymentService.UpdateClient()) { 144 return client.GetProducts(); 150 public IEnumerable<DeploymentService.ProductDescription> GetRemoteProductList() { 151 var client = DeploymentService.UpdateClientFactory.CreateClient(); 152 try { 153 List<DeploymentService.ProductDescription> products = new List<DeploymentService.ProductDescription>(client.GetProducts()); 154 client.Close(); 155 return products; 156 } 157 catch (FaultException) { 158 client.Abort(); 159 return new DeploymentService.ProductDescription[] { }; 145 160 } 146 161 } … … 151 166 /// <param name="connectionString"></param> 152 167 /// <param name="pluginNames"></param> 153 public void Install(string connectionString, IEnumerable<IPluginDescription> plugins) { 154 using (var client = new DeploymentService.UpdateClient()) { 155 var args = new PluginInfrastructureCancelEventArgs(plugins.Select(x => x.Name + " " + x.Version)); 156 OnPreInstall(args); 157 foreach (DeploymentService.PluginDescription plugin in plugins) { 158 byte[] zippedPackage = client.GetPlugin(plugin); 159 Unpack(zippedPackage); 160 OnInstalled(new PluginInfrastructureEventArgs(plugin)); 168 public void Install(IEnumerable<IPluginDescription> plugins) { 169 var args = new PluginInfrastructureCancelEventArgs(plugins); 170 OnPreInstall(args); 171 if (!args.Cancel) { 172 var client = DeploymentService.UpdateClientFactory.CreateClient(); 173 try { 174 foreach (DeploymentService.PluginDescription plugin in plugins) { 175 byte[] zippedPackage = client.GetPlugin(plugin); 176 Unpack(zippedPackage); 177 OnInstalled(new PluginInfrastructureEventArgs(plugin)); 178 } 179 client.Close(); 180 } 181 catch (FaultException) { 182 client.Abort(); 161 183 } 162 184 } … … 167 189 /// </summary> 168 190 /// <param name="pluginNames"></param> 169 public void Update( string connectionString,IEnumerable<IPluginDescription> plugins) {170 PluginInfrastructureCancelEventArgs args = new PluginInfrastructureCancelEventArgs(plugins .Select(x => x.Name + " " + x.Version));191 public void Update(IEnumerable<IPluginDescription> plugins) { 192 PluginInfrastructureCancelEventArgs args = new PluginInfrastructureCancelEventArgs(plugins); 171 193 OnPreUpdate(args); 172 194 if (!args.Cancel) { 173 using (var client = new DeploymentService.UpdateClient()) { 195 var client = DeploymentService.UpdateClientFactory.CreateClient(); 196 try { 174 197 foreach (DeploymentService.PluginDescription plugin in plugins) { 175 198 byte[] zippedPackage = client.GetPlugin(plugin); … … 177 200 OnUpdated(new PluginInfrastructureEventArgs(plugin)); 178 201 } 202 client.Close(); 203 } 204 catch (FaultException) { 205 client.Abort(); 179 206 } 180 207 } … … 189 216 from file in pluginToDelete.Files 190 217 select Path.Combine(pluginDir, file.Name); 191 var args = new PluginInfrastructureCancelEventArgs( fileNames);218 var args = new PluginInfrastructureCancelEventArgs(plugins); 192 219 OnPreDelete(args); 193 220 if (!args.Cancel) { -
trunk/sources/HeuristicLab.PluginInfrastructure/Advanced/InstallationManagerConsole.cs
r2922 r3006 52 52 void installManager_PreUpdatePlugin(object sender, PluginInfrastructureCancelEventArgs e) { 53 53 Console.WriteLine("Following plugins are updated:"); 54 foreach (var info in e. Entities) {54 foreach (var info in e.Plugins) { 55 55 Console.WriteLine(e); 56 56 } … … 67 67 void installManager_PreRemovePlugin(object sender, PluginInfrastructureCancelEventArgs e) { 68 68 Console.WriteLine("Following files are deleted:"); 69 foreach (string fileName in e.Entities) { 70 Console.WriteLine(fileName); 69 foreach (var plugin in e.Plugins) { 70 foreach (var file in plugin.Files) 71 Console.WriteLine(file); 71 72 } 72 73 if (GetUserConfirmation()) e.Cancel = false; -
trunk/sources/HeuristicLab.PluginInfrastructure/Advanced/InstallationManagerForm.Designer.cs
r2922 r3006 28 28 this.toolStripStatusLabel = new System.Windows.Forms.ToolStripStatusLabel(); 29 29 this.removeButton = new System.Windows.Forms.Button(); 30 this.serverUrlLabel = new System.Windows.Forms.Label();31 this.serverUrlTextBox = new System.Windows.Forms.TextBox();32 this.refreshButton = new System.Windows.Forms.Button();33 30 this.installButton = new System.Windows.Forms.Button(); 34 31 this.tabControl = new System.Windows.Forms.TabControl(); … … 39 36 this.logTabPage = new System.Windows.Forms.TabPage(); 40 37 this.logTextBox = new System.Windows.Forms.TextBox(); 38 this.refreshButton = new System.Windows.Forms.Button(); 39 this.editConnectionButton = new System.Windows.Forms.Button(); 41 40 this.statusStrip.SuspendLayout(); 42 41 this.tabControl.SuspendLayout(); … … 81 80 this.removeButton.Click += new System.EventHandler(this.removeButton_Click); 82 81 // 83 // serverUrlLabel84 //85 this.serverUrlLabel.AutoSize = true;86 this.serverUrlLabel.Location = new System.Drawing.Point(9, 11);87 this.serverUrlLabel.Name = "serverUrlLabel";88 this.serverUrlLabel.Size = new System.Drawing.Size(73, 13);89 this.serverUrlLabel.TabIndex = 13;90 this.serverUrlLabel.Text = "Plugin Server:";91 //92 // serverUrlTextBox93 //94 this.serverUrlTextBox.Location = new System.Drawing.Point(88, 8);95 this.serverUrlTextBox.Name = "serverUrlTextBox";96 this.serverUrlTextBox.Size = new System.Drawing.Size(264, 20);97 this.serverUrlTextBox.TabIndex = 12;98 //99 // refreshButton100 //101 this.refreshButton.Location = new System.Drawing.Point(358, 6);102 this.refreshButton.Name = "refreshButton";103 this.refreshButton.Size = new System.Drawing.Size(75, 23);104 this.refreshButton.TabIndex = 11;105 this.refreshButton.Text = "Refresh";106 this.refreshButton.UseVisualStyleBackColor = true;107 this.refreshButton.Click += new System.EventHandler(this.refreshButton_Click);108 //109 82 // installButton 110 83 // … … 157 130 // remotePluginsTabPage 158 131 // 159 this.remotePluginsTabPage.Controls.Add(this. serverUrlLabel);132 this.remotePluginsTabPage.Controls.Add(this.editConnectionButton); 160 133 this.remotePluginsTabPage.Controls.Add(this.remotePluginInstaller); 161 this.remotePluginsTabPage.Controls.Add(this.serverUrlTextBox);162 134 this.remotePluginsTabPage.Controls.Add(this.refreshButton); 163 135 this.remotePluginsTabPage.Controls.Add(this.installButton); … … 204 176 this.logTextBox.Size = new System.Drawing.Size(598, 586); 205 177 this.logTextBox.TabIndex = 0; 178 // 179 // refreshButton 180 // 181 this.refreshButton.Location = new System.Drawing.Point(8, 6); 182 this.refreshButton.Name = "refreshButton"; 183 this.refreshButton.Size = new System.Drawing.Size(75, 23); 184 this.refreshButton.TabIndex = 11; 185 this.refreshButton.Text = "Refresh"; 186 this.refreshButton.UseVisualStyleBackColor = true; 187 this.refreshButton.Click += new System.EventHandler(this.refreshButton_Click); 188 // 189 // editConnectionButton 190 // 191 this.editConnectionButton.Location = new System.Drawing.Point(89, 6); 192 this.editConnectionButton.Name = "editConnectionButton"; 193 this.editConnectionButton.Size = new System.Drawing.Size(108, 23); 194 this.editConnectionButton.TabIndex = 16; 195 this.editConnectionButton.Text = "Edit Connection..."; 196 this.editConnectionButton.UseVisualStyleBackColor = true; 197 this.editConnectionButton.Click += new System.EventHandler(this.editConnectionButton_Click); 206 198 // 207 199 // InstallationManagerForm … … 219 211 this.localPluginsTabPage.ResumeLayout(false); 220 212 this.remotePluginsTabPage.ResumeLayout(false); 221 this.remotePluginsTabPage.PerformLayout();222 213 this.logTabPage.ResumeLayout(false); 223 214 this.logTabPage.PerformLayout(); … … 232 223 private System.Windows.Forms.ToolStripProgressBar toolStripProgressBar; 233 224 private System.Windows.Forms.ToolStripStatusLabel toolStripStatusLabel; 234 private System.Windows.Forms.Label serverUrlLabel;235 private System.Windows.Forms.TextBox serverUrlTextBox;236 private System.Windows.Forms.Button refreshButton;237 225 private LocalPluginManager localPluginManager; 238 226 private RemotePluginInstaller remotePluginInstaller; … … 244 232 private System.Windows.Forms.TabPage logTabPage; 245 233 private System.Windows.Forms.TextBox logTextBox; 234 private System.Windows.Forms.Button editConnectionButton; 235 private System.Windows.Forms.Button refreshButton; 246 236 } 247 237 } -
trunk/sources/HeuristicLab.PluginInfrastructure/Advanced/InstallationManagerForm.cs
r2922 r3006 13 13 public partial class InstallationManagerForm : Form { 14 14 private class UpdateOrInstallPluginsBackgroundWorkerArgument { 15 public string ConnectionString { get; set; }16 15 public IEnumerable<IPluginDescription> PluginsToUpdate { get; set; } 17 16 public IEnumerable<IPluginDescription> PluginsToInstall { get; set; } … … 56 55 refreshLocalPluginsBackgroundWorker.RunWorkerCompleted += new RunWorkerCompletedEventHandler(refreshLocalPluginsBackgroundWorker_RunWorkerCompleted); 57 56 #endregion 58 59 // get default connection string60 using (var client = new DeploymentService.UpdateClient()) {61 serverUrlTextBox.Text = client.Endpoint.Address.ToString();62 }63 57 64 58 installationManager = new InstallationManager(pluginDir); … … 130 124 void updateOrInstallPluginsBackgroundWorker_DoWork(object sender, DoWorkEventArgs e) { 131 125 UpdateOrInstallPluginsBackgroundWorkerArgument info = (UpdateOrInstallPluginsBackgroundWorkerArgument)e.Argument; 132 installationManager.Install(info. ConnectionString, info.PluginsToInstall);133 installationManager.Update(info. ConnectionString, info.PluginsToUpdate);126 installationManager.Install(info.PluginsToInstall); 127 installationManager.Update(info.PluginsToUpdate); 134 128 } 135 129 #endregion … … 147 141 148 142 void refreshServerPluginsBackgroundWorker_DoWork(object sender, DoWorkEventArgs e) { 149 string connectionString = (string)e.Argument;150 151 143 RefreshBackgroundWorkerResult result = new RefreshBackgroundWorkerResult(); 152 result.RemotePlugins = installationManager.GetRemotePluginList( connectionString);153 result.RemoteProducts = installationManager.GetRemoteProductList( connectionString);144 result.RemotePlugins = installationManager.GetRemotePluginList(); 145 result.RemoteProducts = installationManager.GetRemoteProductList(); 154 146 e.Cancel = false; 155 147 e.Result = result; … … 180 172 #region installation manager event handlers 181 173 void installationManager_PreUpdatePlugin(object sender, PluginInfrastructureCancelEventArgs e) { 182 if (ConfirmUpdateAction(e.Entities) == true) e.Cancel = false; 183 else e.Cancel = true; 174 if (e.Plugins.Count() > 0) { 175 e.Cancel = ConfirmUpdateAction(e.Plugins) == false; 176 } 184 177 } 185 178 186 179 void installationManager_PreRemovePlugin(object sender, PluginInfrastructureCancelEventArgs e) { 187 if (ConfirmRemoveAction(e.Entities) == true) e.Cancel = false; 188 else e.Cancel = true; 180 if (e.Plugins.Count() > 0) { 181 e.Cancel = ConfirmRemoveAction(e.Plugins) == false; 182 } 189 183 } 190 184 191 185 void installationManager_PreInstallPlugin(object sender, PluginInfrastructureCancelEventArgs e) { 192 if (e.Entities.Count() > 0) 193 SetStatusStrip("Installing " + e.Entities.Aggregate((a, b) => a + Environment.NewLine + b)); 186 if (e.Plugins.Count() > 0) 187 if (ConfirmInstallAction(e.Plugins) == true) { 188 SetStatusStrip("Installing " + e.Plugins.Aggregate("", (a, b) => a.ToString() + "; " + b.ToString())); 189 e.Cancel = false; 190 } else { 191 e.Cancel = true; 192 SetStatusStrip("Install canceled"); 193 } 194 194 } 195 195 … … 239 239 var pluginsToInstall = remotePluginInstaller.CheckedPlugins.Except(pluginsToUpdate); 240 240 241 updateOrInstallInfo.ConnectionString = serverUrlTextBox.Text;242 241 updateOrInstallInfo.PluginsToInstall = pluginsToInstall; 243 242 updateOrInstallInfo.PluginsToUpdate = pluginsToUpdate; … … 255 254 256 255 #region confirmation dialogs 257 private bool ConfirmRemoveAction(IEnumerable< string> fileNames) {256 private bool ConfirmRemoveAction(IEnumerable<IPluginDescription> plugins) { 258 257 StringBuilder strBuilder = new StringBuilder(); 259 258 strBuilder.AppendLine("Delete files:"); 260 foreach (var fileName in fileNames) { 261 strBuilder.AppendLine(fileName); 259 foreach (var plugin in plugins) { 260 foreach (var file in plugin.Files) { 261 strBuilder.AppendLine(file.ToString()); 262 } 262 263 } 263 264 return MessageBox.Show(strBuilder.ToString(), "Confirm Delete", MessageBoxButtons.OKCancel, MessageBoxIcon.Warning) == DialogResult.OK; 264 265 } 265 266 266 private bool ConfirmUpdateAction(IEnumerable< string> plugins) {267 private bool ConfirmUpdateAction(IEnumerable<IPluginDescription> plugins) { 267 268 StringBuilder strBuilder = new StringBuilder(); 268 269 strBuilder.AppendLine("Update plugins:"); 269 270 foreach (var plugin in plugins) { 270 strBuilder.AppendLine(plugin );271 strBuilder.AppendLine(plugin.ToString()); 271 272 } 272 273 return MessageBox.Show(strBuilder.ToString(), "Confirm Update", MessageBoxButtons.OKCancel, MessageBoxIcon.Warning) == DialogResult.OK; 273 274 } 275 276 private bool ConfirmInstallAction(IEnumerable<IPluginDescription> plugins) { 277 foreach (var plugin in plugins) { 278 if (!string.IsNullOrEmpty(plugin.LicenseText)) { 279 var licenseConfirmationBox = new LicenseConfirmationBox(plugin); 280 if (licenseConfirmationBox.ShowDialog() != DialogResult.OK) 281 return false; 282 } 283 } 284 return true; 285 } 286 274 287 275 288 #endregion … … 306 319 toolStripProgressBar.Visible = true; 307 320 DisableControls(); 308 refreshServerPluginsBackgroundWorker.RunWorkerAsync( serverUrlTextBox.Text);321 refreshServerPluginsBackgroundWorker.RunWorkerAsync(); 309 322 } 310 323 … … 320 333 //ClearPluginsList(remotePluginsListView); 321 334 refreshButton.Enabled = true; 322 serverUrlTextBox.Enabled = true;323 335 toolStripProgressBar.Visible = false; 324 336 Cursor = Cursors.Default; … … 327 339 private void UpdateControlsConnected() { 328 340 refreshButton.Enabled = true; 329 serverUrlTextBox.Enabled = true;330 341 toolStripProgressBar.Visible = false; 331 342 Cursor = Cursors.Default; … … 345 356 installButton.Enabled = remotePluginInstaller.CheckedPlugins.Count() > 0; 346 357 } 358 359 private void editConnectionButton_Click(object sender, EventArgs e) { 360 (new ConnectionSetupView()).ShowInForm(); 361 } 347 362 } 348 363 } -
trunk/sources/HeuristicLab.PluginInfrastructure/Advanced/LocalPluginManager.Designer.cs
r2922 r3006 57 57 this.localPluginsListView.UseCompatibleStateImageBehavior = false; 58 58 this.localPluginsListView.View = System.Windows.Forms.View.Details; 59 this.localPluginsListView.ItemActivate += new System.EventHandler(this.localPluginsListView_ItemActivate); 59 60 this.localPluginsListView.ItemChecked += new System.Windows.Forms.ItemCheckedEventHandler(this.pluginsListView_ItemChecked); 60 61 // -
trunk/sources/HeuristicLab.PluginInfrastructure/Advanced/LocalPluginManager.cs
r2922 r3006 92 92 if (ItemChecked != null) ItemChecked(this, e); 93 93 } 94 95 private void localPluginsListView_ItemActivate(object sender, EventArgs e) { 96 if (localPluginsListView.SelectedItems.Count > 0) { 97 var plugin = (PluginDescription)localPluginsListView.SelectedItems[0].Tag; 98 PluginView pluginView = new PluginView(plugin); 99 pluginView.ShowInForm(); 100 } 101 } 94 102 } 95 103 } -
trunk/sources/HeuristicLab.PluginInfrastructure/HeuristicLab.PluginInfrastructure.csproj
r2922 r3006 93 93 </ItemGroup> 94 94 <ItemGroup> 95 <Compile Include="Advanced\ConnectionSetupView.cs"> 96 <SubType>UserControl</SubType> 97 </Compile> 98 <Compile Include="Advanced\ConnectionSetupView.Designer.cs"> 99 <DependentUpon>ConnectionSetupView.cs</DependentUpon> 100 </Compile> 101 <Compile Include="Advanced\DeploymentService\AdminClientFactory.cs" /> 95 102 <Compile Include="Advanced\DeploymentService\DeploymentService.cs" /> 103 <Compile Include="Advanced\DeploymentService\UpdateClientFactory.cs" /> 96 104 <Compile Include="Advanced\InstallationManagerConsole.cs" /> 97 105 <Compile Include="Advanced\InstallationManager.cs" /> … … 108 116 <SubType>Code</SubType> 109 117 </Compile> 118 <Compile Include="Advanced\LicenseConfirmationBox.cs"> 119 <SubType>Form</SubType> 120 </Compile> 121 <Compile Include="Advanced\LicenseConfirmationBox.Designer.cs"> 122 <DependentUpon>LicenseConfirmationBox.cs</DependentUpon> 123 </Compile> 124 <Compile Include="Advanced\LicenseView.cs"> 125 <SubType>UserControl</SubType> 126 </Compile> 127 <Compile Include="Advanced\LicenseView.Designer.cs"> 128 <DependentUpon>LicenseView.cs</DependentUpon> 129 </Compile> 110 130 <Compile Include="Advanced\LocalPluginManager.cs"> 111 131 <SubType>UserControl</SubType> … … 113 133 <Compile Include="Advanced\LocalPluginManager.Designer.cs"> 114 134 <DependentUpon>LocalPluginManager.cs</DependentUpon> 135 </Compile> 136 <Compile Include="Advanced\InstallationManagerControl.cs"> 137 <SubType>UserControl</SubType> 138 </Compile> 139 <Compile Include="Advanced\InstallationManagerControl.Designer.cs"> 140 <DependentUpon>InstallationManagerControl.cs</DependentUpon> 141 </Compile> 142 <Compile Include="Advanced\PluginView.cs"> 143 <SubType>UserControl</SubType> 144 </Compile> 145 <Compile Include="Advanced\PluginView.Designer.cs"> 146 <DependentUpon>PluginView.cs</DependentUpon> 115 147 </Compile> 116 148 <Compile Include="Advanced\RemotePluginInstaller.cs"> … … 221 253 <Content Include="Resources\List.gif" /> 222 254 <Content Include="Resources\Logo_white.gif" /> 255 <EmbeddedResource Include="Advanced\ConnectionSetupView.resx"> 256 <DependentUpon>ConnectionSetupView.cs</DependentUpon> 257 </EmbeddedResource> 258 <EmbeddedResource Include="Advanced\DeploymentService\servdev.cer" /> 259 <EmbeddedResource Include="Advanced\LicenseConfirmationBox.resx"> 260 <DependentUpon>LicenseConfirmationBox.cs</DependentUpon> 261 </EmbeddedResource> 262 <EmbeddedResource Include="Advanced\LicenseView.resx"> 263 <DependentUpon>LicenseView.cs</DependentUpon> 264 </EmbeddedResource> 265 <EmbeddedResource Include="Advanced\PluginView.resx"> 266 <DependentUpon>PluginView.cs</DependentUpon> 267 </EmbeddedResource> 223 268 <None Include="Resources\VS2008ImageLibrary_Actions_Delete.png" /> 224 269 <None Include="Resources\VS2008ImageLibrary_CommonElements_Actions_Remove.png" /> 225 270 <Content Include="Resources\VS2008ImageLibrary_CommonElements_Objects_Arrow_Down.png" /> 271 <None Include="Resources\VS2008ImageLibrary_Objects_File.png" /> 272 <None Include="Resources\VS2008ImageLibrary_Objects_Document.png" /> 226 273 <None Include="Resources\VS2008ImageLibrary_Objects_Internet.png" /> 227 274 <None Include="Resources\VS2008ImageLibrary_Objects_Install.png" /> -
trunk/sources/HeuristicLab.PluginInfrastructure/Manager/PluginFile.cs
r2790 r3006 47 47 this.type = type; 48 48 } 49 50 public override string ToString() { 51 return name; 52 } 49 53 } 50 54 } -
trunk/sources/HeuristicLab.PluginInfrastructure/Manager/PluginInfrastructureCancelEventArgs.cs
r2922 r3006 29 29 [Serializable] 30 30 internal sealed class PluginInfrastructureCancelEventArgs : CancelEventArgs { 31 internal IEnumerable< string> Entities { get; private set; }32 internal PluginInfrastructureCancelEventArgs(IEnumerable< string> entities)31 internal IEnumerable<IPluginDescription> Plugins { get; private set; } 32 internal PluginInfrastructureCancelEventArgs(IEnumerable<IPluginDescription> plugins) 33 33 : base() { 34 this. Entities = entities;34 this.Plugins = plugins; 35 35 } 36 36 } -
trunk/sources/HeuristicLab.PluginInfrastructure/Properties/Settings.Designer.cs
r2597 r3006 42 42 } 43 43 44 [global::System.Configuration. ApplicationScopedSettingAttribute()]44 [global::System.Configuration.UserScopedSettingAttribute()] 45 45 [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] 46 [global::System.Configuration.DefaultSettingValueAttribute("<?xml version=\"1.0\" encoding=\"utf-16\"?>\r\n<ArrayOfString xmlns:xsi=\"http://www.w3." + 47 "org/2001/XMLSchema-instance\" xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\">\r\n <s" + 48 "tring>http://localhost:59253/UpdateLocation.svc</string>\r\n</ArrayOfString>")] 49 public global::System.Collections.Specialized.StringCollection UpdateLocations { 46 [global::System.Configuration.DefaultSettingValueAttribute("http://servdev.heuristiclab.com/Deployment/Update.svc")] 47 public string UpdateLocation { 50 48 get { 51 return ((global::System.Collections.Specialized.StringCollection)(this["UpdateLocations"])); 49 return ((string)(this["UpdateLocation"])); 50 } 51 set { 52 this["UpdateLocation"] = value; 53 } 54 } 55 56 [global::System.Configuration.UserScopedSettingAttribute()] 57 [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] 58 [global::System.Configuration.DefaultSettingValueAttribute("")] 59 public string UpdateLocationUserName { 60 get { 61 return ((string)(this["UpdateLocationUserName"])); 62 } 63 set { 64 this["UpdateLocationUserName"] = value; 65 } 66 } 67 68 [global::System.Configuration.UserScopedSettingAttribute()] 69 [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] 70 [global::System.Configuration.DefaultSettingValueAttribute("")] 71 public string UpdateLocationPassword { 72 get { 73 return ((string)(this["UpdateLocationPassword"])); 74 } 75 set { 76 this["UpdateLocationPassword"] = value; 77 } 78 } 79 80 [global::System.Configuration.UserScopedSettingAttribute()] 81 [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] 82 [global::System.Configuration.DefaultSettingValueAttribute("http://servdev.heuristiclab.com/Deployment/Admin.svc")] 83 public string UpdateLocationAdministrationAddress { 84 get { 85 return ((string)(this["UpdateLocationAdministrationAddress"])); 86 } 87 set { 88 this["UpdateLocationAdministrationAddress"] = value; 52 89 } 53 90 } -
trunk/sources/HeuristicLab.PluginInfrastructure/Properties/Settings.settings
r2597 r3006 9 9 <Value Profile="(Default)">-</Value> 10 10 </Setting> 11 <Setting Name="UpdateLocations" Type="System.Collections.Specialized.StringCollection" Scope="Application"> 12 <Value Profile="(Default)"><?xml version="1.0" encoding="utf-16"?> 13 <ArrayOfString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> 14 <string>http://localhost:59253/UpdateLocation.svc</string> 15 </ArrayOfString></Value> 11 <Setting Name="UpdateLocation" Type="System.String" Scope="User"> 12 <Value Profile="(Default)">http://servdev.heuristiclab.com/Deployment/Update.svc</Value> 13 </Setting> 14 <Setting Name="UpdateLocationUserName" Type="System.String" Scope="User"> 15 <Value Profile="(Default)" /> 16 </Setting> 17 <Setting Name="UpdateLocationPassword" Type="System.String" Scope="User"> 18 <Value Profile="(Default)" /> 19 </Setting> 20 <Setting Name="UpdateLocationAdministrationAddress" Type="System.String" Scope="User"> 21 <Value Profile="(Default)">http://servdev.heuristiclab.com/Deployment/Admin.svc</Value> 16 22 </Setting> 17 23 </Settings> -
trunk/sources/HeuristicLab.PluginInfrastructure/Resources/Resources.Designer.cs
r2922 r3006 75 75 } 76 76 77 internal static System.Drawing.Bitmap Document { 78 get { 79 object obj = ResourceManager.GetObject("Document", resourceCulture); 80 return ((System.Drawing.Bitmap)(obj)); 81 } 82 } 83 84 internal static System.Drawing.Bitmap File { 85 get { 86 object obj = ResourceManager.GetObject("File", resourceCulture); 87 return ((System.Drawing.Bitmap)(obj)); 88 } 89 } 90 77 91 internal static System.Drawing.Bitmap Install { 78 92 get { -
trunk/sources/HeuristicLab.PluginInfrastructure/Resources/Resources.resx
r2922 r3006 125 125 <value>vs2008imagelibrary_objects_assembly.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> 126 126 </data> 127 <data name="Document" type="System.Resources.ResXFileRef, System.Windows.Forms"> 128 <value>VS2008ImageLibrary_Objects_Document.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> 129 </data> 130 <data name="File" type="System.Resources.ResXFileRef, System.Windows.Forms"> 131 <value>VS2008ImageLibrary_Objects_File.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> 132 </data> 127 133 <data name="Install" type="System.Resources.ResXFileRef, System.Windows.Forms"> 128 134 <value>vs2008imagelibrary_objects_install.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> -
trunk/sources/HeuristicLab.PluginInfrastructure/app.config
r2922 r3006 4 4 <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" > 5 5 <section name="HeuristicLab.PluginInfrastructure.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" /> 6 </sectionGroup> 7 <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" > 8 <section name="HeuristicLab.PluginInfrastructure.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" /> 6 9 </sectionGroup> 7 10 </configSections> … … 13 16 <setting name="Organization" serializeAs="String"> 14 17 <value>-</value> 15 </setting>16 <setting name="UpdateLocations" serializeAs="Xml">17 <value>18 <ArrayOfString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"19 xmlns:xsd="http://www.w3.org/2001/XMLSchema">20 <string>http://localhost:59253/UpdateLocation.svc</string>21 </ArrayOfString>22 </value>23 18 </setting> 24 19 </HeuristicLab.PluginInfrastructure.Properties.Settings> … … 40 35 <transport clientCredentialType="Windows" proxyCredentialType="None" 41 36 realm="" /> 42 <message clientCredentialType=" Windows" negotiateServiceCredential="true"37 <message clientCredentialType="UserName" negotiateServiceCredential="true" 43 38 algorithmSuite="Default" establishSecurityContext="true" /> 44 39 </security> … … 57 52 <transport clientCredentialType="Windows" proxyCredentialType="None" 58 53 realm="" /> 59 <message clientCredentialType=" Windows" negotiateServiceCredential="true"54 <message clientCredentialType="UserName" negotiateServiceCredential="true" 60 55 algorithmSuite="Default" establishSecurityContext="true" /> 61 56 </security> … … 64 59 </bindings> 65 60 <client> 66 <endpoint address="http:// localhost:8731/Design_Time_Addresses/HeuristicLab.Services.Deployment/Update/"61 <endpoint address="http://servdev.heuristiclab.com/Deployment/Update.svc" 67 62 binding="wsHttpBinding" bindingConfiguration="WSHttpBinding_IUpdate" 68 63 contract="HeuristicLab.PluginInfrastructure.Advanced.DeploymentService.IUpdate" 69 64 name="WSHttpBinding_IUpdate"> 70 65 <identity> 71 < dns value="localhost" />66 <certificate encodedValue="AwAAAAEAAAAUAAAAFhNc5P5CrrUsDAETV1gq2wDRXQ0gAAAAAQAAACcCAAAwggIjMIIBjKADAgECAhCnTkk2TwtajEKLiJLyjCpwMA0GCSqGSIb3DQEBBAUAMCMxITAfBgNVBAMTGHNlcnZkZXYuaGV1cmlzdGljbGFiLmNvbTAeFw0xMDAzMTAxNTI4MTJaFw0zOTEyMzEyMzU5NTlaMCMxITAfBgNVBAMTGHNlcnZkZXYuaGV1cmlzdGljbGFiLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEArJSMi2lAXj/Z9sMiLjiUmqUfNSfozaio/mjR6PxbDPBWZp6xTFdDLnBx+kHMBp+gc75hMI6wCFHB8PYud8tHMgJFDssGBUZkEN2vFZ0h41efyXo9U0o90KVFWFBQWOz+Opnalqohh8qHnOczo1zabeLFf79pC81Y6QGNkSyQcikCAwEAAaNYMFYwVAYDVR0BBE0wS4AQ1x+ArbPOrv0XwUivnGidCKElMCMxITAfBgNVBAMTGHNlcnZkZXYuaGV1cmlzdGljbGFiLmNvbYIQp05JNk8LWoxCi4iS8owqcDANBgkqhkiG9w0BAQQFAAOBgQBU8cGNgEnkWLs3v433WBC2Sl6BiPk6IchsqfxECp1Q4j/gqsIe9xRNnjxD5YEj0HGdqjrKBwF8XrOXPgyXQXfM4ju3INGLSJ1WH/oODbgbKnqQ/7TSJ++y1x0lnDgh+ibqjchsrBrqzKfkBNOa4B3g1M9q1eNVDOyGWu7GiZAUTA==" /> 72 67 </identity> 73 68 </endpoint> 74 <endpoint address="http:// localhost:8731/Design_Time_Addresses/HeuristicLab.Services.Deployment/Admin/"69 <endpoint address="http://servdev.heuristiclab.com/Deployment/Admin.svc" 75 70 binding="wsHttpBinding" bindingConfiguration="WSHttpBinding_IAdmin" 76 71 contract="HeuristicLab.PluginInfrastructure.Advanced.DeploymentService.IAdmin" 77 72 name="WSHttpBinding_IAdmin"> 78 73 <identity> 79 < dns value="localhost" />74 <certificate encodedValue="AwAAAAEAAAAUAAAAFhNc5P5CrrUsDAETV1gq2wDRXQ0gAAAAAQAAACcCAAAwggIjMIIBjKADAgECAhCnTkk2TwtajEKLiJLyjCpwMA0GCSqGSIb3DQEBBAUAMCMxITAfBgNVBAMTGHNlcnZkZXYuaGV1cmlzdGljbGFiLmNvbTAeFw0xMDAzMTAxNTI4MTJaFw0zOTEyMzEyMzU5NTlaMCMxITAfBgNVBAMTGHNlcnZkZXYuaGV1cmlzdGljbGFiLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEArJSMi2lAXj/Z9sMiLjiUmqUfNSfozaio/mjR6PxbDPBWZp6xTFdDLnBx+kHMBp+gc75hMI6wCFHB8PYud8tHMgJFDssGBUZkEN2vFZ0h41efyXo9U0o90KVFWFBQWOz+Opnalqohh8qHnOczo1zabeLFf79pC81Y6QGNkSyQcikCAwEAAaNYMFYwVAYDVR0BBE0wS4AQ1x+ArbPOrv0XwUivnGidCKElMCMxITAfBgNVBAMTGHNlcnZkZXYuaGV1cmlzdGljbGFiLmNvbYIQp05JNk8LWoxCi4iS8owqcDANBgkqhkiG9w0BAQQFAAOBgQBU8cGNgEnkWLs3v433WBC2Sl6BiPk6IchsqfxECp1Q4j/gqsIe9xRNnjxD5YEj0HGdqjrKBwF8XrOXPgyXQXfM4ju3INGLSJ1WH/oODbgbKnqQ/7TSJ++y1x0lnDgh+ibqjchsrBrqzKfkBNOa4B3g1M9q1eNVDOyGWu7GiZAUTA==" /> 80 75 </identity> 81 76 </endpoint> 82 77 </client> 83 78 </system.serviceModel> 79 <userSettings> 80 <HeuristicLab.PluginInfrastructure.Properties.Settings> 81 <setting name="UpdateLocation" serializeAs="String"> 82 <value>http://servdev.heuristiclab.com/Deployment/Update.svc</value> 83 </setting> 84 <setting name="UpdateLocationUserName" serializeAs="String"> 85 <value /> 86 </setting> 87 <setting name="UpdateLocationPassword" serializeAs="String"> 88 <value /> 89 </setting> 90 <setting name="UpdateLocationAdministrationAddress" serializeAs="String"> 91 <value>http://servdev.heuristiclab.com/Deployment/Admin.svc</value> 92 </setting> 93 </HeuristicLab.PluginInfrastructure.Properties.Settings> 94 </userSettings> 84 95 </configuration>
Note: See TracChangeset
for help on using the changeset viewer.