Attachment 63307 Details for Bug 160726 – patch file

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] patch file

bug160726_patch.txt (text/plain), 27.77 KB, created by Cindy Jin

on 2007-04-10 00:39:25 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Cindy Jin

Created: 2007-04-10 00:39:25 EDT

Size: 27.77 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.hyades.logging.parsers
>Index: config/Windows/application/regex_example.adapter
>===================================================================
>RCS file: /cvsroot/tptp/monitoring/org.eclipse.hyades.logging.parsers/config/Windows/application/regex_example.adapter,v
>retrieving revision 1.7
>diff -u -r1.7 regex_example.adapter
>--- config/Windows/application/regex_example.adapter	12 May 2006 19:19:17 -0000	1.7
>+++ config/Windows/application/regex_example.adapter	10 Apr 2007 04:39:13 -0000
>@@ -28,8 +28,8 @@
>         <pu:Property propertyName="converter" propertyValue="&quot;eventlogreader.exe&quot; application .\error.log"/>
>         <sensor:SingleFileSensor converter="&quot;eventlogreader.exe&quot; application .\error.log" directory="." fileName="error.log"/>
>       </cc:Sensor>
>-      <ex:Extractor containsLineBreaks="true" description="This extractor uses regular expression  patterns to identify record delimiters" endPattern="" includeEndPattern="false" includeStartPattern="true" lineBreakSymbol="" replaceLineBreaks="false" startPattern="RecordNumber:" uniqueID="N513CE9005B511D880008CD5D1F4FA98"/>
>-      <cc:Parser designationToken=":" separatorToken=";" uniqueID="N5218A3005B511D880008CD5D1F4FA98">
>+      <ex:Extractor description="This extractor uses regular expression  patterns to identify record delimiters" uniqueID="N513CE9005B511D880008CD5D1F4FA98" containsLineBreaks="true" endPattern="" includeEndPattern="false" includeStartPattern="true" lineBreakSymbol="" replaceLineBreaks="false" startPattern="RecordNumber:"/>
>+      <cc:Parser designationToken=":" separatorToken="@;@" uniqueID="N5218A3005B511D880008CD5D1F4FA98">
>         <parser:RuleElement index="N5218A3105B511D880008CD5D1F4FA98" name="CommonBaseEvent">
>           <parser:RuleElement index="N196C78405B511D880008CD5D1F4FA98" name="sourceComponentId">
>             <parser:RuleAttribute defaultValue="Windows" index="N6FFE39105B511D880008CD5D1F4FA98" name="component" usePreviousMatchSubstitutionAsDefault="false"/>
>Index: config/Windows/application/regex.adapter
>===================================================================
>RCS file: /cvsroot/tptp/monitoring/org.eclipse.hyades.logging.parsers/config/Windows/application/regex.adapter,v
>retrieving revision 1.11
>diff -u -r1.11 regex.adapter
>--- config/Windows/application/regex.adapter	11 Mar 2007 06:35:08 -0000	1.11
>+++ config/Windows/application/regex.adapter	10 Apr 2007 04:39:13 -0000
>@@ -30,8 +30,8 @@
>         <pu:Property propertyName="converter" propertyValue="&quot;eventlogreader.exe&quot; application error.log"/>
>         <sensor:SingleFileSensor converter="&quot;eventlogreader.exe&quot; application error.log" directory="." fileName="error.log"/>
>       </cc:Sensor>
>-      <ex:Extractor containsLineBreaks="true" description="This extractor uses regular expression  patterns to identify record delimiters" endPattern="" includeEndPattern="false" includeStartPattern="true" lineBreakSymbol="" replaceLineBreaks="false" startPattern="RecordNumber:" uniqueID="N513CE9005B511D880008CD5D1F4FA98"/>
>-      <cc:Parser designationToken=":" separatorToken=";" uniqueID="N5218A3005B511D880008CD5D1F4FA98">
>+      <ex:Extractor description="This extractor uses regular expression  patterns to identify record delimiters" uniqueID="N513CE9005B511D880008CD5D1F4FA98" containsLineBreaks="true" endPattern="" includeEndPattern="false" includeStartPattern="true" lineBreakSymbol="" replaceLineBreaks="false" startPattern="RecordNumber:"/>
>+      <cc:Parser designationToken=":" separatorToken="@;@" uniqueID="N5218A3005B511D880008CD5D1F4FA98">
>         <parser:RuleElement index="N5218A3105B511D880008CD5D1F4FA98" name="CommonBaseEvent">
>           <parser:RuleElement index="N196C78405B511D880008CD5D1F4FA98" name="sourceComponentId">
>             <parser:RuleAttribute defaultValue="Windows" index="N6FFE39105B511D880008CD5D1F4FA98" name="component" usePreviousMatchSubstitutionAsDefault="false"/>
>@@ -107,12 +107,12 @@
>       <cc:Outputter description="Static Parser Outputter" uniqueID="AdapterCBEOutputterID3" type="StandardOutOutputter">
>         <op:StandardOutOutputterType/>
>       </cc:Outputter>
>-      <cc:Outputter description="CBE File Outputter" uniqueID="N9D6D6180E9D11DB8000DF587DEE0353" disabled="true" type="SingleFileOutputter">
>+      <cc:Outputter description="CBE File Outputter" disabled="true" uniqueID="N9D6D6180E9D11DB8000DF587DEE0353" type="SingleFileOutputter">
>         <pu:Property propertyName="directory" propertyValue="."/>
>         <pu:Property propertyName="fileName" propertyValue="application.out"/>
>         <op:SingleFileOutputterType directory="." fileName="application.out"/>
>       </cc:Outputter>
>-      <cc:Outputter description="CBE Logging Agent Outputter" uniqueID="N2E800D80E9D11DB8000DF587DEE0353" disabled="true" type="LoggingAgentOutputter">
>+      <cc:Outputter description="CBE Logging Agent Outputter" disabled="true" uniqueID="N2E800D80E9D11DB8000DF587DEE0353" type="LoggingAgentOutputter">
>         <pu:Property propertyName="agentName" propertyValue="Default CBE Logging Agent"/>
>         <op:LoggingAgentOutputterType agentName="Default CBE Logging Agent"/>
>       </cc:Outputter>
>Index: config/Windows/application/nl/regex.adapter
>===================================================================
>RCS file: /cvsroot/tptp/monitoring/org.eclipse.hyades.logging.parsers/config/Windows/application/nl/regex.adapter,v
>retrieving revision 1.6
>diff -u -r1.6 regex.adapter
>--- config/Windows/application/nl/regex.adapter	11 Mar 2007 06:35:08 -0000	1.6
>+++ config/Windows/application/nl/regex.adapter	10 Apr 2007 04:39:14 -0000
>@@ -30,8 +30,8 @@
>         <pu:Property propertyName="converter" propertyValue="&quot;eventlogreader.exe&quot; application error.log"/>
>         <sensor:SingleFileSensor converter="&quot;eventlogreader.exe&quot; application error.log" directory="." fileName="error.log"/>
>       </cc:Sensor>
>-      <ex:Extractor containsLineBreaks="true" description="This extractor uses regular expression  patterns to identify record delimiters" endPattern="" includeEndPattern="false" includeStartPattern="true" lineBreakSymbol="" replaceLineBreaks="false" startPattern="RecordNumber:" uniqueID="N513CE9005B511D880008CD5D1F4FA98"/>
>-      <cc:Parser designationToken=":" separatorToken=";" uniqueID="N5218A3005B511D880008CD5D1F4FA98">
>+      <ex:Extractor description="This extractor uses regular expression  patterns to identify record delimiters" uniqueID="N513CE9005B511D880008CD5D1F4FA98" containsLineBreaks="true" endPattern="" includeEndPattern="false" includeStartPattern="true" lineBreakSymbol="" replaceLineBreaks="false" startPattern="RecordNumber:"/>
>+      <cc:Parser designationToken=":" separatorToken="@;@" uniqueID="N5218A3005B511D880008CD5D1F4FA98">
>         <parser:RuleElement index="N5218A3105B511D880008CD5D1F4FA98" name="CommonBaseEvent">
>           <parser:RuleElement index="N196C78405B511D880008CD5D1F4FA98" name="sourceComponentId">
>             <parser:RuleAttribute defaultValue="Windows" index="N6FFE39105B511D880008CD5D1F4FA98" name="component" usePreviousMatchSubstitutionAsDefault="false"/>
>@@ -107,12 +107,12 @@
>       <cc:Outputter description="Static Parser Outputter" uniqueID="AdapterCBEOutputterID3" type="StandardOutOutputter">
>         <op:StandardOutOutputterType/>
>       </cc:Outputter>
>-      <cc:Outputter description="CBE File Outputter" uniqueID="N9D6D6180E9D11DB8000DF587DEE0353" disabled="true" type="SingleFileOutputter">
>+      <cc:Outputter description="CBE File Outputter" disabled="true" uniqueID="N9D6D6180E9D11DB8000DF587DEE0353" type="SingleFileOutputter">
>         <pu:Property propertyName="directory" propertyValue="."/>
>         <pu:Property propertyName="fileName" propertyValue="application.out"/>
>         <op:SingleFileOutputterType directory="." fileName="application.out"/>
>       </cc:Outputter>
>-      <cc:Outputter description="CBE Logging Agent Outputter" uniqueID="N2E800D80E9D11DB8000DF587DEE0353" disabled="true" type="LoggingAgentOutputter">
>+      <cc:Outputter description="CBE Logging Agent Outputter" disabled="true" uniqueID="N2E800D80E9D11DB8000DF587DEE0353" type="LoggingAgentOutputter">
>         <pu:Property propertyName="agentName" propertyValue="Default CBE Logging Agent"/>
>         <op:LoggingAgentOutputterType agentName="Default CBE Logging Agent"/>
>       </cc:Outputter>
>Index: config/Windows/system/regex_example.adapter
>===================================================================
>RCS file: /cvsroot/tptp/monitoring/org.eclipse.hyades.logging.parsers/config/Windows/system/regex_example.adapter,v
>retrieving revision 1.7
>diff -u -r1.7 regex_example.adapter
>--- config/Windows/system/regex_example.adapter	12 May 2006 19:19:17 -0000	1.7
>+++ config/Windows/system/regex_example.adapter	10 Apr 2007 04:39:16 -0000
>@@ -28,8 +28,8 @@
>         <pu:Property propertyName="converter" propertyValue="&quot;eventlogreader.exe&quot; system .\error.log"/>
>         <sensor:SingleFileSensor converter="&quot;eventlogreader.exe&quot; system .\error.log" directory="." fileName="error.log"/>
>       </cc:Sensor>
>-      <ex:Extractor containsLineBreaks="true" description="This extractor uses regular expression  patterns to identify record delimiters" endPattern="" includeEndPattern="false" includeStartPattern="true" lineBreakSymbol="" replaceLineBreaks="false" startPattern="RecordNumber:" uniqueID="N513CE9005B511D880008CD5D1F4FA98"/>
>-      <cc:Parser designationToken=":" separatorToken=";" uniqueID="N5218A3005B511D880008CD5D1F4FA98">
>+      <ex:Extractor description="This extractor uses regular expression  patterns to identify record delimiters" uniqueID="N513CE9005B511D880008CD5D1F4FA98" containsLineBreaks="true" endPattern="" includeEndPattern="false" includeStartPattern="true" lineBreakSymbol="" replaceLineBreaks="false" startPattern="RecordNumber:"/>
>+      <cc:Parser designationToken=":" separatorToken="@;@" uniqueID="N5218A3005B511D880008CD5D1F4FA98">
>         <parser:RuleElement index="N5218A3105B511D880008CD5D1F4FA98" name="CommonBaseEvent">
>           <parser:RuleElement index="N196C78405B511D880008CD5D1F4FA98" name="sourceComponentId">
>             <parser:RuleAttribute defaultValue="Windows" index="N6FFE39105B511D880008CD5D1F4FA98" name="component" usePreviousMatchSubstitutionAsDefault="false"/>
>Index: config/Windows/system/regex.adapter
>===================================================================
>RCS file: /cvsroot/tptp/monitoring/org.eclipse.hyades.logging.parsers/config/Windows/system/regex.adapter,v
>retrieving revision 1.11
>diff -u -r1.11 regex.adapter
>--- config/Windows/system/regex.adapter	11 Mar 2007 06:35:08 -0000	1.11
>+++ config/Windows/system/regex.adapter	10 Apr 2007 04:39:15 -0000
>@@ -30,8 +30,8 @@
>         <pu:Property propertyName="converter" propertyValue="&quot;eventlogreader.exe&quot; system error.log"/>
>         <sensor:SingleFileSensor converter="&quot;eventlogreader.exe&quot; system error.log" directory="." fileName="error.log"/>
>       </cc:Sensor>
>-      <ex:Extractor containsLineBreaks="true" description="This extractor uses regular expression  patterns to identify record delimiters" endPattern="" includeEndPattern="false" includeStartPattern="true" lineBreakSymbol="" replaceLineBreaks="false" startPattern="RecordNumber:" uniqueID="N513CE9005B511D880008CD5D1F4FA98"/>
>-      <cc:Parser designationToken=":" separatorToken=";" uniqueID="N5218A3005B511D880008CD5D1F4FA98">
>+      <ex:Extractor description="This extractor uses regular expression  patterns to identify record delimiters" uniqueID="N513CE9005B511D880008CD5D1F4FA98" containsLineBreaks="true" endPattern="" includeEndPattern="false" includeStartPattern="true" lineBreakSymbol="" replaceLineBreaks="false" startPattern="RecordNumber:"/>
>+      <cc:Parser designationToken=":" separatorToken="@;@" uniqueID="N5218A3005B511D880008CD5D1F4FA98">
>         <parser:RuleElement index="N5218A3105B511D880008CD5D1F4FA98" name="CommonBaseEvent">
>           <parser:RuleElement index="N196C78405B511D880008CD5D1F4FA98" name="sourceComponentId">
>             <parser:RuleAttribute defaultValue="Windows" index="N6FFE39105B511D880008CD5D1F4FA98" name="component" usePreviousMatchSubstitutionAsDefault="false"/>
>@@ -107,12 +107,12 @@
>       <cc:Outputter description="Static Parser Outputter" uniqueID="AdapterCBEOutputterID3" type="StandardOutOutputter">
>         <op:StandardOutOutputterType/>
>       </cc:Outputter>
>-      <cc:Outputter description="CBE File Outputter" uniqueID="NABC73C10EA011DB8000DF587DEE0353" disabled="true" type="SingleFileOutputter">
>+      <cc:Outputter description="CBE File Outputter" disabled="true" uniqueID="NABC73C10EA011DB8000DF587DEE0353" type="SingleFileOutputter">
>         <pu:Property propertyName="directory" propertyValue="."/>
>         <pu:Property propertyName="fileName" propertyValue="system.out"/>
>         <op:SingleFileOutputterType directory="." fileName="system.out"/>
>       </cc:Outputter>
>-      <cc:Outputter description="CBE Logging Agent Outputter" uniqueID="NC66C8680EA011DB8000DF587DEE0353" disabled="true" type="LoggingAgentOutputter">
>+      <cc:Outputter description="CBE Logging Agent Outputter" disabled="true" uniqueID="NC66C8680EA011DB8000DF587DEE0353" type="LoggingAgentOutputter">
>         <pu:Property propertyName="agentName" propertyValue="Default CBE Logging Agent"/>
>         <op:LoggingAgentOutputterType agentName="Default CBE Logging Agent"/>
>       </cc:Outputter>
>Index: config/Windows/security/regex_example.adapter
>===================================================================
>RCS file: /cvsroot/tptp/monitoring/org.eclipse.hyades.logging.parsers/config/Windows/security/regex_example.adapter,v
>retrieving revision 1.7
>diff -u -r1.7 regex_example.adapter
>--- config/Windows/security/regex_example.adapter	12 May 2006 19:19:17 -0000	1.7
>+++ config/Windows/security/regex_example.adapter	10 Apr 2007 04:39:15 -0000
>@@ -28,8 +28,8 @@
>         <pu:Property propertyName="converter" propertyValue="&quot;eventlogreader.exe&quot; security .\error.log"/>
>         <sensor:SingleFileSensor converter="&quot;eventlogreader.exe&quot; security .\error.log" directory="." fileName="error.log"/>
>       </cc:Sensor>
>-      <ex:Extractor containsLineBreaks="true" description="This extractor uses regular expression  patterns to identify record delimiters" endPattern="" includeEndPattern="false" includeStartPattern="true" lineBreakSymbol="" replaceLineBreaks="false" startPattern="RecordNumber:" uniqueID="N513CE9005B511D880008CD5D1F4FA98"/>
>-      <cc:Parser designationToken=":" separatorToken=";" uniqueID="N5218A3005B511D880008CD5D1F4FA98">
>+      <ex:Extractor description="This extractor uses regular expression  patterns to identify record delimiters" uniqueID="N513CE9005B511D880008CD5D1F4FA98" containsLineBreaks="true" endPattern="" includeEndPattern="false" includeStartPattern="true" lineBreakSymbol="" replaceLineBreaks="false" startPattern="RecordNumber:"/>
>+      <cc:Parser designationToken=":" separatorToken="@;@" uniqueID="N5218A3005B511D880008CD5D1F4FA98">
>         <parser:RuleElement index="N5218A3105B511D880008CD5D1F4FA98" name="CommonBaseEvent">
>           <parser:RuleElement index="N196C78405B511D880008CD5D1F4FA98" name="sourceComponentId">
>             <parser:RuleAttribute defaultValue="Windows" index="N6FFE39105B511D880008CD5D1F4FA98" name="component" usePreviousMatchSubstitutionAsDefault="false"/>
>Index: config/Windows/security/regex.adapter
>===================================================================
>RCS file: /cvsroot/tptp/monitoring/org.eclipse.hyades.logging.parsers/config/Windows/security/regex.adapter,v
>retrieving revision 1.11
>diff -u -r1.11 regex.adapter
>--- config/Windows/security/regex.adapter	11 Mar 2007 06:35:08 -0000	1.11
>+++ config/Windows/security/regex.adapter	10 Apr 2007 04:39:14 -0000
>@@ -30,8 +30,8 @@
>         <pu:Property propertyName="converter" propertyValue="&quot;eventlogreader.exe&quot; security error.log"/>
>         <sensor:SingleFileSensor converter="&quot;eventlogreader.exe&quot; security error.log" directory="." fileName="error.log"/>
>       </cc:Sensor>
>-      <ex:Extractor containsLineBreaks="true" description="This extractor uses regular expression  patterns to identify record delimiters" endPattern="" includeEndPattern="false" includeStartPattern="true" lineBreakSymbol="" replaceLineBreaks="false" startPattern="RecordNumber:" uniqueID="N513CE9005B511D880008CD5D1F4FA98"/>
>-      <cc:Parser designationToken=":" separatorToken=";" uniqueID="N5218A3005B511D880008CD5D1F4FA98">
>+      <ex:Extractor description="This extractor uses regular expression  patterns to identify record delimiters" uniqueID="N513CE9005B511D880008CD5D1F4FA98" containsLineBreaks="true" endPattern="" includeEndPattern="false" includeStartPattern="true" lineBreakSymbol="" replaceLineBreaks="false" startPattern="RecordNumber:"/>
>+      <cc:Parser designationToken=":" separatorToken="@;@" uniqueID="N5218A3005B511D880008CD5D1F4FA98">
>         <parser:RuleElement index="N5218A3105B511D880008CD5D1F4FA98" name="CommonBaseEvent">
>           <parser:RuleElement index="N196C78405B511D880008CD5D1F4FA98" name="sourceComponentId">
>             <parser:RuleAttribute defaultValue="Windows" index="N6FFE39105B511D880008CD5D1F4FA98" name="component" usePreviousMatchSubstitutionAsDefault="false"/>
>@@ -107,12 +107,12 @@
>       <cc:Outputter description="Static Parser Outputter" uniqueID="AdapterCBEOutputterID3" type="StandardOutOutputter">
>         <op:StandardOutOutputterType/>
>       </cc:Outputter>
>-      <cc:Outputter description="CBE File Outputter" uniqueID="NAE64A180E9F11DB8000DF587DEE0353" disabled="true" type="SingleFileOutputter">
>+      <cc:Outputter description="CBE File Outputter" disabled="true" uniqueID="NAE64A180E9F11DB8000DF587DEE0353" type="SingleFileOutputter">
>         <pu:Property propertyName="directory" propertyValue="."/>
>         <pu:Property propertyName="fileName" propertyValue="security.out"/>
>         <op:SingleFileOutputterType directory="." fileName="security.out"/>
>       </cc:Outputter>
>-      <cc:Outputter description="CBE Logging Agent Outputter" uniqueID="NC9FE0F80E9F11DB8000DF587DEE0353" disabled="true" type="LoggingAgentOutputter">
>+      <cc:Outputter description="CBE Logging Agent Outputter" disabled="true" uniqueID="NC9FE0F80E9F11DB8000DF587DEE0353" type="LoggingAgentOutputter">
>         <pu:Property propertyName="agentName" propertyValue="Default CBE Logging Agent"/>
>         <op:LoggingAgentOutputterType agentName="Default CBE Logging Agent"/>
>       </cc:Outputter>
>Index: config/Windows/security/nl/regex.adapter
>===================================================================
>RCS file: /cvsroot/tptp/monitoring/org.eclipse.hyades.logging.parsers/config/Windows/security/nl/regex.adapter,v
>retrieving revision 1.6
>diff -u -r1.6 regex.adapter
>--- config/Windows/security/nl/regex.adapter	11 Mar 2007 06:35:07 -0000	1.6
>+++ config/Windows/security/nl/regex.adapter	10 Apr 2007 04:39:15 -0000
>@@ -30,8 +30,8 @@
>         <pu:Property propertyName="converter" propertyValue="&quot;eventlogreader.exe&quot; security error.log"/>
>         <sensor:SingleFileSensor converter="&quot;eventlogreader.exe&quot; security error.log" directory="." fileName="error.log"/>
>       </cc:Sensor>
>-      <ex:Extractor containsLineBreaks="true" description="This extractor uses regular expression  patterns to identify record delimiters" endPattern="" includeEndPattern="false" includeStartPattern="true" lineBreakSymbol="" replaceLineBreaks="false" startPattern="RecordNumber:" uniqueID="N513CE9005B511D880008CD5D1F4FA98"/>
>-      <cc:Parser designationToken=":" separatorToken=";" uniqueID="N5218A3005B511D880008CD5D1F4FA98">
>+      <ex:Extractor description="This extractor uses regular expression  patterns to identify record delimiters" uniqueID="N513CE9005B511D880008CD5D1F4FA98" containsLineBreaks="true" endPattern="" includeEndPattern="false" includeStartPattern="true" lineBreakSymbol="" replaceLineBreaks="false" startPattern="RecordNumber:"/>
>+      <cc:Parser designationToken=":" separatorToken="@;@" uniqueID="N5218A3005B511D880008CD5D1F4FA98">
>         <parser:RuleElement index="N5218A3105B511D880008CD5D1F4FA98" name="CommonBaseEvent">
>           <parser:RuleElement index="N196C78405B511D880008CD5D1F4FA98" name="sourceComponentId">
>             <parser:RuleAttribute defaultValue="Windows" index="N6FFE39105B511D880008CD5D1F4FA98" name="component" usePreviousMatchSubstitutionAsDefault="false"/>
>@@ -107,12 +107,12 @@
>       <cc:Outputter description="Static Parser Outputter" uniqueID="AdapterCBEOutputterID3" type="StandardOutOutputter">
>         <op:StandardOutOutputterType/>
>       </cc:Outputter>
>-      <cc:Outputter description="CBE File Outputter" uniqueID="NAE64A180E9F11DB8000DF587DEE0353" disabled="true" type="SingleFileOutputter">
>+      <cc:Outputter description="CBE File Outputter" disabled="true" uniqueID="NAE64A180E9F11DB8000DF587DEE0353" type="SingleFileOutputter">
>         <pu:Property propertyName="directory" propertyValue="."/>
>         <pu:Property propertyName="fileName" propertyValue="security.out"/>
>         <op:SingleFileOutputterType directory="." fileName="security.out"/>
>       </cc:Outputter>
>-      <cc:Outputter description="CBE Logging Agent Outputter" uniqueID="NC9FE0F80E9F11DB8000DF587DEE0353" disabled="true" type="LoggingAgentOutputter">
>+      <cc:Outputter description="CBE Logging Agent Outputter" disabled="true" uniqueID="NC9FE0F80E9F11DB8000DF587DEE0353" type="LoggingAgentOutputter">
>         <pu:Property propertyName="agentName" propertyValue="Default CBE Logging Agent"/>
>         <op:LoggingAgentOutputterType agentName="Default CBE Logging Agent"/>
>       </cc:Outputter>
>Index: src.native/converters/Reader.cpp
>===================================================================
>RCS file: /cvsroot/tptp/monitoring/org.eclipse.hyades.logging.parsers/src.native/converters/Reader.cpp,v
>retrieving revision 1.8
>diff -u -r1.8 Reader.cpp
>--- src.native/converters/Reader.cpp	16 Jun 2006 18:32:16 -0000	1.8
>+++ src.native/converters/Reader.cpp	10 Apr 2007 04:39:16 -0000
>@@ -36,6 +36,7 @@
> const LPSTR cLocationTypePref = "LocationType: ";
> const LPSTR cLocationType = "Hostname";
> const LPSTR cMessagesPref = "Message: ";
>+const LPSTR cSeparatorToken = "@;@";
> 
> const LPSTR cErrorHeader = "<ACADErrorHeader>";
> 
>@@ -243,12 +244,12 @@
> 	DWORD dwMSB16Zeros = 65535; // this double word variable has its first 16 bits as zero and the remaining as 1
> 	dwEventId &= dwMSB16Zeros;
> 
>-	if(printf("%s%d;\t%s%d;\t%s%s;\t%s%s;\t%s%d;\t%s%08X;\t%s%s;\t%s%s;\t%s%s;\t%s%s;\n" ,cRecordNumberPref,
>-		pevlr->RecordNumber, cEventTypePref, CBEseverity, cCreationTimePref,time,
>-		cSourceComponentPref, (LPSTR) ((LPBYTE) pevlr + sizeof(EVENTLOGRECORD)),
>-		cEventCategoryPref, pevlr->EventCategory, cEventIDPref, dwEventId,
>-		cUsernamePref, username, cComputerNamePref, compName, cLocationTypePref, cLocationType,
>-		cMessagesPref, stringsBuffer) < 0)
>+	if(printf("%s%d%s\t%s%d%s\t%s%s%s\t%s%s%s\t%s%d%s\t%s%08X%s\t%s%s%s\t%s%s%s\t%s%s%s\t%s%s%s\n" ,cRecordNumberPref,
>+		pevlr->RecordNumber, cSeparatorToken,cEventTypePref, CBEseverity,cSeparatorToken, cCreationTimePref,time,cSeparatorToken,
>+		cSourceComponentPref, (LPSTR) ((LPBYTE) pevlr + sizeof(EVENTLOGRECORD)),cSeparatorToken,
>+		cEventCategoryPref, pevlr->EventCategory,cSeparatorToken, cEventIDPref, dwEventId,cSeparatorToken,
>+		cUsernamePref, username,cSeparatorToken, cComputerNamePref, compName, cSeparatorToken,cLocationTypePref, cLocationType,cSeparatorToken,
>+		cMessagesPref, stringsBuffer,cSeparatorToken) < 0)
> 	{
> 		error("Failed to write event to output");
> 		return FALSE;
>@@ -256,12 +257,12 @@
> 
> 
> 	if(fpOut)
>-	if(fprintf(fpOut, "%s%d;\t%s%d;\t%s%s;\t%s%s;\t%s%d;\t%s%08X;\t%s%s;\t%s%s;\t%s%s;\t%s%s;\n" ,cRecordNumberPref,
>-		pevlr->RecordNumber, cEventTypePref, CBEseverity, cCreationTimePref,time,
>-		cSourceComponentPref, (LPSTR) ((LPBYTE) pevlr + sizeof(EVENTLOGRECORD)),
>-		cEventCategoryPref, pevlr->EventCategory, cEventIDPref, dwEventId,
>-		cUsernamePref, username, cComputerNamePref, compName, cLocationTypePref, cLocationType,
>-		cMessagesPref, stringsBuffer) < 0)
>+	if(fprintf(fpOut, "%s%d%s\t%s%d%s\t%s%s%s\t%s%s%s\t%s%d%s\t%s%08X%s\t%s%s%s\t%s%s%s\t%s%s%s\t%s%s%s\n" ,cRecordNumberPref,
>+		pevlr->RecordNumber, cSeparatorToken,cEventTypePref, CBEseverity,cSeparatorToken, cCreationTimePref,time,cSeparatorToken,
>+		cSourceComponentPref, (LPSTR) ((LPBYTE) pevlr + sizeof(EVENTLOGRECORD)),cSeparatorToken,
>+		cEventCategoryPref, pevlr->EventCategory,cSeparatorToken, cEventIDPref, dwEventId,cSeparatorToken,
>+		cUsernamePref, username,cSeparatorToken, cComputerNamePref, compName, cSeparatorToken,cLocationTypePref, cLocationType,cSeparatorToken,
>+		cMessagesPref, stringsBuffer,cSeparatorToken) < 0)
> 	{
> 		error("Failed to write event to output file");
> 		return FALSE;
>Index: config/Windows/system/nl/regex.adapter
>===================================================================
>RCS file: /cvsroot/tptp/monitoring/org.eclipse.hyades.logging.parsers/config/Windows/system/nl/regex.adapter,v
>retrieving revision 1.6
>diff -u -r1.6 regex.adapter
>--- config/Windows/system/nl/regex.adapter	11 Mar 2007 06:35:08 -0000	1.6
>+++ config/Windows/system/nl/regex.adapter	10 Apr 2007 04:39:16 -0000
>@@ -30,8 +30,8 @@
>         <pu:Property propertyName="converter" propertyValue="&quot;eventlogreader.exe&quot; system error.log"/>
>         <sensor:SingleFileSensor converter="&quot;eventlogreader.exe&quot; system error.log" directory="." fileName="error.log"/>
>       </cc:Sensor>
>-      <ex:Extractor containsLineBreaks="true" description="This extractor uses regular expression  patterns to identify record delimiters" endPattern="" includeEndPattern="false" includeStartPattern="true" lineBreakSymbol="" replaceLineBreaks="false" startPattern="RecordNumber:" uniqueID="N513CE9005B511D880008CD5D1F4FA98"/>
>-      <cc:Parser designationToken=":" separatorToken=";" uniqueID="N5218A3005B511D880008CD5D1F4FA98">
>+      <ex:Extractor description="This extractor uses regular expression  patterns to identify record delimiters" uniqueID="N513CE9005B511D880008CD5D1F4FA98" containsLineBreaks="true" endPattern="" includeEndPattern="false" includeStartPattern="true" lineBreakSymbol="" replaceLineBreaks="false" startPattern="RecordNumber:"/>
>+      <cc:Parser designationToken=":" separatorToken="@;@" uniqueID="N5218A3005B511D880008CD5D1F4FA98">
>         <parser:RuleElement index="N5218A3105B511D880008CD5D1F4FA98" name="CommonBaseEvent">
>           <parser:RuleElement index="N196C78405B511D880008CD5D1F4FA98" name="sourceComponentId">
>             <parser:RuleAttribute defaultValue="Windows" index="N6FFE39105B511D880008CD5D1F4FA98" name="component" usePreviousMatchSubstitutionAsDefault="false"/>
>@@ -107,12 +107,12 @@
>       <cc:Outputter description="Static Parser Outputter" uniqueID="AdapterCBEOutputterID3" type="StandardOutOutputter">
>         <op:StandardOutOutputterType/>
>       </cc:Outputter>
>-      <cc:Outputter description="CBE File Outputter" uniqueID="NABC73C10EA011DB8000DF587DEE0353" disabled="true" type="SingleFileOutputter">
>+      <cc:Outputter description="CBE File Outputter" disabled="true" uniqueID="NABC73C10EA011DB8000DF587DEE0353" type="SingleFileOutputter">
>         <pu:Property propertyName="directory" propertyValue="."/>
>         <pu:Property propertyName="fileName" propertyValue="system.out"/>
>         <op:SingleFileOutputterType directory="." fileName="system.out"/>
>       </cc:Outputter>
>-      <cc:Outputter description="CBE Logging Agent Outputter" uniqueID="NC66C8680EA011DB8000DF587DEE0353" disabled="true" type="LoggingAgentOutputter">
>+      <cc:Outputter description="CBE Logging Agent Outputter" disabled="true" uniqueID="NC66C8680EA011DB8000DF587DEE0353" type="LoggingAgentOutputter">
>         <pu:Property propertyName="agentName" propertyValue="Default CBE Logging Agent"/>
>         <op:LoggingAgentOutputterType agentName="Default CBE Logging Agent"/>
>       </cc:Outputter>

Actions: View | Diff

Attachments on bug 160726: 63307