Free cookie consent management tool by TermsFeed Policy Generator

Changeset 2904


Ignore:
Timestamp:
03/01/10 21:20:01 (14 years ago)
Author:
kgrading
Message:

added functionality (#830)

Location:
trunk/sources
Files:
17 added
16 edited

Legend:

Unmodified
Added
Removed

  • trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.SpringNET/1.3.0/HeuristicLab.SpringNET-1.3.0.csproj

    r2849 r2904  
    8686  <ItemGroup>
    8787    <None Include="HeuristicLab.snk" />
     88    <None Include="HeuristicLabSpringNetPlugin.cs.frame" />
    8889    <None Include="Properties\AssemblyInfo.frame" />
    8990  </ItemGroup>
    … …  
    125126set Outdir=$(Outdir)
    126127
    127 call PreBuildEvent.cmd</PreBuildEvent>
     128call PreBuildEvent.cmd
     129SubWCRev "%25ProjectDir%25/" "%25ProjectDir%25/HeuristicLabSpringNetPlugin.cs.frame" "%25ProjectDir%25/HeuristicLabSpringNetPlugin.cs"</PreBuildEvent>
    128130  </PropertyGroup>
    129131</Project>

  • trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.SpringNET/1.3.0/HeuristicLabSpringNetPlugin.cs

    r2847 r2904  
    1 using System;
     1#region License Information
     2/* HeuristicLab
     3 * Copyright (C) 2002-2009 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     4 *
     5 * This file is part of HeuristicLab.
     6 *
     7 * HeuristicLab is free software: you can redistribute it and/or modify
     8 * it under the terms of the GNU General Public License as published by
     9 * the Free Software Foundation, either version 3 of the License, or
     10 * (at your option) any later version.
     11 *
     12 * HeuristicLab is distributed in the hope that it will be useful,
     13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
     14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     15 * GNU General Public License for more details.
     16 *
     17 * You should have received a copy of the GNU General Public License
     18 * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
     19 */
     20#endregion
     21
     22using System;
    223using System.Collections.Generic;
    324using System.Linq;
    … …  
    627
    728namespace HeuristicLab.SpringNET {
    8   [Plugin("HeuristicLab.SpringNET", "1.3.0")]
     29 
     30  [Plugin("HeuristicLab.SpringNET", "1.3.0.2849")]
    931  [PluginFile("HeuristicLab.SpringNET-1.3.0.dll", PluginFileType.Assembly)]
    1032  [PluginFile("Common.Logging.dll", PluginFileType.Assembly)]
    … …  
    1234  [PluginFile("Spring.Core.dll", PluginFileType.Assembly)]
    1335  [PluginFile("Spring.Aop.dll", PluginFileType.Assembly)] 
    14   public class HeuristicLabSpringNetPlugin: PluginBase {
    15 
     36  public class HeuristicLabSpringNetPlugin : PluginBase {
    1637  }
    1738}

  • trunk/sources/HeuristicLab.Hive.Engine/3.2/HeuristicLab.Hive.Engine-3.2.csproj

    r2474 r2904  
    8989    <Compile Include="HiveEngine.cs" />
    9090    <Compile Include="HiveEngineEditor.cs">
    91       <SubType>UserControl</SubType>
    9291    </Compile>
    9392    <Compile Include="HiveEngineEditor.Designer.cs">

  • trunk/sources/HeuristicLab.Hive.Server.Core/3.2/ClientCommunicator.cs

    r2846 r2904  
    3939using System.Runtime.Serialization.Formatters.Binary;
    4040using HeuristicLab.Tracing;
     41using Linq = HeuristicLab.Hive.Server.LINQDataAccess;
    4142
    4243namespace HeuristicLab.Hive.Server.Core {
    … …  
    6061    private IInternalJobManager jobManager;
    6162    private IScheduler scheduler;
     63
     64    Linq.ClientDao clientDao = new Linq.ClientDao();
    6265
    6366    private static int PENDING_TIMEOUT = 100;
    … …  
    195198    /// <returns></returns>
    196199    public Response Login(ClientInfo clientInfo) {
    197       ISession session = factory.GetSessionForCurrentThread();
    198       ITransaction tx = null;
    199 
    200       try {
    201         IClientAdapter clientAdapter =
    202           session.GetDataAdapter<ClientInfo, IClientAdapter>();
    203 
    204         tx = session.BeginTransaction();
     200    //  ISession session = factory.GetSessionForCurrentThread();
     201    //  ITransaction tx = null;
     202
     203    //  try {
     204    //    IClientAdapter clientAdapter =
     205    //      session.GetDataAdapter<ClientInfo, IClientAdapter>();
     206
     207    //    tx = session.BeginTransaction();
    205208
    206209        Response response = new Response();
    … …  
    215218
    216219        clientInfo.State = State.idle;
    217         clientAdapter.Update(clientInfo);
     220
     221        if (clientDao.FindById(clientInfo.Id) == null)
     222          clientDao.Insert(clientInfo);
     223        else
     224          clientDao.Update(clientInfo);
     225        //clientAdapter.Update(clientInfo);
    218226        response.Success = true;
    219227        response.StatusMessage = ApplicationConstants.RESPONSE_COMMUNICATOR_LOGIN_SUCCESS;
    220228
    221         tx.Commit();
     229        //tx.Commit();
    222230        return response;
    223       }
    224       catch (Exception ex) {
     231      //}
     232      /*catch (Exception ex) {
    225233        if (tx != null)
    226234          tx.Rollback();
    … …  
    230238        if (session != null)
    231239          session.EndSession();
    232       }
     240      } */
    233241    }
    234242

  • trunk/sources/HeuristicLab.Hive.Server.Core/3.2/ClientFacade.cs

    r2122 r2904  
    3636  [ServiceBehavior(InstanceContextMode =
    3737    InstanceContextMode.PerCall, ConcurrencyMode = ConcurrencyMode.Multiple)]
    38   class ClientFacade: IClientFacade {
     38  public class ClientFacade: IClientFacade {
     39
     40    public ClientFacade() {     
     41    }
    3942
    4043    private IClientCommunicator clientCommunicator =

  • trunk/sources/HeuristicLab.Hive.Server.Core/3.2/ClientManager.cs

    r2086 r2904  
    2929using HeuristicLab.Hive.Server.DataAccess;
    3030using HeuristicLab.DataAccess.Interfaces;
     31using HeuristicLab.Hive.Server.LINQDataAccess;
     32using ClientGroup=HeuristicLab.Hive.Contracts.BusinessObjects.ClientGroup;
     33using Resource=HeuristicLab.Hive.Contracts.BusinessObjects.Resource;
    3134
    3235namespace HeuristicLab.Hive.Server.Core {
    3336  class ClientManager: IClientManager {
     37
     38    ClientDao clientDao = new ClientDao();
    3439
    3540    ISessionFactory factory;

  • trunk/sources/HeuristicLab.Hive.Server.Core/3.2/DbTestApp.cs

    r2591 r2904  
    3434using HeuristicLab.Hive.Server.Core;
    3535using HeuristicLab.Core;
     36using HeuristicLab.Hive.Server.LINQDataAccess;
    3637
    3738namespace HeuristicLab.Hive.Server {
    … …  
    298299
    299300      IJobAdapter jobAdapter =
    300         session.GetDataAdapter<Job, IJobAdapter>();
     301        session.GetDataAdapter<HeuristicLab.Hive.Contracts.BusinessObjects.Job, IJobAdapter>();
    301302
    302303      Stream s = jobAdapter.GetSerializedJobStream(
    … …  
    358359      IStorable restoredJob =
    359360        PersistenceManager.RestoreFromGZip(response.Obj.SerializedJobResultData);
     361    }
     362
     363    private void TestLINQImplementation() {     
     364      ClientDao clientDao = new ClientDao();     
     365      ClientInfo info = new ClientInfo();
     366      info.Id = Guid.NewGuid();
     367      info.FreeMemory = 1000;
     368      info.Login = DateTime.Now;
     369      info.Memory = 1000;
     370      info.Name = "jackie";
     371      info.NrOfCores = 3;
     372      info.NrOfFreeCores = 2;
     373      info.CpuSpeedPerCore = 2500;
     374      info.State = State.idle;
     375      info = clientDao.Insert(info);
     376
    360377    }
    361378
    … …  
    365382      //TestJobStreaming();
    366383      //TestJobResultStreaming();
    367       TestJobResultDeserialization();
    368     }
     384      //TestJobResultDeserialization();
     385
     386      TestLINQImplementation();
     387
     388    }
     389
     390
    369391  }
    370392}

  • trunk/sources/HeuristicLab.Hive.Server.Core/3.2/ExecutionEngineFacade.cs

    r2099 r2904  
    2929
    3030namespace HeuristicLab.Hive.Server.Core {
    31   class ExecutionEngineFacade: IExecutionEngineFacade {
     31  public class ExecutionEngineFacade: IExecutionEngineFacade {
    3232
    3333    private IJobManager jobManager =
    3434      ServiceLocator.GetJobManager();
     35
     36    public ExecutionEngineFacade() {
     37     
     38    }
    3539
    3640    #region IExecutionEngineFacade Members

  • trunk/sources/HeuristicLab.Hive.Server.Core/3.2/HeuristicLab.Hive.Server.Core-3.2.csproj

    r2608 r2904  
    6868    <Reference Include="System" />
    6969    <Reference Include="System.Core">
     70      <RequiredTargetFramework>3.5</RequiredTargetFramework>
     71    </Reference>
     72    <Reference Include="System.Data.Linq">
    7073      <RequiredTargetFramework>3.5</RequiredTargetFramework>
    7174    </Reference>
    … …  
    149152      <Name>HeuristicLab.Hive.Server.DataAccess-3.2</Name>
    150153    </ProjectReference>
     154    <ProjectReference Include="..\..\HeuristicLab.Hive.Server.LINQDataAccess\3.2\HeuristicLab.Hive.Server.LINQDataAccess-3.2.csproj">
     155      <Project>{A4499DDD-D1B8-414F-98F6-903C2C71BEB0}</Project>
     156      <Name>HeuristicLab.Hive.Server.LINQDataAccess-3.2</Name>
     157    </ProjectReference>
    151158    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\HeuristicLab.PluginInfrastructure.csproj">
    152159      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    … …  
    171178      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    172179    </EmbeddedResource>
     180  </ItemGroup>
     181  <ItemGroup>
     182    <WCFMetadata Include="Service References\" />
    173183  </ItemGroup>
    174184  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

  • trunk/sources/HeuristicLab.Hive.Server.Core/3.2/ServerConsoleFacade.cs

    r2099 r2904  
    4343
    4444    public Guid sessionID = Guid.Empty;
     45
     46    public ServerConsoleFacade() {     
     47    }
    4548
    4649    public Response Login(string username, string password) {

  • trunk/sources/HeuristicLab.Hive.Server.Core/3.2/app.config

    r2608 r2904  
    11<?xml version="1.0" encoding="utf-8" ?>
    22<configuration>
    3   <configSections>
     3  <configSections> 
     4    <sectionGroup name="spring">
     5      <section name="context" type="Spring.Context.Support.ContextHandler, Spring.Core"/>
     6      <section name="objects" type="Spring.Context.Support.DefaultSectionHandler, Spring.Core"/>
     7    </sectionGroup>   
    48    <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
    59      <section name="HeuristicLab.Hive.Server.Core.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
    … …  
    1317    </HeuristicLab.Hive.Server.Core.Properties.Settings>
    1418  </applicationSettings>
     19  <spring>
     20    <context>
     21      <resource uri="config://spring/objects"/>
     22    </context>
     23   
     24    <objects xmlns="http://www.springframework.net"
     25         xmlns:aop="http://www.springframework.net/aop">
     26      <object id="calculator" singleton="false"
     27              type="HeuristicLab.Hive.Server.Core.ClientFacade, HeuristicLab.Hive.Server.Core-3.2" />
     28
     29      <object id="serviceOperation" type="Spring.Aop.Support.SdkRegularExpressionMethodPointcut, Spring.Aop">
     30        <property name="patterns">
     31          <list>
     32            <value>HeuristicLab.Hive.Server.Core.ClientFacade.*</value>
     33          </list>
     34        </property>
     35      </object>
     36
     37      <object id="sci" type="HeuristicLab.Hive.Server.ServiceCallInterception, HeuristicLab.Hive.Server-3.2" />
     38
     39      <aop:config>
     40        <aop:advisor pointcut-ref="serviceOperation" advice-ref="sci"/>
     41      </aop:config>
     42    </objects>
     43  </spring>
    1544</configuration>

  • trunk/sources/HeuristicLab.Hive.Server.LINQDataAccess/3.2/HeuristicLab.Hive.Server.LINQDataAccess-3.2.csproj

    r2846 r2904  
    7171      <RequiredTargetFramework>3.5</RequiredTargetFramework>
    7272    </Reference>
     73    <Reference Include="System.Data.Linq">
     74      <RequiredTargetFramework>3.5</RequiredTargetFramework>
     75    </Reference>
     76    <Reference Include="System.Drawing" />
     77    <Reference Include="System.Windows.Forms" />
    7378    <Reference Include="System.Xml.Linq">
    7479      <RequiredTargetFramework>3.5</RequiredTargetFramework>
    … …  
    8186  </ItemGroup>
    8287  <ItemGroup>
     88    <Compile Include="BaseDao.cs" />
     89    <Compile Include="ClientDao.cs" />
     90    <Compile Include="ContextFactory.cs" />
     91    <Compile Include="Hive.designer.cs">
     92      <AutoGen>True</AutoGen>
     93      <DesignTime>True</DesignTime>
     94      <DependentUpon>Hive.dbml</DependentUpon>
     95    </Compile>
     96    <Compile Include="IClientDao.cs" />
     97    <Compile Include="IGenericDao.cs" />
     98    <Compile Include="IJobDao.cs" />
    8399    <Compile Include="LINQDataAccessPlugin.cs" />
    84100    <Compile Include="Properties\AssemblyInfo.cs" />
     101    <Compile Include="Properties\Settings.Designer.cs">
     102      <AutoGen>True</AutoGen>
     103      <DesignTimeSharedInput>True</DesignTimeSharedInput>
     104      <DependentUpon>Settings.settings</DependentUpon>
     105    </Compile>
    85106  </ItemGroup>
    86107  <ItemGroup>
     108    <None Include="Hive.dbml">
     109      <Generator>MSLinqToSQLGenerator</Generator>
     110      <LastGenOutput>Hive.designer.cs</LastGenOutput>
     111      <SubType>Designer</SubType>
     112    </None>
    87113    <None Include="HeuristicLab.snk" />
    88114    <None Include="Properties\AssemblyInfo.frame" />
    89115  </ItemGroup>
    90116  <ItemGroup>
     117    <ProjectReference Include="..\..\HeuristicLab.DataAccess\3.2\HeuristicLab.DataAccess-3.2.csproj">
     118      <Project>{9076697B-C151-46CD-95BC-1D059492B478}</Project>
     119      <Name>HeuristicLab.DataAccess-3.2</Name>
     120    </ProjectReference>
     121    <ProjectReference Include="..\..\HeuristicLab.Hive.Contracts\3.2\HeuristicLab.Hive.Contracts-3.2.csproj">
     122      <Project>{134F93D7-E7C8-4ECD-9923-7F63259A60D8}</Project>
     123      <Name>HeuristicLab.Hive.Contracts-3.2</Name>
     124    </ProjectReference>
    91125    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\HeuristicLab.PluginInfrastructure.csproj">
    92126      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    93127      <Name>HeuristicLab.PluginInfrastructure</Name>
    94128    </ProjectReference>
     129  </ItemGroup>
     130  <ItemGroup>
     131    <Service Include="{3259AA49-8AA1-44D3-9025-A0B520596A8C}" />
     132  </ItemGroup>
     133  <ItemGroup>
     134    <None Include="app.config" />
     135    <None Include="Hive.dbml.layout">
     136      <DependentUpon>Hive.dbml</DependentUpon>
     137    </None>
     138    <None Include="Properties\Settings.settings">
     139      <Generator>SettingsSingleFileGenerator</Generator>
     140      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
     141    </None>
    95142  </ItemGroup>
    96143  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

  • trunk/sources/HeuristicLab.Hive.Server/3.2/HeuristicLab.Hive.Server-3.2.csproj

    r2065 r2904  
    6868  </PropertyGroup>
    6969  <ItemGroup>
     70    <Reference Include="Common.Logging, Version=1.2.0.0, Culture=neutral, PublicKeyToken=af08829b84f0328e">
     71      <SpecificVersion>False</SpecificVersion>
     72      <HintPath>..\..\HeuristicLab.ExtLibs\HeuristicLab.SpringNET\1.3.0\Common.Logging.dll</HintPath>
     73    </Reference>
     74    <Reference Include="Spring.Aop, Version=1.3.0.20214, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
     75      <SpecificVersion>False</SpecificVersion>
     76      <HintPath>..\..\HeuristicLab.ExtLibs\HeuristicLab.SpringNET\1.3.0\Spring.Aop.dll</HintPath>
     77    </Reference>
     78    <Reference Include="Spring.Core, Version=1.3.0.20214, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
     79      <SpecificVersion>False</SpecificVersion>
     80      <HintPath>..\..\HeuristicLab.ExtLibs\HeuristicLab.SpringNET\1.3.0\Spring.Core.dll</HintPath>
     81    </Reference>
     82    <Reference Include="Spring.Services, Version=1.3.0.30214, Culture=neutral, PublicKeyToken=65e474d141e25e07, processorArchitecture=MSIL">
     83      <SpecificVersion>False</SpecificVersion>
     84      <HintPath>..\..\HeuristicLab.ExtLibs\HeuristicLab.SpringNET\1.3.0\Spring.Services.dll</HintPath>
     85    </Reference>
    7086    <Reference Include="System" />
    7187    <Reference Include="System.Core">
    … …  
    125141      <DesignTimeSharedInput>True</DesignTimeSharedInput>
    126142    </Compile>
     143    <Compile Include="ServiceCallInterception.cs" />
    127144  </ItemGroup>
    128145  <ItemGroup>
    … …  
    135152      <Name>HeuristicLab.Hive.Contracts-3.2</Name>
    136153    </ProjectReference>
     154    <ProjectReference Include="..\..\HeuristicLab.Hive.Server.Core\3.2\HeuristicLab.Hive.Server.Core-3.2.csproj">
     155      <Project>{898B31CF-81DC-453B-AEB3-BDF83197A7EE}</Project>
     156      <Name>HeuristicLab.Hive.Server.Core-3.2</Name>
     157    </ProjectReference>
    137158    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\HeuristicLab.PluginInfrastructure.csproj">
    138159      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    … …  
    141162  </ItemGroup>
    142163  <ItemGroup>
     164    <None Include="App.config">
     165    </None>
    143166    <None Include="Resources\HeuristicLab.ico" />
    144167  </ItemGroup>

  • trunk/sources/HeuristicLab.Hive.Server/3.2/HiveServerApplication.cs

    r2609 r2904  
    2929using System.ServiceModel.Description;
    3030using System.Net;
     31using HeuristicLab.Hive.Server.Core;
    3132using HeuristicLab.Hive.Contracts;
    3233using HeuristicLab.Hive.Contracts.Interfaces;
    3334using HeuristicLab.Hive.Server.Properties;
     35using Spring.ServiceModel;
    3436
    3537namespace HeuristicLab.Hive.Server {
    … …  
    6769      string curServiceHost = "";
    6870      Uri uriTcp;
    69       IEnumerable<IClientFacade> clientCommunicatorInstances = ApplicationManager.Manager.GetInstances<IClientFacade>();
     71      /*IEnumerable<IClientFacade> clientCommunicatorInstances = ApplicationManager.Manager.GetInstances<IClientFacade>();
    7072      IEnumerable<IServerConsoleFacade> serverConsoleInstances = ApplicationManager.Manager.GetInstances<IServerConsoleFacade>();
    71       IEnumerable<IExecutionEngineFacade> executionEngineInstances = ApplicationManager.Manager.GetInstances<IExecutionEngineFacade>();
    72       ServiceHost serviceHost = null;
     73      IEnumerable<IExecutionEngineFacade> executionEngineInstances = ApplicationManager.Manager.GetInstances<IExecutionEngineFacade>();*/
     74      SpringServiceHost serviceHost = null;
    7375      switch (svc) {
    7476        case Services.ClientCommunicator:
    75           if (clientCommunicatorInstances.Count() > 0) {
     77        //  if (clientCommunicatorInstances.Count() > 0) {
    7678            uriTcp = new Uri("net.tcp://" + ipAddress + ":" + port + "/HiveServer/");
    77             serviceHost = new ServiceHost(clientCommunicatorInstances.First().GetType(), uriTcp);
     79            //serviceHost = new ServiceHost(clientCommunicatorInstances.First().GetType(), uriTcp);
     80            //serviceHost = new ServiceHost(typeof(ClientFacade), uriTcp);
     81            serviceHost = new SpringServiceHost("clientFacade", uriTcp);
    7882            serviceHost.AddServiceEndpoint(typeof(IClientFacade), streamedBinding, STR_ClientCommunicator);
    7983           
    … …  
    8892
    8993            curServiceHost = STR_ClientCommunicator;
    90           }
     94        //  }
    9195          break;
    9296        case Services.ServerConsoleFacade:
    93           if (serverConsoleInstances.Count() > 0) {
     97        //  if (serverConsoleInstances.Count() > 0) {
    9498            uriTcp = new Uri("net.tcp://" + ipAddress + ":" + port + "/HiveServerConsole/");
    95             serviceHost = new ServiceHost(serverConsoleInstances.First().GetType(), uriTcp);
     99            //serviceHost = new ServiceHost(serverConsoleInstances.First().GetType(), uriTcp);
     100            serviceHost = new SpringServiceHost("serverConsoleFacade", uriTcp);
    96101            serviceHost.AddServiceEndpoint(typeof(IServerConsoleFacade), binding, STR_ServerConsoleFacade);
    97102            curServiceHost = STR_ServerConsoleFacade;
    98           }
     103        //  }
    99104          break;
    100105        case Services.ExecutionEngineFacade:
    101           if (executionEngineInstances.Count() > 0) {
     106        //  if (executionEngineInstances.Count() > 0) {
    102107            uriTcp = new Uri("net.tcp://" + ipAddress + ":" + port + "/ExecutionEngine/");
    103             serviceHost = new ServiceHost(executionEngineInstances.First().GetType(), uriTcp);
     108            //serviceHost = new ServiceHost(executionEngineInstances.First().GetType(), uriTcp);
     109            serviceHost = new SpringServiceHost("executionEngineFacade", uriTcp);
    104110            serviceHost.AddServiceEndpoint(typeof(IExecutionEngineFacade), streamedBinding, STR_ExecutionEngineFacade);
    105111            curServiceHost = STR_ExecutionEngineFacade;
    106           }
     112        //  }
    107113          break;
    108114        case Services.All:
    … …  
    111117          return null;
    112118      }
    113       if ((serviceHost != null) && (!String.IsNullOrEmpty(curServiceHost))) {
     119      if (!String.IsNullOrEmpty(curServiceHost)) {
    114120        AddMexEndpoint(serviceHost);
    115121        //WcfSettings.SetServiceCertificate(serviceHost);

  • trunk/sources/HeuristicLab.Hive.Server/3.2/HiveServerPlugin.cs

    r2591 r2904  
    3030  [PluginFile("HeuristicLab.Hive.Server-3.2.dll", PluginFileType.Assembly)]
    3131  [PluginDependency("HeuristicLab.Core-3.2")]
     32  [PluginDependency("HeuristicLab.Hive.Server.Core-3.2")]
    3233  [PluginDependency("HeuristicLab.Hive.Contracts-3.2")]
     34  //[PluginDependency("HeuristicLab.SpringNET-1.3.0")]
    3335  public class HiveServerPlugin : PluginBase {
    3436  }

  • trunk/sources/HeuristicLab/MergeConfigs.cmd

    r2692 r2904  
    22ConfigMerger "%SolutionDir%\HeuristicLab.Hive.Client.Core\3.2\%Outdir%\HeuristicLab.Hive.Client.Core-3.2.dll.config" "HeuristicLab.exe.config"
    33ConfigMerger "%SolutionDir%\HeuristicLab.Hive.Client.Console\3.2\%Outdir%\HeuristicLab.Hive.Client.Console-3.2.dll.config" "HeuristicLab.exe.config"
     4ConfigMerger "%SolutionDir%\HeuristicLab.Hive.Server\3.2\%Outdir%\HeuristicLab.Hive.Server-3.2.dll.config" "HeuristicLab.exe.config"
    45ConfigMerger "%SolutionDir%\HeuristicLab.Hive.Server.Core\3.2\%Outdir%\HeuristicLab.Hive.Server.Core-3.2.dll.config" "HeuristicLab.exe.config"
    56ConfigMerger "%SolutionDir%\HeuristicLab.Tracing\3.2\%Outdir%\HeuristicLab.Tracing-3.2.dll.config" "HeuristicLab.exe.config"
Note: See TracChangeset for help on using the changeset viewer.