From 81c46add6b31e0f347da357feaff7ebbdb6a2c36 Mon Sep 17 00:00:00 2001
From: dogchang70 <dogchang70@7fafa455-2d8e-8247-9248-17d0fe17a33f>
Date: Fri, 15 Jan 2016 09:52:09 +0800
Subject: [PATCH] CT-4 網站須可於Windows Server 2012 64位元版本平台使用。
---
CCSTrace/CCS/Function/MailService.cs | 2
CCSTrace/CCS/ProcessEvent.cs | 6
CCSTrace/Web.config | 103 ++++++++++--
CCSTracex64/CCSTracex64.vdproj | 134 +++++++++------
CCSTracex86/CCSTracex86.vdproj | 134 +++++++++------
CCSTrace/CCS/CCSMain.cs | 17 -
CCSTrace/Properties/AssemblyInfo.cs | 4
CCSTrace/CCS/EventAI/TraceSubject.cs | 29 +-
CCSTrace.sln | 11
CCSTrace/CCS/EventAI/JudgeCase.cs | 8
CCSTrace/Service1.asmx.cs | 2
CCSTrace/CCS/Function/MergeCase.cs | 4
CCSTrace/DBConfig.xml | 2
CCSTrace/CCSTrace.csproj | 16 +
CCSTrace/CCS/Function/Leach.cs | 8
15 files changed, 305 insertions(+), 175 deletions(-)
diff --git a/CCSTrace.sln b/CCSTrace.sln
index a902894..cb54a2c 100644
--- a/CCSTrace.sln
+++ b/CCSTrace.sln
@@ -3,9 +3,9 @@
# Visual Studio 2010
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CCSTrace", "CCSTrace\CCSTrace.csproj", "{E56EE563-6708-4448-85C4-9AE3C01E1B86}"
EndProject
-Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "CCSTracex86", "CCSTracex86\CCSTracex86.vdproj", "{7F1B82C8-776F-46AE-84CC-36AADB50F30D}"
-EndProject
Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "CCSTracex64", "CCSTracex64\CCSTracex64.vdproj", "{5DF7599C-A1CE-4C2A-846C-76505DA5B656}"
+EndProject
+Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "CCSTracex86", "CCSTracex86\CCSTracex86.vdproj", "{BB9B551B-D3F7-4A48-8FB9-7E08A989307A}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -17,13 +17,14 @@
{E56EE563-6708-4448-85C4-9AE3C01E1B86}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E56EE563-6708-4448-85C4-9AE3C01E1B86}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E56EE563-6708-4448-85C4-9AE3C01E1B86}.Release|Any CPU.Build.0 = Release|Any CPU
- {7F1B82C8-776F-46AE-84CC-36AADB50F30D}.Debug|Any CPU.ActiveCfg = Debug
- {7F1B82C8-776F-46AE-84CC-36AADB50F30D}.Debug|Any CPU.Build.0 = Debug
- {7F1B82C8-776F-46AE-84CC-36AADB50F30D}.Release|Any CPU.ActiveCfg = Release
{5DF7599C-A1CE-4C2A-846C-76505DA5B656}.Debug|Any CPU.ActiveCfg = Debug
{5DF7599C-A1CE-4C2A-846C-76505DA5B656}.Debug|Any CPU.Build.0 = Debug
{5DF7599C-A1CE-4C2A-846C-76505DA5B656}.Release|Any CPU.ActiveCfg = Release
{5DF7599C-A1CE-4C2A-846C-76505DA5B656}.Release|Any CPU.Build.0 = Release
+ {BB9B551B-D3F7-4A48-8FB9-7E08A989307A}.Debug|Any CPU.ActiveCfg = Debug
+ {BB9B551B-D3F7-4A48-8FB9-7E08A989307A}.Debug|Any CPU.Build.0 = Debug
+ {BB9B551B-D3F7-4A48-8FB9-7E08A989307A}.Release|Any CPU.ActiveCfg = Release
+ {BB9B551B-D3F7-4A48-8FB9-7E08A989307A}.Release|Any CPU.Build.0 = Release
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/CCSTrace/CCS/CCSMain.cs b/CCSTrace/CCS/CCSMain.cs
index 52ccd19..56a0dbb 100644
--- a/CCSTrace/CCS/CCSMain.cs
+++ b/CCSTrace/CCS/CCSMain.cs
@@ -23,7 +23,8 @@
public static System.Collections.ArrayList ProcessCases = new System.Collections.ArrayList();
private string LoadFilename = "DBConfig.xml";
- private string ConnectionString = "";
+ private string ConnectionString = String.Empty;
+ private string traceConnectionString = String.Empty;
private int ConnectionCount = 1;
public static System.Data.OracleClient.OracleConnection MainConn = null;
static SEventLog _MainLog = null;
@@ -168,7 +169,8 @@
// Step 3: 讀取 FileInfo 標籤的屬性
if (LocalName.Equals("DBSetting"))
{
- ConnectionString = reader["ConnectionString"];
+ ConnectionString = String.Format("Data source={0};User Id={1};Password={2};", reader["DataSource"], reader["UserId"], reader["Password"]) ;
+ traceConnectionString = String.Format("{0}/{1}@{2}", reader["UserId"], reader["Password"], reader["DataSource"]);
ConnectionCount = Int32.Parse(reader["ConnectionCount"]);
LocalVariable.ShowError = bool.Parse(reader["ShowError"]);
}
@@ -283,19 +285,17 @@
if (_Conn.State.ToString().Equals("Closed"))
_Conn.Open();
- ProcessEvent _ProcessEvent = new ProcessEvent(_Record,_Conn);
+ ProcessEvent _ProcessEvent = new ProcessEvent(_Record, _Conn, traceConnectionString);
_ProcessEvent.ThreadFinish += new ThreadEndEventHandler(ThreadEndEventProcess);
System.Threading.ThreadStart _ThreadStart = new System.Threading.ThreadStart(_ProcessEvent.Run);
System.Threading.Thread _Thread = new System.Threading.Thread(_ThreadStart);
_Thread.Start();
}
- catch (Exception e)
+ catch
{
DBConnList.Add(_Conn);
}
-
-
}
private void ThreadEndEventProcess(object sender, ThreadEndEvent e)
@@ -310,7 +310,7 @@
else
DBConnList.Add(e.getConnection());
}
- catch (Exception ex)
+ catch
{
DBConnList.Add(e.getConnection());
}
@@ -422,9 +422,6 @@
{
_PLog = new RecordLog(CCS.LocalVariable.CCS_ListPath + "MAIN.txt");
_PLog.Error(message);
- }
- catch (Exception ex)
- {
}
finally
{
diff --git a/CCSTrace/CCS/EventAI/JudgeCase.cs b/CCSTrace/CCS/EventAI/JudgeCase.cs
index 5355b7a..2f71f1a 100644
--- a/CCSTrace/CCS/EventAI/JudgeCase.cs
+++ b/CCSTrace/CCS/EventAI/JudgeCase.cs
@@ -32,19 +32,21 @@
private OracleConnection _ConnectionTPC;
private OracleTransaction _Transaction;
private RecordLog _PLog;
+ private String _traceConnectionString = String.Empty;
// int Range = 360; //比事故案件還早多久時間內的案件才作合併 單位:分
- public JudgeCase(int m_FdrID, int m_fsc, int m_ufid, int m_CaseID, String m_AcceptDate, OracleConnection _Connection, OracleTransaction _Trx, RecordLog _Log)
+ public JudgeCase(int m_FdrID, int m_fsc, int m_ufid, int m_CaseID, String m_AcceptDate, OracleConnection _Connection, OracleTransaction _Trx, String _traceConnection, RecordLog _Log)
{
this.Damage_FdrID = m_FdrID;
this.Damage_Fsc = m_fsc;
this.Damage_Ufid = m_ufid;
this.New_CaseID = m_CaseID;
this.AcceptDate = m_AcceptDate;
-
+
_ConnectionTPC = _Connection;
_Transaction = _Trx;
+ _traceConnectionString = _traceConnection;
_PLog = _Log;
}
@@ -141,7 +143,7 @@
int m_Key;
try {
- this.m_TraceSubject = new CCS.EventAI.TraceSubject(_ConnectionTPC, _Transaction,_PLog);
+ this.m_TraceSubject = new CCS.EventAI.TraceSubject(_ConnectionTPC, _Transaction, _traceConnectionString, _PLog);
_PLog.Info("TraceSubject Initial....");
}
catch (Exception ex) {
diff --git a/CCSTrace/CCS/EventAI/TraceSubject.cs b/CCSTrace/CCS/EventAI/TraceSubject.cs
index 26d49f4..29f3acd 100644
--- a/CCSTrace/CCS/EventAI/TraceSubject.cs
+++ b/CCSTrace/CCS/EventAI/TraceSubject.cs
@@ -15,25 +15,26 @@
{
public class TraceSubject
{
- static String DEFAULTDBSTR;
- static bool IsNewCase;
- static ArrayList m_LinkList; // store the switch of the new case path
- static TraceEngine m_tEngine;
- static Hashtable m_TreeMap; // store the switch of the old case path
- static int s_Fsc;
- static int s_Ufid;
- private RecordLog _Plogger;
- private ArrayList m_Tmp = new ArrayList();
- private NetworkContext m_pContext;
+ private String m_dbConnectionString;
+ static bool IsNewCase;
+ static ArrayList m_LinkList; // store the switch of the new case path
+ static TraceEngine m_tEngine;
+ static Hashtable m_TreeMap; // store the switch of the old case path
+ static int s_Fsc;
+ static int s_Ufid;
+ private RecordLog _Plogger;
+ private ArrayList m_Tmp = new ArrayList();
+ private NetworkContext m_pContext;
private OracleConnection _ConnectionTPC = null;
private OracleTransaction _Transaction;
- public TraceSubject(OracleConnection _Conn, OracleTransaction _Trx, RecordLog _Log)
+ public TraceSubject(OracleConnection _Conn, OracleTransaction _Trx, String traceConnectionString, RecordLog _Log)
{
_ConnectionTPC = _Conn;
_Transaction = _Trx;
_Plogger = _Log;
+ m_dbConnectionString = traceConnectionString;
try
{
@@ -397,14 +398,14 @@
}
void configTrace() {
- if (DEFAULTDBSTR == null) {
- DEFAULTDBSTR = "basedb/basedb000@nntpc";
+ if (m_dbConnectionString == null) {
+ m_dbConnectionString = "basedb/basedb000@nntpc";
}
try {
if (m_pContext == null) m_pContext = m_tEngine.teoCreateContext();
if (m_pContext.IsConnected == 0) {
- m_pContext.Connect("", DEFAULTDBSTR);
+ m_pContext.Connect("", m_dbConnectionString);
}
}
catch (Exception ex) {
diff --git a/CCSTrace/CCS/Function/Leach.cs b/CCSTrace/CCS/Function/Leach.cs
index 75cef77..96f460f 100644
--- a/CCSTrace/CCS/Function/Leach.cs
+++ b/CCSTrace/CCS/Function/Leach.cs
@@ -18,11 +18,13 @@
private RecordLog _PLog;
private OracleConnection _ConnectionTPC;
private OracleTransaction _Transaction;
+ private String _traceConnectionString = String.Empty;
- public Leach(OracleConnection _Conn, OracleTransaction _Trx, RecordLog _Log)
+ public Leach(OracleConnection _Conn, OracleTransaction _Trx, String _traceConnection, RecordLog _Log)
{
_ConnectionTPC = _Conn;
_Transaction = _Trx;
+ _traceConnectionString = _traceConnection;
_PLog = _Log;
}
@@ -286,7 +288,7 @@
m_NewRec.getLocateEquipment().setFSC(CCS.LocalVariable.Breaker);
m_NewRec.getLocateEquipment().setUFID(m_NewRec.getUfid());
_PLog.Info("饋線全停:" + m_NewRec.getFsc() + ", " + m_NewRec.getUfid());
- MergeCase.Merge(m_NewRec, _ConnectionTPC, _Transaction, _PLog);
+ MergeCase.Merge(m_NewRec, _ConnectionTPC, _Transaction, _traceConnectionString, _PLog);
return CCS.LocalVariable.Success;
}
}
@@ -325,7 +327,7 @@
if (m_NewRec.getBrief().Length !=0 && m_NewRec.getBrief().Substring(0,1).Equals("A"))
{ // A類事故原因,做追蹤合併
_PLog.Info("<A類案件>");
- MergeCase.Merge(m_NewRec,_ConnectionTPC,_Transaction,_PLog);
+ MergeCase.Merge(m_NewRec, _ConnectionTPC, _Transaction, _traceConnectionString, _PLog);
}
else
{
diff --git a/CCSTrace/CCS/Function/MailService.cs b/CCSTrace/CCS/Function/MailService.cs
index fe8b8ca..a08eb3a 100644
--- a/CCSTrace/CCS/Function/MailService.cs
+++ b/CCSTrace/CCS/Function/MailService.cs
@@ -47,7 +47,7 @@
smtpClient.Send(objMail);
return true;
}
- catch (Exception ex)
+ catch
{
return false;
}
diff --git a/CCSTrace/CCS/Function/MergeCase.cs b/CCSTrace/CCS/Function/MergeCase.cs
index 8de222a..89d4f03 100644
--- a/CCSTrace/CCS/Function/MergeCase.cs
+++ b/CCSTrace/CCS/Function/MergeCase.cs
@@ -21,12 +21,12 @@
{
}
- public void Merge(CCS.Object.EventRecord m_Eventrecord, OracleConnection _Conn,OracleTransaction _Trx, RecordLog _Log)
+ public void Merge(CCS.Object.EventRecord m_Eventrecord, OracleConnection _Conn, OracleTransaction _Trx, String _traceConnection, RecordLog _Log)
{
try
{
m_JudgeCase = new CCS.EventAI.JudgeCase(m_Eventrecord.getFdrID(), m_Eventrecord.getFsc(), m_Eventrecord.getUfid(),
- m_Eventrecord.getCaseID(), m_Eventrecord.getAcceptDate(), _Conn, _Trx, _Log);
+ m_Eventrecord.getCaseID(), m_Eventrecord.getAcceptDate(), _Conn, _Trx, _traceConnection, _Log);
l_Eventrecord = m_Eventrecord;
m_JudgeCase.AIBegin();
l_Eventrecord.setParentID(m_JudgeCase.getParentCaseID());
diff --git a/CCSTrace/CCS/ProcessEvent.cs b/CCSTrace/CCS/ProcessEvent.cs
index bf380b7..2f03fdb 100644
--- a/CCSTrace/CCS/ProcessEvent.cs
+++ b/CCSTrace/CCS/ProcessEvent.cs
@@ -24,11 +24,13 @@
private RecordLog _PLog;
private OracleConnection _ConnectionTPC;
private OracleTransaction _Trx;
+ private String _traceConnectionString = String.Empty;
- public ProcessEvent(Object.CCSRecord _Record,OracleConnection _Conn)
+ public ProcessEvent(Object.CCSRecord _Record, OracleConnection _Conn, String _traceConnection)
{
m_CCSRecord = _Record;
_ConnectionTPC = _Conn;
+ _traceConnectionString = _traceConnection;
_PLog = new RecordLog(CCS.LocalVariable.CCS_ListPath + _Record.getCCSID() + ".txt");
}
@@ -72,7 +74,7 @@
*/
if (this.initialEventRecord(m_CCSRecord.getCCSID()))
{
- CCS.Function.Leach m_Leach = new CCS.Function.Leach(_ConnectionTPC, _Trx, _PLog); // 案件過濾與合併
+ CCS.Function.Leach m_Leach = new CCS.Function.Leach(_ConnectionTPC, _Trx, _traceConnectionString, _PLog); // 案件過濾與合併
_PLog.Info("過濾案件...");
int Return_Status = m_Leach.LeachCase(m_EventRecord);
diff --git a/CCSTrace/CCSTrace.csproj b/CCSTrace/CCSTrace.csproj
index 66c4673..8825518 100644
--- a/CCSTrace/CCSTrace.csproj
+++ b/CCSTrace/CCSTrace.csproj
@@ -12,12 +12,13 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>CCSTrace</RootNamespace>
<AssemblyName>CCSTrace</AssemblyName>
- <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<FileUpgradeFlags>
</FileUpgradeFlags>
<OldToolsVersion>3.5</OldToolsVersion>
<UpgradeBackupLocation />
<UseIISExpress>false</UseIISExpress>
+ <TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -28,6 +29,7 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+ <PlatformTarget>AnyCPU</PlatformTarget>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@@ -45,17 +47,21 @@
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
+ <Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Data.OracleClient" />
<Reference Include="System.Drawing" />
<Reference Include="System.Web" />
+ <Reference Include="System.Web.Extensions" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
<Reference Include="System.Configuration" />
<Reference Include="System.Web.Services" />
<Reference Include="System.EnterpriseServices" />
<Reference Include="System.Web.Mobile" />
+ <Reference Include="System.Xml.Linq" />
</ItemGroup>
<ItemGroup>
+ <Content Include="DBConfig.xml" />
<Content Include="Service1.asmx" />
<Content Include="Web.config" />
</ItemGroup>
@@ -95,7 +101,6 @@
</ItemGroup>
<ItemGroup>
<Folder Include="App_Data\" />
- <Folder Include="Service References\" />
</ItemGroup>
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
@@ -115,12 +120,13 @@
<VisualStudio>
<FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
<WebProjectProperties>
- <UseIIS>False</UseIIS>
+ <UseIIS>True</UseIIS>
<AutoAssignPort>True</AutoAssignPort>
<DevelopmentServerPort>2853</DevelopmentServerPort>
<DevelopmentServerVPath>/</DevelopmentServerVPath>
- <IISUrl>
- </IISUrl>
+ <IISUrl>http://localhost/CCSTrace</IISUrl>
+ <OverrideIISAppRootUrl>True</OverrideIISAppRootUrl>
+ <IISAppRootUrl>http://localhost/CCSTrace</IISAppRootUrl>
<NTLMAuthentication>False</NTLMAuthentication>
<UseCustomServer>False</UseCustomServer>
<CustomServerUrl>
diff --git a/CCSTrace/DBConfig.xml b/CCSTrace/DBConfig.xml
index 60c2291..f7cacb7 100644
--- a/CCSTrace/DBConfig.xml
+++ b/CCSTrace/DBConfig.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="big5" ?>
<CCS>
- <DBSetting ConnectionString = "Data source=nntpc;User Id=basedb;Password=basedb000;" ConnectionCount = "3" ShowError = "false" />
+ <DBSetting DataSource = "nntpc" UserId = "basedb" Password = "BASEDB000" ConnectionCount = "3" ShowError = "false" />
</CCS>
\ No newline at end of file
diff --git a/CCSTrace/Properties/AssemblyInfo.cs b/CCSTrace/Properties/AssemblyInfo.cs
index 7977463..73328ec 100644
--- a/CCSTrace/Properties/AssemblyInfo.cs
+++ b/CCSTrace/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("5.2.0.0")]
-[assembly: AssemblyFileVersion("5.2.0.0")]
+[assembly: AssemblyVersion("6.0.0.0")]
+[assembly: AssemblyFileVersion("6.0.0.0")]
diff --git a/CCSTrace/Service1.asmx.cs b/CCSTrace/Service1.asmx.cs
index 4d02747..deede34 100644
--- a/CCSTrace/Service1.asmx.cs
+++ b/CCSTrace/Service1.asmx.cs
@@ -15,7 +15,7 @@
[WebServiceBinding(ConformsTo = WsiProfiles.BasicProfile1_1)]
[ToolboxItem(false)]
// To allow this Web Service to be called from script, using ASP.NET AJAX, uncomment the following line.
- // [System.Web.Script.Services.ScriptService]
+ [System.Web.Script.Services.ScriptService]
public class Service1 : System.Web.Services.WebService
{
diff --git a/CCSTrace/Web.config b/CCSTrace/Web.config
index 2be58e8..eaa54ec 100644
--- a/CCSTrace/Web.config
+++ b/CCSTrace/Web.config
@@ -1,23 +1,47 @@
<?xml version="1.0"?>
<configuration>
- <appSettings/>
- <connectionStrings/>
- <system.web>
- <!--
+ <configSections>
+ <sectionGroup name="system.web.extensions" type="System.Web.Configuration.SystemWebExtensionsSectionGroup, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
+ <sectionGroup name="scripting" type="System.Web.Configuration.ScriptingSectionGroup, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
+ <remove name="scriptResourceHandler" />
+ <section name="scriptResourceHandler" type="System.Web.Configuration.ScriptingScriptResourceHandlerSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication"/>
+ <sectionGroup name="webServices" type="System.Web.Configuration.ScriptingWebServicesSectionGroup, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
+ <remove name="jsonSerialization" />
+ <section name="jsonSerialization" type="System.Web.Configuration.ScriptingJsonSerializationSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="Everywhere"/>
+ <remove name="profileService" />
+ <section name="profileService" type="System.Web.Configuration.ScriptingProfileServiceSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication"/>
+ <remove name="authenticationService" />
+ <section name="authenticationService" type="System.Web.Configuration.ScriptingAuthenticationServiceSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication"/>
+ <remove name="roleService" />
+ <section name="roleService" type="System.Web.Configuration.ScriptingRoleServiceSection, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" allowDefinition="MachineToApplication"/>
+ </sectionGroup>
+ </sectionGroup>
+ </sectionGroup>
+ </configSections>
+ <appSettings/>
+ <connectionStrings/>
+ <system.web>
+ <!--
Set compilation debug="true" to insert debugging
symbols into the compiled page. Because this
affects performance, set this value to true only
during development.
-->
- <compilation debug="true">
- </compilation>
- <!--
+ <compilation debug="true">
+ <assemblies>
+ <add assembly="System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
+ <add assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
+ <add assembly="System.Xml.Linq, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
+ <add assembly="System.Data.DataSetExtensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
+ </assemblies>
+ </compilation>
+ <!--
The <authentication> section enables configuration
of the security authentication mode used by
ASP.NET to identify an incoming user.
-->
- <authentication mode="Windows"/>
- <!--
+ <authentication mode="Windows"/>
+ <!--
The <customErrors> section enables configuration
of what to do if/when an unhandled error occurs
during the execution of a request. Specifically,
@@ -29,13 +53,60 @@
<error statusCode="404" redirect="FileNotFound.htm" />
</customErrors>
-->
- </system.web>
- <system.codedom>
- </system.codedom>
- <!--
+ <pages>
+ <controls>
+ <add tagPrefix="asp" namespace="System.Web.UI" assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
+ <add tagPrefix="asp" namespace="System.Web.UI.WebControls" assembly="System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
+ </controls>
+ </pages>
+ <httpHandlers>
+ <remove verb="*" path="*.asmx"/>
+ <add verb="*" path="*.asmx" validate="false" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
+ <add verb="*" path="*_AppService.axd" validate="false" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
+ <add verb="GET,HEAD" path="ScriptResource.axd" validate="false" type="System.Web.Handlers.ScriptResourceHandler, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
+ </httpHandlers>
+ <httpModules>
+ <add name="ScriptModule" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
+ </httpModules>
+ </system.web>
+ <!--
The system.webServer section is required for running ASP.NET AJAX under Internet
Information Services 7.0. It is not necessary for previous version of IIS.
-->
- <system.webServer>
- </system.webServer>
-</configuration>
+ <system.codedom>
+ <compilers>
+ <compiler language="c#;cs;csharp" extension=".cs" type="Microsoft.CSharp.CSharpCodeProvider, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" warningLevel="4">
+ <providerOption name="CompilerVersion" value="v3.5"/>
+ <providerOption name="WarnAsError" value="false"/>
+ </compiler>
+ </compilers>
+ </system.codedom>
+ <system.webServer>
+ <validation validateIntegratedModeConfiguration="false"/>
+ <modules>
+ <remove name="ScriptModule"/>
+ <add name="ScriptModule" preCondition="managedHandler" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
+ </modules>
+ <handlers>
+ <remove name="WebServiceHandlerFactory-Integrated"/>
+ <remove name="ScriptHandlerFactory"/>
+ <remove name="ScriptHandlerFactoryAppServices"/>
+ <remove name="ScriptResource"/>
+ <add name="ScriptHandlerFactory" verb="*" path="*.asmx" preCondition="integratedMode" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
+ <add name="ScriptHandlerFactoryAppServices" verb="*" path="*_AppService.axd" preCondition="integratedMode" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
+ <add name="ScriptResource" verb="GET,HEAD" path="ScriptResource.axd" preCondition="integratedMode" type="System.Web.Handlers.ScriptResourceHandler, System.Web.Extensions, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
+ </handlers>
+ </system.webServer>
+ <runtime>
+ <assemblyBinding appliesTo="v2.0.50727" xmlns="urn:schemas-microsoft-com:asm.v1">
+ <dependentAssembly>
+ <assemblyIdentity name="System.Web.Extensions" publicKeyToken="31bf3856ad364e35"/>
+ <bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="3.5.0.0"/>
+ </dependentAssembly>
+ <dependentAssembly>
+ <assemblyIdentity name="System.Web.Extensions.Design" publicKeyToken="31bf3856ad364e35"/>
+ <bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="3.5.0.0"/>
+ </dependentAssembly>
+ </assemblyBinding>
+ </runtime>
+</configuration>
\ No newline at end of file
diff --git a/CCSTracex64/CCSTracex64.vdproj b/CCSTracex64/CCSTracex64.vdproj
index 84a3869..b62f0d4 100644
--- a/CCSTracex64/CCSTracex64.vdproj
+++ b/CCSTracex64/CCSTracex64.vdproj
@@ -15,26 +15,20 @@
{
"Entry"
{
- "MsmKey" = "8:_1F0444DBC6C48CE95BCAD44C3F4744C9"
- "OwnerKey" = "8:_ABA436F0BD2791AB1C080075F1592C61"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_4017BB7037E846F798790C27BC9949D8"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_451F69F682084864A60CFC131FACF7EF"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_978AE998BF3F658E473FD45EFFC2303D"
+ "OwnerKey" = "8:_4017BB7037E846F798790C27BC9949D8"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_ABA436F0BD2791AB1C080075F1592C61"
- "OwnerKey" = "8:_4017BB7037E846F798790C27BC9949D8"
+ "MsmKey" = "8:_97C70B51CABE909579A7FBEA09E78B37"
+ "OwnerKey" = "8:_978AE998BF3F658E473FD45EFFC2303D"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
@@ -46,7 +40,7 @@
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
- "OwnerKey" = "8:_ABA436F0BD2791AB1C080075F1592C61"
+ "OwnerKey" = "8:_978AE998BF3F658E473FD45EFFC2303D"
"MsmSig" = "8:_UNDEFINED"
}
}
@@ -76,6 +70,21 @@
"ComponentsUrl" = "8:"
"Items"
{
+ "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:Microsoft.Net.Framework.3.5.SP1"
+ {
+ "Name" = "8:.NET Framework 3.5 SP1"
+ "ProductCode" = "8:Microsoft.Net.Framework.3.5.SP1"
+ }
+ "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:Microsoft.Windows.Installer.3.1"
+ {
+ "Name" = "8:Windows Installer 3.1"
+ "ProductCode" = "8:Microsoft.Windows.Installer.3.1"
+ }
+ "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:Microsoft.Windows.Installer.4.5"
+ {
+ "Name" = "8:Windows Installer 4.5"
+ "ProductCode" = "8:Microsoft.Windows.Installer.4.5"
+ }
}
}
}
@@ -136,7 +145,7 @@
{
"Name" = "8:.NET Framework"
"Message" = "8:[VSDNETMSG]"
- "Version" = "8:2.0.50727"
+ "FrameworkVersion" = "8:.NETFramework,Version=v3.5"
"AllowLaterVersions" = "11:FALSE"
"InstallUrl" = "8:http://go.microsoft.com/fwlink/?LinkId=76617"
}
@@ -144,54 +153,14 @@
}
"File"
{
- "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_1F0444DBC6C48CE95BCAD44C3F4744C9"
- {
- "SourcePath" = "8:TracerObject.dll"
- "TargetName" = "8:TracerObject.dll"
- "Tag" = "8:"
- "Folder" = "8:_77496B8FB79F42B788CF1B66B209F62B"
- "Condition" = "8:"
- "Transitive" = "11:FALSE"
- "Vital" = "11:TRUE"
- "ReadOnly" = "11:FALSE"
- "Hidden" = "11:FALSE"
- "System" = "11:FALSE"
- "Permanent" = "11:FALSE"
- "SharedLegacy" = "11:FALSE"
- "PackageAs" = "3:1"
- "Register" = "3:1"
- "Exclude" = "11:FALSE"
- "IsDependency" = "11:TRUE"
- "IsolateTo" = "8:"
- }
- "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_451F69F682084864A60CFC131FACF7EF"
- {
- "SourcePath" = "8:..\\CCSTrace\\DBConfig.xml"
- "TargetName" = "8:DBConfig.xml"
- "Tag" = "8:"
- "Folder" = "8:_CB8D678E48E746149B5CDD9695539932"
- "Condition" = "8:"
- "Transitive" = "11:FALSE"
- "Vital" = "11:TRUE"
- "ReadOnly" = "11:FALSE"
- "Hidden" = "11:FALSE"
- "System" = "11:FALSE"
- "Permanent" = "11:FALSE"
- "SharedLegacy" = "11:FALSE"
- "PackageAs" = "3:1"
- "Register" = "3:1"
- "Exclude" = "11:FALSE"
- "IsDependency" = "11:FALSE"
- "IsolateTo" = "8:"
- }
- "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_ABA436F0BD2791AB1C080075F1592C61"
+ "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_978AE998BF3F658E473FD45EFFC2303D"
{
"AssemblyRegister" = "3:1"
"AssemblyIsInGAC" = "11:FALSE"
"AssemblyAsmDisplayName" = "8:Interop.TRACEROBJECTLib, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL"
"ScatterAssemblies"
{
- "_ABA436F0BD2791AB1C080075F1592C61"
+ "_978AE998BF3F658E473FD45EFFC2303D"
{
"Name" = "8:Interop.TRACEROBJECTLib.DLL"
"Attributes" = "3:512"
@@ -215,12 +184,66 @@
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
+ "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_97C70B51CABE909579A7FBEA09E78B37"
+ {
+ "SourcePath" = "8:TracerObject.dll"
+ "TargetName" = "8:TracerObject.dll"
+ "Tag" = "8:"
+ "Folder" = "8:_77496B8FB79F42B788CF1B66B209F62B"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "Vital" = "11:TRUE"
+ "ReadOnly" = "11:FALSE"
+ "Hidden" = "11:FALSE"
+ "System" = "11:FALSE"
+ "Permanent" = "11:FALSE"
+ "SharedLegacy" = "11:FALSE"
+ "PackageAs" = "3:1"
+ "Register" = "3:1"
+ "Exclude" = "11:FALSE"
+ "IsDependency" = "11:TRUE"
+ "IsolateTo" = "8:"
+ }
}
"FileType"
{
}
"Folder"
{
+ "{994432C3-9487-495D-8656-3E829A8DBDDE}:_66FA7315A14D4351B02A556D9A21ADCA"
+ {
+ "DefaultLocation" = "8:C:\\OMS"
+ "Name" = "8:OMS"
+ "AlwaysCreate" = "11:TRUE"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "Property" = "8:NEWPROPERTY1"
+ "Folders"
+ {
+ "{9EF0B969-E518-4E46-987F-47570745A589}:_71977DB153C44F68BDBEFA389623C349"
+ {
+ "Name" = "8:Bin"
+ "AlwaysCreate" = "11:TRUE"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "Property" = "8:_6F30F8DABFED407D85156CA209AC1F30"
+ "Folders"
+ {
+ "{9EF0B969-E518-4E46-987F-47570745A589}:_9E3FF254B67F48F3A13ECBF1D989A3F8"
+ {
+ "Name" = "8:CCS"
+ "AlwaysCreate" = "11:TRUE"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "Property" = "8:_DFC0BBEB50B1420593EFBC1AF19378BE"
+ "Folders"
+ {
+ }
+ }
+ }
+ }
+ }
+ }
"{80453C8E-1031-40EC-8E7A-9762B297303A}:_CB8D678E48E746149B5CDD9695539932"
{
"VirtualDirectory" = "8:CCSTrace"
@@ -297,8 +320,9 @@
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:CCS Trace 6.0.0"
"ProductCode" = "8:{0F0E5BDC-905F-4B9A-9291-D4CAB4E935BC}"
- "PackageCode" = "8:{DB6A74CB-A621-4DA6-B08D-56EFB3D8435E}"
+ "PackageCode" = "8:{F85BCA2B-7E44-428A-B5C9-ED864C9B68B4}"
"UpgradeCode" = "8:{AA82325C-70DE-4FD9-B6AE-2702EFC91474}"
+ "AspNetVersion" = "8:4.0.30319.0"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:FALSE"
diff --git a/CCSTracex86/CCSTracex86.vdproj b/CCSTracex86/CCSTracex86.vdproj
index f6dcb36..414498e 100644
--- a/CCSTracex86/CCSTracex86.vdproj
+++ b/CCSTracex86/CCSTracex86.vdproj
@@ -15,26 +15,20 @@
{
"Entry"
{
- "MsmKey" = "8:_1F0444DBC6C48CE95BCAD44C3F4744C9"
- "OwnerKey" = "8:_ABA436F0BD2791AB1C080075F1592C61"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_4017BB7037E846F798790C27BC9949D8"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_451F69F682084864A60CFC131FACF7EF"
- "OwnerKey" = "8:_UNDEFINED"
+ "MsmKey" = "8:_978AE998BF3F658E473FD45EFFC2303D"
+ "OwnerKey" = "8:_4017BB7037E846F798790C27BC9949D8"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
- "MsmKey" = "8:_ABA436F0BD2791AB1C080075F1592C61"
- "OwnerKey" = "8:_4017BB7037E846F798790C27BC9949D8"
+ "MsmKey" = "8:_97C70B51CABE909579A7FBEA09E78B37"
+ "OwnerKey" = "8:_978AE998BF3F658E473FD45EFFC2303D"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
@@ -46,7 +40,7 @@
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
- "OwnerKey" = "8:_ABA436F0BD2791AB1C080075F1592C61"
+ "OwnerKey" = "8:_978AE998BF3F658E473FD45EFFC2303D"
"MsmSig" = "8:_UNDEFINED"
}
}
@@ -76,6 +70,21 @@
"ComponentsUrl" = "8:"
"Items"
{
+ "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:Microsoft.Net.Framework.3.5.SP1"
+ {
+ "Name" = "8:.NET Framework 3.5 SP1"
+ "ProductCode" = "8:Microsoft.Net.Framework.3.5.SP1"
+ }
+ "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:Microsoft.Windows.Installer.3.1"
+ {
+ "Name" = "8:Windows Installer 3.1"
+ "ProductCode" = "8:Microsoft.Windows.Installer.3.1"
+ }
+ "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:Microsoft.Windows.Installer.4.5"
+ {
+ "Name" = "8:Windows Installer 4.5"
+ "ProductCode" = "8:Microsoft.Windows.Installer.4.5"
+ }
}
}
}
@@ -136,7 +145,7 @@
{
"Name" = "8:.NET Framework"
"Message" = "8:[VSDNETMSG]"
- "Version" = "8:2.0.50727"
+ "FrameworkVersion" = "8:.NETFramework,Version=v3.5"
"AllowLaterVersions" = "11:FALSE"
"InstallUrl" = "8:http://go.microsoft.com/fwlink/?LinkId=76617"
}
@@ -144,54 +153,14 @@
}
"File"
{
- "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_1F0444DBC6C48CE95BCAD44C3F4744C9"
- {
- "SourcePath" = "8:TracerObject.dll"
- "TargetName" = "8:TracerObject.dll"
- "Tag" = "8:"
- "Folder" = "8:_77496B8FB79F42B788CF1B66B209F62B"
- "Condition" = "8:"
- "Transitive" = "11:FALSE"
- "Vital" = "11:TRUE"
- "ReadOnly" = "11:FALSE"
- "Hidden" = "11:FALSE"
- "System" = "11:FALSE"
- "Permanent" = "11:FALSE"
- "SharedLegacy" = "11:FALSE"
- "PackageAs" = "3:1"
- "Register" = "3:1"
- "Exclude" = "11:FALSE"
- "IsDependency" = "11:TRUE"
- "IsolateTo" = "8:"
- }
- "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_451F69F682084864A60CFC131FACF7EF"
- {
- "SourcePath" = "8:..\\CCSTrace\\DBConfig.xml"
- "TargetName" = "8:DBConfig.xml"
- "Tag" = "8:"
- "Folder" = "8:_CB8D678E48E746149B5CDD9695539932"
- "Condition" = "8:"
- "Transitive" = "11:FALSE"
- "Vital" = "11:TRUE"
- "ReadOnly" = "11:FALSE"
- "Hidden" = "11:FALSE"
- "System" = "11:FALSE"
- "Permanent" = "11:FALSE"
- "SharedLegacy" = "11:FALSE"
- "PackageAs" = "3:1"
- "Register" = "3:1"
- "Exclude" = "11:FALSE"
- "IsDependency" = "11:FALSE"
- "IsolateTo" = "8:"
- }
- "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_ABA436F0BD2791AB1C080075F1592C61"
+ "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_978AE998BF3F658E473FD45EFFC2303D"
{
"AssemblyRegister" = "3:1"
"AssemblyIsInGAC" = "11:FALSE"
"AssemblyAsmDisplayName" = "8:Interop.TRACEROBJECTLib, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL"
"ScatterAssemblies"
{
- "_ABA436F0BD2791AB1C080075F1592C61"
+ "_978AE998BF3F658E473FD45EFFC2303D"
{
"Name" = "8:Interop.TRACEROBJECTLib.DLL"
"Attributes" = "3:512"
@@ -215,12 +184,66 @@
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
+ "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_97C70B51CABE909579A7FBEA09E78B37"
+ {
+ "SourcePath" = "8:TracerObject.dll"
+ "TargetName" = "8:TracerObject.dll"
+ "Tag" = "8:"
+ "Folder" = "8:_77496B8FB79F42B788CF1B66B209F62B"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "Vital" = "11:TRUE"
+ "ReadOnly" = "11:FALSE"
+ "Hidden" = "11:FALSE"
+ "System" = "11:FALSE"
+ "Permanent" = "11:FALSE"
+ "SharedLegacy" = "11:FALSE"
+ "PackageAs" = "3:1"
+ "Register" = "3:1"
+ "Exclude" = "11:FALSE"
+ "IsDependency" = "11:TRUE"
+ "IsolateTo" = "8:"
+ }
}
"FileType"
{
}
"Folder"
{
+ "{994432C3-9487-495D-8656-3E829A8DBDDE}:_17A867A14CAC4567AE337283D9A21588"
+ {
+ "DefaultLocation" = "8:C:\\OMS"
+ "Name" = "8:OMS"
+ "AlwaysCreate" = "11:TRUE"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "Property" = "8:NEWPROPERTY1"
+ "Folders"
+ {
+ "{9EF0B969-E518-4E46-987F-47570745A589}:_752FB9CCC9934241B769649708570253"
+ {
+ "Name" = "8:Bin"
+ "AlwaysCreate" = "11:TRUE"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "Property" = "8:_115E5C657D1541339A7BAE590D10347A"
+ "Folders"
+ {
+ "{9EF0B969-E518-4E46-987F-47570745A589}:_13BD6405506E4C45B24E4C0D1F213859"
+ {
+ "Name" = "8:CCS"
+ "AlwaysCreate" = "11:TRUE"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "Property" = "8:_39D1E9D51ABE4D71AF11872868E925C6"
+ "Folders"
+ {
+ }
+ }
+ }
+ }
+ }
+ }
"{80453C8E-1031-40EC-8E7A-9762B297303A}:_CB8D678E48E746149B5CDD9695539932"
{
"VirtualDirectory" = "8:CCSTrace"
@@ -297,8 +320,9 @@
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:CCS Trace 6.0.0"
"ProductCode" = "8:{0F0E5BDC-905F-4B9A-9291-D4CAB4E935BC}"
- "PackageCode" = "8:{DB6A74CB-A621-4DA6-B08D-56EFB3D8435E}"
+ "PackageCode" = "8:{6019275A-A23C-40D4-ABE0-55B5DCF8D988}"
"UpgradeCode" = "8:{AA82325C-70DE-4FD9-B6AE-2702EFC91474}"
+ "AspNetVersion" = "8:4.0.30319.0"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:FALSE"
--
Gitblit v0.0.0-SNAPSHOT