michal/tbf
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

TBFSetup configuration changed, version 1.5.142.

Browse Source
This commit is contained in:
Milan Hanajik 2015-11-17 23:07:22 +01:00
parent a01f99fa7e
commit 39d0a73e39
5 changed files with 1467 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -2,6 +2,7 @@ TestBenchFramework/bin/
TestBenchFramework/obj/
ResultsBrowser/bin/
ResultsBrowser/obj/
TBFSetup/
TBFSetup/Debug/
TBFSetup/Release/
Doc/
*.suo

1444
TBFSetup/TBFSetup.vdproj Normal file
View File

File diff suppressed because it is too large Load Diff

4
TestBenchFramework/Properties/AssemblyInfo.cs
View File

@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
// Build Number
// Revision
//
[assembly: AssemblyVersion("1.5.141.1")]
[assembly: AssemblyFileVersion("1.5.141.1")]
[assembly: AssemblyVersion("1.5.142.1")]
[assembly: AssemblyFileVersion("1.5.142.1")]

28
TestBenchFramework/SampleConfig/config.xml
View File

@ -2,32 +2,8 @@
<TestBenchFramework xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<Language>en</Language>
<TestBenches>
<DatabaseSettings>
<BenchName>TestBench-SQLite</BenchName>
<IsRealBench>true</IsRealBench>
<UsersDBSettings>
<DbType>SQLite</DbType>
<ConnectionString>SQLite.db</ConnectionString>
</UsersDBSettings>
<BenchDBSettings>
<DbType>SQLite</DbType>
<ConnectionString>SQLite.db</ConnectionString>
</BenchDBSettings>
<ProceduresDBSettings>
<DbType>SQLite</DbType>
<ConnectionString>SQLite.db</ConnectionString>
</ProceduresDBSettings>
<WMTypesDBSettings>
<DbType>SQLite</DbType>
<ConnectionString>SQLite.db</ConnectionString>
</WMTypesDBSettings>
<WaterMetersDBSettings>
<DbType>SQLite</DbType>
<ConnectionString>SQLite.db</ConnectionString>
</WaterMetersDBSettings>
</DatabaseSettings>
<DatabaseSettings>
<BenchName>TestBench-MySQL</BenchName>
<BenchName>TestBench</BenchName>
<IsRealBench>true</IsRealBench>
<UsersDBSettings>
<DbType>MySql</DbType>
@ -51,5 +27,5 @@
</WaterMetersDBSettings>
</DatabaseSettings>
</TestBenches>
<LastBench>TestBench-SQLite</LastBench>
<LastBench>TestBench</LastBench>
</TestBenchFramework>

41
TestBenchFramework/SampleConfig/log4netConfig.xml
View File

@ -8,41 +8,37 @@
</appender>
<!-- Process data appenders -->
<appender name="OptoData" type="log4net.Appender.FileAppender">
<file value="C:\TBF\ProcessData\OptoData.log" />
<appendToFile value="true" />
<lockingModel type="log4net.Appender.FileAppender+MinimalLock" />
<layout type="log4net.Layout.PatternLayout">
<conversionPattern value="%date %message%newline" />
</layout>
</appender>
<appender name="RfidData" type="log4net.Appender.FileAppender">
<appender name="RfidData" type="log4net.Appender.RollingFileAppender">
<file value="C:\TBF\ProcessData\RfidData.log" />
<appendToFile value="true" />
<rollingMode value="Date" />
<lockingModel type="log4net.Appender.FileAppender+MinimalLock" />
<layout type="log4net.Layout.PatternLayout">
<conversionPattern value="%date %message%newline" />
</layout>
</appender>
<appender name="ProcessData" type="log4net.Appender.FileAppender">
<appender name="ProcessData" type="log4net.Appender.RollingFileAppender">
<file value="C:\TBF\ProcessData\process-data.txt" />
<appendToFile value="true" />
<rollingMode value="Date" />
<lockingModel type="log4net.Appender.FileAppender+MinimalLock" />
<layout type="log4net.Layout.PatternLayout">
<conversionPattern value="%message%newline" />
</layout>
</appender>
<appender name="AllResults" type="log4net.Appender.FileAppender">
<appender name="AllResults" type="log4net.Appender.RollingFileAppender">
<file value="C:\TBF\ProcessData\AllResults.txt" />
<appendToFile value="true" />
<rollingMode value="Date" />
<lockingModel type="log4net.Appender.FileAppender+MinimalLock" />
<layout type="log4net.Layout.PatternLayout">
<conversionPattern value="%message%newline" />
</layout>
</appender>
<appender name="SummaryResults" type="log4net.Appender.FileAppender">
<appender name="SummaryResults" type="log4net.Appender.RollingFileAppender">
<file value="C:\TBF\Results\SummaryResults.txt" />
<appendToFile value="true" />
<rollingMode value="Date" />
<lockingModel type="log4net.Appender.FileAppender+MinimalLock" />
<layout type="log4net.Layout.PatternLayout">
<conversionPattern value="%message%newline" />
@ -50,17 +46,19 @@
</appender>
<!-- Program log appenders -->
<appender name="LogFile-UI" type="log4net.Appender.FileAppender">
<appender name="LogFile-UI" type="log4net.Appender.RollingFileAppender">
<file value="C:\TBF\Logs\Log-UI.txt" />
<appendToFile value="true" />
<rollingMode value="Date" />
<lockingModel type="log4net.Appender.FileAppender+MinimalLock" />
<layout type="log4net.Layout.PatternLayout">
<conversionPattern value="%date %-5level %logger - %message%newline" />
</layout>
</appender>
<appender name="LogFile-WT" type="log4net.Appender.FileAppender">
<appender name="LogFile-WT" type="log4net.Appender.RollingFileAppender">
<file value="C:\TBF\Logs\Log-WT.txt" />
<appendToFile value="true" />
<rollingMode value="Date" />
<lockingModel type="log4net.Appender.FileAppender+MinimalLock" />
<layout type="log4net.Layout.PatternLayout">
<conversionPattern value="%date %-5level %logger - %message%newline" />
@ -69,8 +67,7 @@
<!-- Set root logger -->
<root>
<level value="INFO" />
<appender-ref ref="LogFile-UI" />
<level value="WARN" />
</root>
@ -78,27 +75,23 @@
<logger name="AllResults"><level value="INFO" /><appender-ref ref="AllResults" /></logger>
<logger name="SummaryResults"> <level value="INFO" /><appender-ref ref="SummaryResults" /></logger>
<logger name="ProcessData"><level value="INFO" /><appender-ref ref="ProcessData" /></logger>
<logger name="OptoData"><level value="INFO" /><appender-ref ref="OptoData" /></logger>
<logger name="RfidData"><level value="INFO" /><appender-ref ref="RfidData" /></logger>
<!-- Set program loggers -->
<logger name="NHibernate"> <level value="ERROR" /> </logger>
<logger name="TBF.BenchControl">
<appender-ref ref="A1" />
<appender-ref ref="LogFile-WT" /> <level value="INFO" />
<appender-ref ref="LogFile-WT" /> <level value="WARN" />
</logger>
<logger name="TBF.BenchControl.StateMachine"> <level value="INFO" /> </logger>
<logger name="TBF.BenchControl.State"> <level value="WARN" /> </logger>
<logger name="TBF.BenchControl.State"> <level value="INFO" /> </logger>
<logger name="TBF.BenchControl.Elde.ControlBoardWrap"> <level value="DEBUG" /> </logger>
<logger name="TBF.BenchControl.Elde.Pump"> <level value="DEBUG" /> </logger>
<logger name="TBF.BenchControl.Elde.PumpWithFM"> <level value="DEBUG" /> </logger>
<logger name="TBF.BenchControl.MettlerToledo"> <level value="INFO" /> </logger>
<logger name="TBF.BenchControl.MettlerToledo.BalanceDev"> <level value="WARN" /> </logger>
<logger name="TBF.BenchControl.MettlerToledo.BalanceNewDev"> <level value="WARN" /> </logger>
<logger name="TBF.BenchControl.MettlerToledo.ReadMassOp"> <level value="INFO" /> </logger>
<logger name="TBF.BenchControl.MettlerToledo.ReadStableMassOp"> <level value="INFO" /> </logger>
<logger name="TBF.BenchControl.MettlerToledo.ReadMassOp"> <level value="WARN" /> </logger>
<logger name="TBF.BenchControl.MettlerToledo.ReadStableMassOp"> <level value="WARN" /> </logger>
<logger name="TBF.BenchControl.IdcCamera"> <level value="INFO" /> </logger>
<logger name="TBF.BenchControl.Elde.StartMeasurementOp"> <level value="DEBUG" /> </logger>