Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
01/15/13 15:50:53 (11 years ago)
Author:
fschoepp
Message:

#1888:

  • Model: OptimizationScenario may be a tree of algorithms (and problems)
  • Model: Renamed InputParameters to ProblemParameters (as they are the parameters of a problem)
  • Model: Added JobExecutionDetails which contain Repetitions + Group (resource to use)
  • ScenarioParser parses the new XML scenario files
  • Website + Model: You are now able to add/remove rows from a table (no JavaScript involved yet)
  • Website + Controller: Added repetitions (enables batch jobs) and group (resource to use) to OaaS which will be used by the controller to schedule the job
  • Website: Updated templates to use new model structure
  • Website + Scenarios: Added the new algorithm Benchmark Algorithm
  • Controller: Added a singleton to make the (Azure/Mockup)-DAL exchangeable
  • Controller: Added mockup classes for DAL + IScenarioManager
  • Website/Result Page: Line Diagrams will be added via JavaScript, crawling their data using AJAX
  • Website: Most configuration parameters can be set in the ServiceDefinition directly
  • Added a mockup for the Membership classes: These can be used if no network connection is available or if other parts of the app shall be tested
  • Scenarios: Updated TSP mappings to new xsd
File:
1 edited

Legend:

Unmodified
Added
Removed

  • branches/OaaS/HeuristicLab.Services.Optimization.Web/Web.config

    r8506 r9166  
    1414    </trace>
    1515    <sources>
    16       <source name="System.ServiceModel"
    17               switchValue="Information, ActivityTracing"
    18               propagateActivity="true" >
     16      <source name="System.ServiceModel" switchValue="Information, ActivityTracing" propagateActivity="true">
    1917        <listeners>
    20           <add name="xml"/>
     18          <add name="xml" />
    2119        </listeners>
    2220      </source>
    2321      <source name="System.ServiceModel.MessageLogging">
    2422        <listeners>
    25           <add name="xml"/>
     23          <add name="xml" />
    2624        </listeners>
    2725      </source>
    28       <source name="myUserTraceSource"
    29               switchValue="Information, ActivityTracing">
     26      <source name="myUserTraceSource" switchValue="Information, ActivityTracing">
    3027        <listeners>
    31           <add name="xml"/>
     28          <add name="xml" />
    3229        </listeners>
    3330      </source>
    3431    </sources>
    3532    <sharedListeners>
    36       <add name="xml"
    37            type="System.Diagnostics.XmlWriterTraceListener"
    38                  initializeData="C:\logs\Traces.svclog" />
     33      <add name="xml" type="System.Diagnostics.XmlWriterTraceListener" initializeData="C:\logs\Traces.svclog" />
    3934    </sharedListeners>
    4035  </system.diagnostics>
    … …  
    4237 
    4338  <connectionStrings>
    44     <add name="ApplicationServices" connectionString="data source=.\SQLEXPRESS;Integrated Security=SSPI;AttachDBFilename=|DataDirectory|aspnetdb.mdf;User Instance=true"
    45       providerName="System.Data.SqlClient" />
    46     <add name="DefaultConnection" connectionString="Data Source=.\SQLEXPRESS;Initial Catalog=aspnet_eb6c1a930dad4e2e9eaf3dcd73e6f924;Integrated Security=True;MultipleActiveResultSets=True"
    47       providerName="System.Data.SqlClient" />
    48     <add name="HeuristicLab.Authentication" connectionString="ADJUST_ME"/>
     39    <add name="HeuristicLab.Authentication" connectionString="ADJUST_ME" />
    4940  </connectionStrings>
    5041  <appSettings>
    … …  
    6657      <forms loginUrl="~/Account/LogOn" timeout="2880" />
    6758    </authentication>
    68     <membership>
    69       <providers>
    70         <clear/>
    71         <add name="AspNetSqlMembershipProvider" type="System.Web.Security.SqlMembershipProvider" connectionStringName="HeuristicLab.Authentication" enablePasswordRetrieval="false" enablePasswordReset="true" requiresQuestionAndAnswer="false" requiresUniqueEmail="false" maxInvalidPasswordAttempts="5" minRequiredPasswordLength="6" minRequiredNonalphanumericCharacters="0" passwordAttemptWindow="10" applicationName="HeuristicLab.Authentication"/>
     59    <membership defaultProvider="AspNetSqlMembershipProvider">
     60      <providers>
     61        <clear />
     62        <add name="AspNetSqlMembershipProvider" type="System.Web.Security.SqlMembershipProvider" connectionStringName="HeuristicLab.Authentication" enablePasswordRetrieval="false" enablePasswordReset="true" requiresQuestionAndAnswer="false" requiresUniqueEmail="false" maxInvalidPasswordAttempts="5" minRequiredPasswordLength="6" minRequiredNonalphanumericCharacters="0" passwordAttemptWindow="10" applicationName="HeuristicLab.Authentication" />
     63        <!-- add applicationName="MockupProvider" name="MockupMembershipProvider" type="HeuristicLab.Services.Optimization.ControllerService.Mockup.MockupMembershipProvider"/ -->
    7264      </providers>
    7365    </membership>
    … …  
    7971      </providers>
    8072    </profile>
    81     <roleManager enabled="true">
     73    <roleManager enabled="true" defaultProvider="AspNetSqlRoleProvider">
    8274      <providers>
    8375        <clear />
    84         <add connectionStringName="HeuristicLab.Authentication" applicationName="HeuristicLab.Authentication"
    85           name="AspNetSqlRoleProvider" type="System.Web.Security.SqlRoleProvider" />
     76        <add connectionStringName="HeuristicLab.Authentication" applicationName="HeuristicLab.Authentication" name="AspNetSqlRoleProvider" type="System.Web.Security.SqlRoleProvider" />
     77        <!-- add applicationName="MockupProvider" name="MockupRoleProvider" type="HeuristicLab.Services.Optimization.ControllerService.Mockup.MockupRoleProvider" /-->
    8678      </providers>
    8779    </roleManager>
    … …  
    10193      </providers>
    10294    </sessionState>
     95
    10396  </system.web>
    10497  <system.webServer>
    … …  
    128121  <system.serviceModel>
    129122    <diagnostics>
    130       <messageLogging logEntireMessage="true" logMalformedMessages="true" logMessagesAtServiceLevel="true" logMessagesAtTransportLevel="true" maxMessagesToLog="3000"/>
     123      <messageLogging logEntireMessage="true" logMalformedMessages="true" logMessagesAtServiceLevel="true" logMessagesAtTransportLevel="true" maxMessagesToLog="3000" />
    131124    </diagnostics>
    132125    <bindings>
    133126      <wsHttpBinding>
    134127        <binding name="WSHttpBinding_IControllerService" receiveTimeout="00:10:00" sendTimeout="00:10:00" maxBufferPoolSize="2147483647" maxReceivedMessageSize="2147483647">
    135           <readerQuotas maxDepth="2147483647" maxStringContentLength="2147483647" maxArrayLength="2147483647" maxBytesPerRead="2147483647" maxNameTableCharCount="2147483647"/>
     128          <readerQuotas maxDepth="2147483647" maxStringContentLength="2147483647" maxArrayLength="2147483647" maxBytesPerRead="2147483647" maxNameTableCharCount="2147483647" />
    136129          <security mode="Message">
    137             <transport clientCredentialType="Certificate"/>
    138             <message clientCredentialType="UserName"/>
     130            <transport clientCredentialType="Certificate" />
     131            <message clientCredentialType="UserName" />
    139132          </security>
    140133        </binding>
    … …  
    142135          <readerQuotas maxDepth="2147483647" maxStringContentLength="2147483647" maxArrayLength="2147483647" maxBytesPerRead="2147483647" maxNameTableCharCount="2147483647" />
    143136          <security mode="Message">
    144             <transport clientCredentialType="Certificate"/>
    145             <message clientCredentialType="UserName"/>
     137            <transport clientCredentialType="Certificate" />
     138            <message clientCredentialType="UserName" />
    146139          </security>
    147140        </binding>
    … …  
    152145        <behavior name="ServiceBehaviour_IControllerService">
    153146          <!-- To avoid disclosing metadata information, set the value below to false and remove the metadata endpoint above before deployment -->
    154           <serviceMetadata httpGetEnabled="true" httpsGetEnabled="false"/>
     147          <serviceMetadata httpGetEnabled="true" httpsGetEnabled="false" />
    155148          <!-- To receive exception details in faults for debugging purposes, set the value below to true.  Set to false before deployment to avoid disclosing exception information -->
    156           <serviceDebug httpHelpPageEnabled="true" includeExceptionDetailInFaults="true"/>
    157           <serviceAuthorization principalPermissionMode="UseAspNetRoles" roleProviderName="AspNetSqlRoleProvider"/>
     149          <serviceDebug httpHelpPageEnabled="true" includeExceptionDetailInFaults="true" />
     150          <serviceAuthorization principalPermissionMode="UseAspNetRoles" roleProviderName="AspNetSqlRoleProvider" />
     151          <!--serviceAuthorization principalPermissionMode="UseAspNetRoles" roleProviderName="MockupRoleProvider" /-->
    158152          <serviceCredentials>
    159             <serviceCertificate findValue="localhost" x509FindType="FindBySubjectName"/>
    160             <userNameAuthentication userNamePasswordValidationMode="MembershipProvider" membershipProviderName="AspNetSqlMembershipProvider"/>
     153            <serviceCertificate findValue="localhost" x509FindType="FindBySubjectName" />
     154            <userNameAuthentication userNamePasswordValidationMode="MembershipProvider" membershipProviderName="AspNetSqlMembershipProvider" />
     155            <!--userNameAuthentication userNamePasswordValidationMode="MembershipProvider" membershipProviderName="MockupMembershipProvider" /-->
    161156          </serviceCredentials>
    162           <serviceSecurityAudit auditLogLocation="Application" suppressAuditFailure="false" messageAuthenticationAuditLevel="SuccessOrFailure"/>
    163           <serviceThrottling maxConcurrentCalls="100"/>
    164           <dataContractSerializer maxItemsInObjectGraph="2147483647"/>
     157          <serviceSecurityAudit auditLogLocation="Application" suppressAuditFailure="false" messageAuthenticationAuditLevel="SuccessOrFailure" />
     158          <serviceThrottling maxConcurrentCalls="100" />
     159          <dataContractSerializer maxItemsInObjectGraph="2147483647" />
    165160        </behavior>
    166161      </serviceBehaviors>
    … …  
    172167            </serviceCertificate>
    173168          </clientCredentials>
    174           <dataContractSerializer maxItemsInObjectGraph="2147483647"/>
     169          <dataContractSerializer maxItemsInObjectGraph="2147483647" />
    175170        </behavior>
    176171      </endpointBehaviors>
    … …  
    178173    <services>
    179174      <service behaviorConfiguration="ServiceBehaviour_IControllerService" name="HeuristicLab.Services.Optimization.ControllerService.PlaceholderControllerService">
    180         <endpoint address="mex" binding="mexHttpBinding" bindingConfiguration="" name="MexEndpoint" contract="IMetadataExchange"/>
    181         <endpoint binding="wsHttpBinding" bindingConfiguration="WSHttpBinding_IControllerService" name="WSHttpBinding_IControllerService" contract="HeuristicLab.Services.Optimization.ControllerService.IControllerService"/>
     175        <endpoint address="mex" binding="mexHttpBinding" bindingConfiguration="" name="MexEndpoint" contract="IMetadataExchange" />
     176        <endpoint binding="wsHttpBinding" bindingConfiguration="WSHttpBinding_IControllerService" name="WSHttpBinding_IControllerService" contract="HeuristicLab.Services.Optimization.ControllerService.IControllerService" />
    182177      </service>
    183178    </services>
    184179    <serviceHostingEnvironment multipleSiteBindingsEnabled="true" />
    185180    <client>
    186       <endpoint address="http://localhost:8080/ControllerService.svc" behaviorConfiguration="LocalCertValidation"
    187           binding="wsHttpBinding" bindingConfiguration="WSHttpBinding_IControllerService"
    188           contract="HeuristicLab.Services.Optimization.ControllerService.IControllerService" name="WSHttpBinding_IControllerService">
    189         <identity>
    190           <certificate encodedValue="ADJUST_ME" />
    191         </identity>
    192       </endpoint>
    193       <endpoint address="http://127.0.0.1:81/HiveService.svc" behaviorConfiguration="LocalCertValidation"
    194          binding="wsHttpBinding" bindingConfiguration="WSHttpBinding_IHiveService" contract="HeuristicLab.Clients.Hive.IHiveService" name="WSHttpBinding_IHiveService">
    195         <identity>
    196           <certificate encodedValue="ADJUST_ME" />
    197         </identity>
    198       </endpoint>
    199       <!--
    200       <endpoint address="http://optimization.cloudapp.net/HiveService.svc" behaviorConfiguration="LocalCertValidation"
    201          binding="wsHttpBinding" bindingConfiguration="WSHttpBinding_IHiveService" contract="HeuristicLab.Clients.Hive.IHiveService" name="WSHttpBinding_IHiveService">
    202         <identity>
    203           <certificate encodedValue="ADJUST_ME" />
    204         </identity>
    205       </endpoint>
    206       -->
     181
     182     
     183      <endpoint address="http://127.0.0.1:8080/ControllerService.svc" behaviorConfiguration="LocalCertValidation" binding="wsHttpBinding" bindingConfiguration="WSHttpBinding_IControllerService" contract="HeuristicLab.Services.Optimization.ControllerService.IControllerService" name="WSHttpBinding_Local_IControllerService">
     184        <identity>
     185          <certificate encodedValue="ADJUST_ME" />
     186        </identity>
     187      </endpoint>
     188     
     189      <endpoint address="http://127.0.0.1:81/HiveService.svc" behaviorConfiguration="LocalCertValidation" binding="wsHttpBinding" bindingConfiguration="WSHttpBinding_IHiveService" contract="HeuristicLab.Clients.Hive.IHiveService" name="WSHttpBinding_Local_IHiveService">
     190        <identity>
     191          <certificate encodedValue="ADJUST_ME" />
     192        </identity>
     193      </endpoint>
     194     
     195     
     196      <endpoint address="http://optimization1.cloudapp.net:8080/ControllerService.svc" behaviorConfiguration="LocalCertValidation" binding="wsHttpBinding" bindingConfiguration="WSHttpBinding_IControllerService" contract="HeuristicLab.Services.Optimization.ControllerService.IControllerService" name="WSHttpBinding_Remote_IControllerService">
     197        <identity>
     198          <certificate encodedValue="ADJUST_ME" />
     199        </identity>
     200      </endpoint>
     201     
     202      <endpoint address="http://optimization1.cloudapp.net/HiveService.svc" behaviorConfiguration="LocalCertValidation" binding="wsHttpBinding" bindingConfiguration="WSHttpBinding_IHiveService" contract="HeuristicLab.Clients.Hive.IHiveService" name="WSHttpBinding_Remote_IHiveService">
     203        <identity>
     204          <certificate encodedValue="ADJUST_ME" />
     205        </identity>
     206      </endpoint>
     207     
    207208    </client>
    208209  </system.serviceModel>
Note: See TracChangeset for help on using the changeset viewer.