Compare commits

..

No commits in common. "f020c37db9ad9a4123d6e5a4e612484153469871" and "5a4ec3b6b1d0c70bd5eeda84b49bb94ebeb70ddc" have entirely different histories.

View File

@ -1,73 +1,73 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<configuration> <configuration>
<configSections> <configSections>
<section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net" /> <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net"/>
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<section name="VEPROMS.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" /> <section name="VEPROMS.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
<section name="UISampleNetBar1.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" /> <section name="UISampleNetBar1.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
</sectionGroup> </sectionGroup>
</configSections> </configSections>
<log4net> <log4net>
<appender name="LogFileAppender" type="log4net.Appender.FileAppender"> <appender name="LogFileAppender" type="log4net.Appender.FileAppender">
<param name="File" value="${USERPROFILE}/My Documents/VEPROMS/ErrorLog.txt" /> <param name="File" value="${USERPROFILE}/My Documents/VEPROMS/ErrorLog.txt"/>
<!--<param name="File" value="${APPDATA}/Volian/Proms2010/ErrorLog.txt" />--> <!--<param name="File" value="${APPDATA}/Volian/Proms2010/ErrorLog.txt" />-->
<!--<param name="File" value="${LOCALAPPDATA}/Temp/VEPROMS/ErrorLog.txt" />--> <!--<param name="File" value="${LOCALAPPDATA}/Temp/VEPROMS/ErrorLog.txt" />-->
<param name="AppendToFile" value="true" /> <param name="AppendToFile" value="true"/>
<layout type="log4net.Layout.PatternLayout"> <layout type="log4net.Layout.PatternLayout">
<!--<param name="Header" value="[Header]\r\n" />--> <!--<param name="Header" value="[Header]\r\n" />-->
<!--<param name="Footer" value="[Footer]\r\n" />--> <!--<param name="Footer" value="[Footer]\r\n" />-->
<param name="ConversionPattern" value="%d [%t] %-5p %c - %m%n" /> <param name="ConversionPattern" value="%d [%t] %-5p %c - %m%n"/>
</layout> </layout>
</appender> </appender>
<appender name="ConsoleAppender" type="log4net.Appender.ConsoleAppender"> <appender name="ConsoleAppender" type="log4net.Appender.ConsoleAppender">
<layout type="log4net.Layout.PatternLayout"> <layout type="log4net.Layout.PatternLayout">
<conversionPattern value="--&gt; %date [%thread] %-5level %logger (%property{log4net:HostName}) [%ndc] - %message%newline" /> <conversionPattern value="--&gt; %date [%thread] %-5level %logger (%property{log4net:HostName}) [%ndc] - %message%newline"/>
</layout> </layout>
</appender> </appender>
<appender name="EventLogAppender" type="log4net.Appender.EventLogAppender"> <appender name="EventLogAppender" type="log4net.Appender.EventLogAppender">
<threshold value="WARN" /> <threshold value="WARN"/>
<mapping> <mapping>
<level value="DEBUG" /> <level value="DEBUG"/>
<eventLogEntryType value="Information" /> <eventLogEntryType value="Information"/>
</mapping> </mapping>
<mapping> <mapping>
<level value="INFO" /> <level value="INFO"/>
<eventLogEntryType value="Information" /> <eventLogEntryType value="Information"/>
</mapping> </mapping>
<mapping> <mapping>
<level value="WARN" /> <level value="WARN"/>
<eventLogEntryType value="Warning" /> <eventLogEntryType value="Warning"/>
</mapping> </mapping>
<mapping> <mapping>
<level value="ERROR" /> <level value="ERROR"/>
<eventLogEntryType value="Error" /> <eventLogEntryType value="Error"/>
</mapping> </mapping>
<mapping> <mapping>
<level value="FATAL" /> <level value="FATAL"/>
<eventLogEntryType value="Error" /> <eventLogEntryType value="Error"/>
</mapping> </mapping>
<layout type="log4net.Layout.PatternLayout"> <layout type="log4net.Layout.PatternLayout">
<param name="ConversionPattern" value="---&gt; %d [%t] %-5p %c - %m%n" /> <param name="ConversionPattern" value="---&gt; %d [%t] %-5p %c - %m%n"/>
</layout> </layout>
</appender> </appender>
<root> <root>
<level value="ALL" /> <level value="ALL"/>
<appender-ref ref="ConsoleAppender" /> <appender-ref ref="ConsoleAppender"/>
<appender-ref ref="LogFileAppender" /> <appender-ref ref="LogFileAppender"/>
<appender-ref ref="EventLogAppender" /> <appender-ref ref="EventLogAppender"/>
</root> </root>
<logger name="VEPROMS.CSLA.Library"> <logger name="VEPROMS.CSLA.Library">
<level value="INFO" /> <level value="INFO"/>
</logger> </logger>
<logger name="Volian.Controls.Library"> <logger name="Volian.Controls.Library">
<level value="INFO" /> <level value="INFO"/>
</logger> </logger>
</log4net> </log4net>
<appSettings> <appSettings>
<add key="OperatingMode" value="Production" /> <add key="OperatingMode" value="Debug"/>
<!--"Debug" "Production" "Demo"/--> <!--"Debug" "Production" "Demo"/-->
<add key="OriginalPageBreak" value="False" /> <add key="OriginalPageBreak" value="False"/>
<add key="CslaAuthentication" value="Windows" /> <add key="CslaAuthentication" value="Windows"/>
<!-- <!--
<add key="CslaDataPortalProxy" <add key="CslaDataPortalProxy"
value="Csla.DataPortalClient.RemotingProxy, Csla"/> value="Csla.DataPortalClient.RemotingProxy, Csla"/>
@ -85,17 +85,16 @@
value="EnterpriseServicesHost.EnterpriseServicesProxy, value="EnterpriseServicesHost.EnterpriseServicesProxy,
EnterpriseServicesHost"/> EnterpriseServicesHost"/>
--> -->
<add key="ClientSettingsProvider.ServiceUri" value="" />
</appSettings> </appSettings>
<connectionStrings> <connectionStrings>
<add name="VEPROMS" connectionString="Data Source=VOLIAN-SERVER;User Id=proms2010;password=proms2010;Initial Catalog=VEPROMS" providerName="System.Data.SqlClient" /> <add name="VEPROMS" connectionString="Data Source=VOLIAN-SERVER;User Id=proms2010;password=proms2010;Initial Catalog=VEPROMS" providerName="System.Data.SqlClient"/>
<add name="VEPROMS_LOCAL" connectionString="Data Source=.\SQLEXPRESS;Initial Catalog={MENU};Integrated Security=True" providerName="System.Data.SqlClient" /> <add name="VEPROMS_LOCAL" connectionString="Data Source=.\SQLEXPRESS;Initial Catalog={MENU};Integrated Security=True" providerName="System.Data.SqlClient"/>
<add name="VEPROMS_RMARK_DEBUG" connectionString="Data Source=.\SQLEXPRESS;Initial Catalog={MENU};Integrated Security=True" providerName="System.Data.SqlClient" /> <add name="VEPROMS_RMARK_DEBUG" connectionString="Data Source=.\SQLEXPRESS;Initial Catalog={MENU};Integrated Security=True" providerName="System.Data.SqlClient"/>
<add name="VEPROMS_RMARK_DEMO" connectionString="Data Source=.\SQLEXPRESS;Initial Catalog={MENU};Integrated Security=True" providerName="System.Data.SqlClient" /> <add name="VEPROMS_RMARK_DEMO" connectionString="Data Source=.\SQLEXPRESS;Initial Catalog={MENU};Integrated Security=True" providerName="System.Data.SqlClient"/>
<!--<add name="VEPROMS_BODINE_DEBUG" connectionString="Data Source=.\SQLEXPRESS;Initial Catalog={MENU};Integrated Security=True" providerName="System.Data.SqlClient" /> <!--<add name="VEPROMS_BODINE_DEBUG" connectionString="Data Source=.\SQLEXPRESS;Initial Catalog={MENU};Integrated Security=True" providerName="System.Data.SqlClient" />
<add name="VEPROMS_BODINE_DEMO" connectionString="Data Source=.\SQLEXPRESS;Initial Catalog={MENU};Integrated Security=True" providerName="System.Data.SqlClient" />--> <add name="VEPROMS_BODINE_DEMO" connectionString="Data Source=.\SQLEXPRESS;Initial Catalog={MENU};Integrated Security=True" providerName="System.Data.SqlClient" />-->
<add name="VEPROMS_BODINE_DEBUG" connectionString="Data Source=JCB2-HP\VOLIAN08;Initial Catalog={MENU};Integrated Security=True" providerName="System.Data.SqlClient" /> <add name="VEPROMS_BODINE_DEBUG" connectionString="Data Source=JCB2-HP\VOLIAN08;Initial Catalog={MENU};Integrated Security=True" providerName="System.Data.SqlClient"/>
<add name="VEPROMS_BODINE_DEMO" connectionString="Data Source=JCB2-HP\VOLIAN08;Initial Catalog={MENU};Integrated Security=True" providerName="System.Data.SqlClient" /> <add name="VEPROMS_BODINE_DEMO" connectionString="Data Source=JCB2-HP\VOLIAN08;Initial Catalog={MENU};Integrated Security=True" providerName="System.Data.SqlClient"/>
<!--<add name="VEPROMS_BODINE_DEBUG" connectionString="Data Source=JCB2-HP\VOLIAN12;Initial Catalog={MENU};Integrated Security=True" providerName="System.Data.SqlClient" /> <!--<add name="VEPROMS_BODINE_DEBUG" connectionString="Data Source=JCB2-HP\VOLIAN12;Initial Catalog={MENU};Integrated Security=True" providerName="System.Data.SqlClient" />
<add name="VEPROMS_BODINE_DEMO" connectionString="Data Source=JCB2-HP\VOLIAN12;Initial Catalog={MENU};Integrated Security=True" providerName="System.Data.SqlClient" />--> <add name="VEPROMS_BODINE_DEMO" connectionString="Data Source=JCB2-HP\VOLIAN12;Initial Catalog={MENU};Integrated Security=True" providerName="System.Data.SqlClient" />-->
</connectionStrings> </connectionStrings>
@ -135,10 +134,10 @@
<value>True</value> <value>True</value>
</setting> </setting>
<setting name="QATItems" serializeAs="String"> <setting name="QATItems" serializeAs="String">
<value /> <value/>
</setting> </setting>
<setting name="DefaultDB" serializeAs="String"> <setting name="DefaultDB" serializeAs="String">
<value /> <value/>
</setting> </setting>
<setting name="LastVersion" serializeAs="String"> <setting name="LastVersion" serializeAs="String">
<value>0.0</value> <value>0.0</value>
@ -150,10 +149,10 @@
<value>True</value> <value>True</value>
</setting> </setting>
<setting name="SMTPServer" serializeAs="String"> <setting name="SMTPServer" serializeAs="String">
<value /> <value/>
</setting> </setting>
<setting name="SMTPUser" serializeAs="String"> <setting name="SMTPUser" serializeAs="String">
<value /> <value/>
</setting> </setting>
<setting name="UpdateSettings" serializeAs="String"> <setting name="UpdateSettings" serializeAs="String">
<value>True</value> <value>True</value>
@ -180,19 +179,4 @@
</setting> </setting>
</UISampleNetBar1.Properties.Settings> </UISampleNetBar1.Properties.Settings>
</userSettings> </userSettings>
<startup> <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup></configuration>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" />
</startup>
<system.web>
<membership defaultProvider="ClientAuthenticationMembershipProvider">
<providers>
<add name="ClientAuthenticationMembershipProvider" type="System.Web.ClientServices.Providers.ClientFormsAuthenticationMembershipProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" />
</providers>
</membership>
<roleManager defaultProvider="ClientRoleProvider" enabled="true">
<providers>
<add name="ClientRoleProvider" type="System.Web.ClientServices.Providers.ClientRoleProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" cacheTimeout="86400" />
</providers>
</roleManager>
</system.web>
</configuration>