Free cookie consent management tool by TermsFeed Policy Generator

Changeset 4050


Ignore:
Timestamp:
07/20/10 08:50:21 (14 years ago)
Author:
kgrading
Message:

#828 checked in everything to restore build ability

Location:
branches/3.2/sources
Files:
2 added
8 edited

Legend:

Unmodified
Added
Removed

  • branches/3.2/sources/HeuristicLab.Hive.Server.LINQDataAccess/3.2/BaseDao.cs

    r4042 r4050  
    1414    }
    1515
    16     protected void CommitChanges() {
    17       //TODO: DoWhile
     16    protected void CommitChanges() {     
    1817      try {
    1918        Context.SubmitChanges(ConflictMode.ContinueOnConflict);

  • branches/3.2/sources/HeuristicLab.PluginInfrastructure/Sandboxing/SandboxManager.cs

    r4042 r4050  
    6666      #region permission set for sandbox
    6767      //Uncomment code for sandboxed appdomain
    68       pset = new PermissionSet(PermissionState.None);
     68     /* pset = new PermissionSet(PermissionState.None);
    6969      pset.AddPermission(new SecurityPermission(SecurityPermissionFlag.Execution));
    7070      pset.AddPermission(new ReflectionPermission(ReflectionPermissionFlag.AllFlags));
    … …  
    7878      }
    7979
    80       pset.AddPermission(fPerm);
     80      pset.AddPermission(fPerm);*/
    8181      #endregion
    8282
    8383      #region permission set of unrestricted appdomain
    8484      // unrestricted appdomain
    85       //pset = new PermissionSet(PermissionState.Unrestricted);
     85      pset = new PermissionSet(PermissionState.Unrestricted);
    8686      #endregion
    8787

  • branches/3.2/sources/HeuristicLab.Tracing/3.2/HeuristicLab.Hive.log4net.xml

    r3931 r4050  
    6464      <threshold value="DEBUG"/>
    6565    </evaluator>
    66     <appender-ref ref="ServertRollingFileAppender" />
     66    <appender-ref ref="ServerRollingFileAppender" />
    6767  </appender>
    6868 

  • branches/3.2/sources/HeuristicLab.Tracing/3.2/HeuristicLab.Tracing-3.2.csproj

    r2900 r4050  
    8888  <ItemGroup>
    8989    <None Include="HeuristicLabTracingPlugin.cs.frame" />
    90     <Compile Include="HiveLogger.cs" />
    9190    <Compile Include="Logger.cs" />
    9291    <Compile Include="HeuristicLabTracingPlugin.cs" />
     92    <Compile Include="MethodCallPatternConverter.cs" />
     93    <Compile Include="MethodCallPatternLayout.cs" />
    9394    <Compile Include="Properties\AssemblyInfo.cs" />
    9495    <Compile Include="Properties\Settings.Designer.cs">

  • branches/3.2/sources/HeuristicLab.Tracing/3.2/Properties/Settings.Designer.cs

    r1622 r4050  
    22// <auto-generated>
    33//     This code was generated by a tool.
    4 //     Runtime Version:2.0.50727.3074
     4//     Runtime Version:2.0.50727.4927
    55//
    66//     Changes to this file may cause incorrect behavior and will be lost if
    … …  
    2626        [global::System.Configuration.UserScopedSettingAttribute()]
    2727        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
    28         [global::System.Configuration.DefaultSettingValueAttribute("")]
     28        [global::System.Configuration.DefaultSettingValueAttribute("HeuristicLab.Hive.log4net.xml")]
    2929        public string TracingLog4netConfigFile {
    3030            get {

  • branches/3.2/sources/HeuristicLab.Tracing/3.2/Properties/Settings.settings

    r1622 r4050  
    44  <Settings>
    55    <Setting Name="TracingLog4netConfigFile" Type="System.String" Scope="User">
    6       <Value Profile="(Default)" />
     6      <Value Profile="(Default)">HeuristicLab.Hive.log4net.xml</Value>
    77    </Setting>
    88  </Settings>

  • branches/3.2/sources/HeuristicLab/HeuristicLab.csproj

    r2601 r4050  
    124124    <None Include="CreateConsoleApplication.cmd" />
    125125    <None Include="CustomPostBuild.cmd" />
    126     <None Include="CopyAssemblies.cmd" />
     126    <None Include="Resources\CopyAssemblies.cmd" />
    127127    <None Include="CustomPostBuildTemplate_UpdateLocalInstallation.cmd" />
    128128    <None Include="MergeConfigs.cmd" />

  • branches/3.2/sources/HeuristicLab/app.config

    r3473 r4050  
    11<?xml version="1.0" encoding="utf-8" ?>
    22<configuration>
    3     <configSections>     
    4       <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
     3
     4
     5  <configSections>
     6    <sectionGroup name="spring">
     7      <section name="context" type="Spring.Context.Support.ContextHandler, Spring.Core"/>
     8      <section name="objects" type="Spring.Context.Support.DefaultSectionHandler, Spring.Core"/>
     9    </sectionGroup>
     10        <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
    511            <section name="HeuristicLab.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />         
    612        </sectionGroup>
    … …  
    814  <connectionStrings>
    915  </connectionStrings>
     16  <!--<system.diagnostics>
     17    <sources>
     18      <source name="System.ServiceModel.MessageLogging">
     19        <listeners>
     20          <add name="messages"
     21          type="System.Diagnostics.XmlWriterTraceListener"
     22          initializeData="c:\logs\messages.svclog" />
     23        </listeners>
     24      </source>
     25    </sources>
     26  </system.diagnostics>-->
     27
     28
    1029  <system.serviceModel>
     30    <!--<diagnostics>
     31      <messageLogging
     32           logEntireMessage="true"
     33           logMalformedMessages="false"
     34           logMessagesAtServiceLevel="true"
     35           logMessagesAtTransportLevel="false"
     36           maxMessagesToLog="30000"
     37           maxSizeOfMessageToLog="2000"/>
     38    </diagnostics> -->
     39
    1140  </system.serviceModel>
    1241  <runtime>
    13     <gcServer enabled="true"/>
     42    <gcServer enabled="false"/>
    1443  </runtime>
    1544 
    … …  
    3261    </HeuristicLab.Properties.Settings>
    3362  </applicationSettings>
    34  
     63  <spring>
     64
     65    <context>
     66      <resource uri="config://spring/objects"/>
     67    </context>
     68
     69    <objects xmlns="http://www.springframework.net"
     70         xmlns:aop="http://www.springframework.net/aop">
     71      <object id="clientFacade" singleton="false"
     72              type="HeuristicLab.Hive.Server.Core.ClientFacade, HeuristicLab.Hive.Server.Core-3.2" />
     73
     74      <object id="executionEngineFacade" singleton="false"
     75              type="HeuristicLab.Hive.Server.Core.ExecutionEngineFacade, HeuristicLab.Hive.Server.Core-3.2" />
     76
     77      <object id="serverConsoleFacade" singleton="false"
     78              type="HeuristicLab.Hive.Server.Core.ServerConsoleFacade, HeuristicLab.Hive.Server.Core-3.2" />
     79
     80      <object id="serviceOperation" type="Spring.Aop.Support.SdkRegularExpressionMethodPointcut, Spring.Aop">
     81        <property name="patterns">
     82          <list>
     83            <value>HeuristicLab.Hive.Server.Core.ClientFacade.*</value>
     84            <value>HeuristicLab.Hive.Server.Core.ExecutionEngineFacade.*</value>
     85            <value>HeuristicLab.Hive.Server.Core.ServerConsoleFacade.*</value>
     86          </list>
     87        </property>
     88      </object>
     89
     90      <object id="sci" type="HeuristicLab.Hive.Server.ServiceCallInterception, HeuristicLab.Hive.Server-3.2" />
     91
     92      <aop:config>
     93        <aop:advisor pointcut-ref="serviceOperation" advice-ref="sci"/>
     94      </aop:config>
     95    </objects>
     96  </spring>
    3597</configuration>
Note: See TracChangeset for help on using the changeset viewer.