26. Araxis Merge File Comparison Report

Produced by Araxis Merge on Fri Nov 21 17:21:43 2008 UTC. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a reasonably standards compliant browser such as the latest version of Firefox or Internet Explorer. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.

26.1 Files compared

# Location File Last Modified
1 C:\Documents and Settings\allums\Desktop\2008.1.20396.b\Formats\Oracle Help\Transforms oraclehelp_runtime.xsl Fri Aug 26 23:37:54 2005 UTC
2 C:\Documents and Settings\allums\Desktop\2008.2.20597.p2\Formats\Oracle Help\Transforms oraclehelp_runtime.xsl Thu Jul 31 22:36:16 2008 UTC

26.2 Comparison summary

Description Between
Files 1 and 2
Text Blocks Lines
Unchanged 2 194
Changed 1 4
Inserted 0 0
Removed 0 0

26.3 Comparison options

Whitespace Differences in whitespace are significant
Character case Differences in character case are significant
Line endings Differences in line endings (CR and LF characters) are ignored
CR/LF characters Not shown in the comparison detail

26.4 Active regular expressions

Expression Description
\$(Author|Date|Header|Id|Locker|Name|RCSfile|Revision|Source|State):[^$]*\$ CVS comments

26.5 Comparison detail

1   <?xml vers ion="1.0"  encoding=" UTF-8"?>   1   <?xml vers ion="1.0"  encoding=" UTF-8"?>
2   <xsl:style sheet vers ion="1.0"  xmlns:xsl= "http://ww w.w3.org/1 999/XSL/Tr ansform"   2   <xsl:style sheet vers ion="1.0"  xmlns:xsl= "http://ww w.w3.org/1 999/XSL/Tr ansform"
3                                    xmlns:msxs l="urn:sch emas-micro soft-com:x slt"   3                                    xmlns:msxs l="urn:sch emas-micro soft-com:x slt"
4                                    xmlns:wwmo de="urn:We bWorks-Eng ine-Mode"   4                                    xmlns:wwmo de="urn:We bWorks-Eng ine-Mode"
5                                    xmlns:wwfi les="urn:W ebWorks-En gine-Files -Schema"   5                                    xmlns:wwfi les="urn:W ebWorks-En gine-Files -Schema"
6                                    xmlns:wwdo c="urn:Web Works-Docu ment-Schem a"   6                                    xmlns:wwdo c="urn:Web Works-Docu ment-Schem a"
7                                    xmlns:wwsp lits="urn: WebWorks-E ngine-Spli ts-Schema"   7                                    xmlns:wwsp lits="urn: WebWorks-E ngine-Spli ts-Schema"
8                                    xmlns:wwpr oject="urn :WebWorks- Publish-Pr oject"   8                                    xmlns:wwpr oject="urn :WebWorks- Publish-Pr oject"
9                                    xmlns:wwpr ogress="ur n:WebWorks -XSLT-Exte nsion-Prog ress"   9                                    xmlns:wwpr ogress="ur n:WebWorks -XSLT-Exte nsion-Prog ress"
10                                    xmlns:wwlo g="urn:Web Works-XSLT -Extension -Log"   10                                    xmlns:wwlo g="urn:Web Works-XSLT -Extension -Log"
11                                    xmlns:wwfi lesystem=" urn:WebWor ks-XSLT-Ex tension-Fi leSystem"   11                                    xmlns:wwfi lesystem=" urn:WebWor ks-XSLT-Ex tension-Fi leSystem"
12                                    xmlns:wwur i="urn:Web Works-XSLT -Extension -URI"   12                                    xmlns:wwur i="urn:Web Works-XSLT -Extension -URI"
13                                    xmlns:wwst ring="urn: WebWorks-X SLT-Extens ion-String Utilities"   13                                    xmlns:wwst ring="urn: WebWorks-X SLT-Extens ion-String Utilities"
14                                    xmlns:wwun its="urn:W ebWorks-XS LT-Extensi on-Units"   14                                    xmlns:wwun its="urn:W ebWorks-XS LT-Extensi on-Units"
15                                    xmlns:wwfi lesext="ur n:WebWorks -XSLT-Exte nsion-File s"   15                                    xmlns:wwfi lesext="ur n:WebWorks -XSLT-Exte nsion-File s"
16                                    xmlns:wwpr ojext="urn :WebWorks- XSLT-Exten sion-Proje ct"   16                                    xmlns:wwpr ojext="urn :WebWorks- XSLT-Exten sion-Proje ct"
17                                    xmlns:wwex sldoc="urn :WebWorks- XSLT-Exten sion-Docum ent"   17                                    xmlns:wwex sldoc="urn :WebWorks- XSLT-Exten sion-Docum ent"
18                                    xmlns:wwex ec="urn:We bWorks-XSL T-Extensio n-Execute"   18                                    xmlns:wwex ec="urn:We bWorks-XSL T-Extensio n-Execute"
19                                    xmlns:wwen v="urn:Web Works-XSLT -Extension -Environme nt"   19                                    xmlns:wwen v="urn:Web Works-XSLT -Extension -Environme nt"
20                                    exclude-re sult-prefi xes="xsl m sxsl wwmod e wwfiles  wwdoc wwsp lits wwpro ject wwpro gress wwlo g wwfilesy stem wwuri  wwstring  wwunits ww filesext w wprojext w wexsldoc w wexec wwen v"   20                                    exclude-re sult-prefi xes="xsl m sxsl wwmod e wwfiles  wwdoc wwsp lits wwpro ject wwpro gress wwlo g wwfilesy stem wwuri  wwstring  wwunits ww filesext w wprojext w wexsldoc w wexec wwen v"
21   >   21   >
22    <xsl:para m name="Gl obalInput"  />   22    <xsl:para m name="Gl obalInput"  />
23    <xsl:para m name="Gl obalPipeli neName" />   23    <xsl:para m name="Gl obalPipeli neName" />
24    <xsl:para m name="Gl obalProjec t" />   24    <xsl:para m name="Gl obalProjec t" />
25    <xsl:para m name="Gl obalFiles"  />   25    <xsl:para m name="Gl obalFiles"  />
26    <xsl:para m name="Pa rameterTyp e" />   26    <xsl:para m name="Pa rameterTyp e" />
27    <xsl:para m name="Pa rameterCat egory" />   27    <xsl:para m name="Pa rameterCat egory" />
28    <xsl:para m name="Pa rameterUse " />   28    <xsl:para m name="Pa rameterUse " />
29    <xsl:para m name="Pa rameterDep loy" />   29    <xsl:para m name="Pa rameterDep loy" />
30     30  
31     31  
32    <xsl:outp ut method= "xml" enco ding="UTF- 8" indent= "yes" />   32    <xsl:outp ut method= "xml" enco ding="UTF- 8" indent= "yes" />
33    <xsl:stri p-space el ements="*"  />   33    <xsl:stri p-space el ements="*"  />
34     34  
35    <xsl:vari able name= "GlobalAct ionChecksu m">   35    <xsl:vari able name= "GlobalAct ionChecksu m">
36     <xsl:var iable name ="VarTrans formChecks ums">   36     <xsl:var iable name ="VarTrans formChecks ums">
37      <xsl:va lue-of sel ect="conca t(wwuri:As FilePath(' wwtransfor m:self'),  ':', wwfil esystem:Ge tChecksum( wwuri:AsFi lePath('ww transform: self')))"  />   37      <xsl:va lue-of sel ect="conca t(wwuri:As FilePath(' wwtransfor m:self'),  ':', wwfil esystem:Ge tChecksum( wwuri:AsFi lePath('ww transform: self')))"  />
38     </xsl:va riable>   38     </xsl:va riable>
39     <xsl:val ue-of sele ct="wwstri ng:MD5Chec ksum($VarT ransformCh ecksums)"  />   39     <xsl:val ue-of sele ct="wwstri ng:MD5Chec ksum($VarT ransformCh ecksums)"  />
40    </xsl:var iable>   40    </xsl:var iable>
41     41  
42     42  
43    <xsl:temp late match ="/">   43    <xsl:temp late match ="/">
44     <wwfiles :Files ver sion="1.0" >   44     <wwfiles :Files ver sion="1.0" >
45     45  
46      <!-- Se t OracleHe lp path -- >   46      <!-- Se t OracleHe lp path -- >
47      <!--                       -- >   47      <!--                       -- >
48      <xsl:va riable nam e="VarOrac leHelpPath " select=" wwprojext: GetFormatS etting('lo cal-ohelp- location',  wwuri:AsF ilePath('w whelper:oh elp'))" />   48      <xsl:va riable nam e="VarOrac leHelpPath " select=" wwprojext: GetFormatS etting('lo cal-ohelp- location',  wwuri:AsF ilePath('w whelper:oh elp'))" />
49     49  
50      <!-- At  least one  group def ined? -->   50      <!-- At  least one  group def ined? -->
51      <!--                                -->   51      <!--                                -->
52      <xsl:fo r-each sel ect="$Glob alProject/ wwproject: Project/ww project:Gr oups/wwpro ject:Group [1]">   52      <xsl:fo r-each sel ect="$Glob alProject/ wwproject: Project/ww project:Gr oups/wwpro ject:Group [1]">
53       <!-- R untime Jar s -->   53       <!-- R untime Jar s -->
54       <!--                -->   54       <!--                -->
55       <xsl:c all-templa te name="C opyRuntime File">   55       <xsl:c all-templa te name="C opyRuntime File">
56        <xsl: with-param  name="Par amSourceFi lePath" se lect="wwur i:AsFilePa th('wwhelp er:Librari es/java/ru njar.jar') " />   56        <xsl: with-param  name="Par amSourceFi lePath" se lect="wwur i:AsFilePa th('wwhelp er:Librari es/java/ru njar.jar') " />
57        <xsl: with-param  name="Par amDestinat ionFilePat h" select= "wwfilesys tem:Combin e(wwprojex t:GetTarge tOutputDir ectoryPath (), 'runja r.jar')" / >   57        <xsl: with-param  name="Par amDestinat ionFilePat h" select= "wwfilesys tem:Combin e(wwprojex t:GetTarge tOutputDir ectoryPath (), 'runja r.jar')" / >
58       </xsl: call-templ ate>   58       </xsl: call-templ ate>
59     59  
60       <xsl:c all-templa te name="C opyRuntime File">   60       <xsl:c all-templa te name="C opyRuntime File">
61        <xsl: with-param  name="Par amSourceFi lePath" se lect="wwur i:AsFilePa th('wwhelp er:Librari es/java/oh viewer.jar ')" />   61        <xsl: with-param  name="Par amSourceFi lePath" se lect="wwur i:AsFilePa th('wwhelp er:Librari es/java/oh viewer.jar ')" />
62        <xsl: with-param  name="Par amDestinat ionFilePat h" select= "wwfilesys tem:Combin e(wwprojex t:GetTarge tOutputDir ectoryPath (), 'ohvie wer.jar')"  />   62        <xsl: with-param  name="Par amDestinat ionFilePat h" select= "wwfilesys tem:Combin e(wwprojex t:GetTarge tOutputDir ectoryPath (), 'ohvie wer.jar')"  />
63       </xsl: call-templ ate>   63       </xsl: call-templ ate>
64     64  
65       <xsl:c all-templa te name="C opyRuntime File">   65       <xsl:c all-templa te name="C opyRuntime File">
66        <xsl: with-param  name="Par amSourceFi lePath" se lect="wwfi lesystem:C ombine($Va rOracleHel pPath, 'he lp4.jar')"  />   66        <xsl: with-param  name="Par amSourceFi lePath" se lect="wwfi lesystem:C ombine($Va rOracleHel pPath, 'he lp4.jar')"  />
67        <xsl: with-param  name="Par amDestinat ionFilePat h" select= "wwfilesys tem:Combin e(wwprojex t:GetTarge tOutputDir ectoryPath (), 'help4 .jar')" />   67        <xsl: with-param  name="Par amDestinat ionFilePat h" select= "wwfilesys tem:Combin e(wwprojex t:GetTarge tOutputDir ectoryPath (), 'help4 .jar')" />
68       </xsl: call-templ ate>   68       </xsl: call-templ ate>
69     69  
70       <xsl:c all-templa te name="C opyRuntime File">   70       <xsl:c all-templa te name="C opyRuntime File">
71        <xsl: with-param  name="Par amSourceFi lePath" se lect="wwfi lesystem:C ombine($Va rOracleHel pPath, 'oh j-jewt.jar ')" />   71        <xsl: with-param  name="Par amSourceFi lePath" se lect="wwfi lesystem:C ombine($Va rOracleHel pPath, 'oh j-jewt.jar ')" />
72        <xsl: with-param  name="Par amDestinat ionFilePat h" select= "wwfilesys tem:Combin e(wwprojex t:GetTarge tOutputDir ectoryPath (), 'ohj-j ewt.jar')"  />   72        <xsl: with-param  name="Par amDestinat ionFilePat h" select= "wwfilesys tem:Combin e(wwprojex t:GetTarge tOutputDir ectoryPath (), 'ohj-j ewt.jar')"  />
73       </xsl: call-templ ate>   73       </xsl: call-templ ate>
74     74  
75       <xsl:c all-templa te name="C opyRuntime File">   75       <xsl:c all-templa te name="C opyRuntime File">
76        <xsl: with-param  name="Par amSourceFi lePath" se lect="wwfi lesystem:C ombine($Va rOracleHel pPath, 'or acle_ice 5 .jar')" />   76        <xsl: with-param  name="Par amSourceFi lePath" se lect="wwfi lesystem:C ombine($Va rOracleHel pPath, 'or acle_ice
.jar')" />
77        <xsl: with-param  name="Par amDestinat ionFilePat h" select= "wwfilesys tem:Combin e(wwprojex t:GetTarge tOutputDir ectoryPath (), 'oracl e_ice 5 .jar')" />   77        <xsl: with-param  name="Par amDestinat ionFilePat h" select= "wwfilesys tem:Combin e(wwprojex t:GetTarge tOutputDir ectoryPath (), 'oracl e_ice
.jar')" />
78       </xsl: call-templ ate>   78       </xsl: call-templ ate>
79      </xsl:f or-each>   79      </xsl:f or-each>
80     80  
81     </wwfile s:Files>   81     </wwfile s:Files>
82    </xsl:tem plate>   82    </xsl:tem plate>
83     83  
84     84  
85    <xsl:temp late name= "CopyRunti meFile">   85    <xsl:temp late name= "CopyRunti meFile">
86     <xsl:par am name="P aramSource FilePath"  />   86     <xsl:par am name="P aramSource FilePath"  />
87     <xsl:par am name="P aramDestin ationFileP ath" />   87     <xsl:par am name="P aramDestin ationFileP ath" />
88     88  
89     <xsl:var iable name ="VarUpToD ate" selec t="wwfiles ext:UpToDa te($ParamD estination FilePath,  $ParamSour ceFilePath , '', '',  $GlobalAct ionChecksu m)" />   89     <xsl:var iable name ="VarUpToD ate" selec t="wwfiles ext:UpToDa te($ParamD estination FilePath,  $ParamSour ceFilePath , '', '',  $GlobalAct ionChecksu m)" />
90     <xsl:if  test="not( $VarUpToDa te)">   90     <xsl:if  test="not( $VarUpToDa te)">
91      <xsl:va riable nam e="VarIgno re">   91      <xsl:va riable nam e="VarIgno re">
92       <xsl:v alue-of se lect="wwfi lesystem:C opyFile($P aramSource FilePath,  $ParamDest inationFil ePath)" />   92       <xsl:v alue-of se lect="wwfi lesystem:C opyFile($P aramSource FilePath,  $ParamDest inationFil ePath)" />
93      </xsl:v ariable>   93      </xsl:v ariable>
94     </xsl:if >   94     </xsl:if >
95     <wwfiles :File path ="{$ParamD estination FilePath}"  type="{$P arameterTy pe}" check sum="{wwfi lesystem:G etChecksum ($ParamDes tinationFi lePath)}"  projectche cksum="" g roupID=""  documentID ="" action checksum=" {$GlobalAc tionChecks um}" categ ory="{$Par ameterCate gory}" use ="{$Parame terUse}" d eploy="{$P arameterDe ploy}">   95     <wwfiles :File path ="{$ParamD estination FilePath}"  type="{$P arameterTy pe}" check sum="{wwfi lesystem:G etChecksum ($ParamDes tinationFi lePath)}"  projectche cksum="" g roupID=""  documentID ="" action checksum=" {$GlobalAc tionChecks um}" categ ory="{$Par ameterCate gory}" use ="{$Parame terUse}" d eploy="{$P arameterDe ploy}">
96      <wwfile s:Depends  path="{$Pa ramSourceF ilePath}"  checksum=" {wwfilesys tem:GetChe cksum($Par amSourceFi lePath)}"  groupID=""  documentI D="" />   96      <wwfile s:Depends  path="{$Pa ramSourceF ilePath}"  checksum=" {wwfilesys tem:GetChe cksum($Par amSourceFi lePath)}"  groupID=""  documentI D="" />
97     </wwfile s:File>   97     </wwfile s:File>
98    </xsl:tem plate>   98    </xsl:tem plate>
99   </xsl:styl esheet>   99   </xsl:styl esheet>