5. Araxis Merge File Comparison Report

Produced by Araxis Merge on Thu Oct 16 22:29:52 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.

5.1 Files compared

# Location File Last Modified
1 C:\Documents and Settings\lauren\Desktop\ww-version-snapshots\ww-version-snapshots\2008.2\WebWorks\ePublisher Pro\Formats\Eclipse Help\Transforms eclipsehelp_view.xsl Fri Jul 4 07:21:34 2008 UTC
2 C:\Documents and Settings\lauren\Desktop\ww-version-snapshots\ww-version-snapshots\2008.3\WebWorks\ePublisher Pro\Formats\Eclipse Help\Transforms eclipsehelp_view.xsl Mon Oct 13 05:51:52 2008 UTC

5.2 Comparison summary

Description Between
Files 1 and 2
Text Blocks Lines
Unchanged 4 322
Changed 0 0
Inserted 3 10
Removed 0 0

5.3 Comparison options

Whitespace All differences in whitespace within lines are ignored
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

5.4 Active regular expressions

No regular expressions were active.

5.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 rameterDep endsType"  />   26    <xsl:para m name="Pa rameterDep endsType"  />
27    <xsl:para m name="Pa rameterTyp e" />   27    <xsl:para m name="Pa rameterTyp e" />
28    <xsl:para m name="Pa rameterCat egory" />   28    <xsl:para m name="Pa rameterCat egory" />
29    <xsl:para m name="Pa rameterUse " />   29    <xsl:para m name="Pa rameterUse " />
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:key  name="wwfi les-files- by-type" m atch="wwfi les:File"  use="@type " />   35    <xsl:key  name="wwfi les-files- by-type" m atch="wwfi les:File"  use="@type " />
36     36  
37    <xsl:vari able name= "GlobalAct ionChecksu m">   37    <xsl:vari able name= "GlobalAct ionChecksu m">
38     <xsl:var iable name ="VarTrans formChecks ums">   38     <xsl:var iable name ="VarTrans formChecks ums">
39      <xsl:va lue-of sel ect="conca t(wwuri:As FilePath(' wwtransfor m:self'),  ':', wwfil esystem:Ge tChecksum( wwuri:AsFi lePath('ww transform: self')))"  />   39      <xsl:va lue-of sel ect="conca t(wwuri:As FilePath(' wwtransfor m:self'),  ':', wwfil esystem:Ge tChecksum( wwuri:AsFi lePath('ww transform: self')))"  />
40     </xsl:va riable>   40     </xsl:va riable>
41     <xsl:val ue-of sele ct="wwstri ng:MD5Chec ksum($VarT ransformCh ecksums)"  />   41     <xsl:val ue-of sele ct="wwstri ng:MD5Chec ksum($VarT ransformCh ecksums)"  />
42    </xsl:var iable>   42    </xsl:var iable>
43     43  
44     44  
45    <xsl:temp late match ="/">   45    <xsl:temp late match ="/">
46     <wwfiles :Files ver sion="1.0" >   46     <wwfiles :Files ver sion="1.0" >
47     47  
48      <xsl:va riable nam e="VarProj ectGroups"  select="$ GlobalProj ect/wwproj ect:Projec t/wwprojec t:Groups/w wproject:G roup" />   48      <xsl:va riable nam e="VarProj ectGroups"  select="$ GlobalProj ect/wwproj ect:Projec t/wwprojec t:Groups/w wproject:G roup" />
49      <xsl:va riable nam e="VarProg ressStartG roups" sel ect="wwpro gress:Star t(count($V arProjectG roups))" / >   49      <xsl:va riable nam e="VarProg ressStartG roups" sel ect="wwpro gress:Star t(count($V arProjectG roups))" / >
50      <xsl:fo r-each sel ect="$VarP rojectGrou ps">   50      <xsl:fo r-each sel ect="$VarP rojectGrou ps">
51       <xsl:v ariable na me="VarPro jectGroup"  select=". " />   51       <xsl:v ariable na me="VarPro jectGroup"  select=". " />
52         52      
53       <xsl:v ariable na me="VarPro gressStart Group" sel ect="wwpro gress:Star t(1)" />   53       <xsl:v ariable na me="VarPro gressStart Group" sel ect="wwpro gress:Star t(1)" />
54         54      
55       <!-- I terate inp ut documen ts -->   55       <!-- I terate inp ut documen ts -->
56       <!--                            -->   56       <!--                            -->
57       <xsl:f or-each se lect="$Glo balFiles[1 ]">   57       <xsl:f or-each se lect="$Glo balFiles[1 ]">
58        <xsl: variable n ame="VarCo nfiguratio nFilesNode " select=" key('wwfil es-files-b y-type', $ ParameterD ependsType )[1]" />   58        <xsl: variable n ame="VarCo nfiguratio nFilesNode " select=" key('wwfil es-files-b y-type', $ ParameterD ependsType )[1]" />
59     59  
60        <!--  Aborted? - ->   60        <!--  Aborted? - ->
61        <!--           - ->   61        <!--           - ->
62        <xsl: if test="n ot(wwprogr ess:Abort( ))">   62        <xsl: if test="n ot(wwprogr ess:Abort( ))">
63         <xsl :variable  name="VarP ath" selec t="wwfiles ystem:Comb ine(wwproj ext:GetTar getOutputD irectoryPa th(), wwpr ojext:GetG roupName($ VarProject Group/@Gro upID), 'vi ew.vbs')"  />   63         <xsl :variable  name="VarP ath" selec t="wwfiles ystem:Comb ine(wwproj ext:GetTar getOutputD irectoryPa th(), wwpr ojext:GetG roupName($ VarProject Group/@Gro upID), 'vi ew.vbs')"  />
64     64  
65         <!--  Call temp late -->   65         <!--  Call temp late -->
66         <!--                 -->   66         <!--                 -->
67         <xsl :variable  name="VarU pToDate" s elect="wwf ilesext:Up ToDate($Va rPath, $Gl obalProjec t/wwprojec t:Project/ @ChangeID,  $VarConfi gurationFi lesNode[1] /@groupID,  '', $Glob alActionCh ecksum)" / >   67         <xsl :variable  name="VarU pToDate" s elect="wwf ilesext:Up ToDate($Va rPath, $Gl obalProjec t/wwprojec t:Project/ @ChangeID,  $VarConfi gurationFi lesNode[1] /@groupID,  '', $Glob alActionCh ecksum)" / >
68         <xsl :if test=" not($VarUp ToDate)">   68         <xsl :if test=" not($VarUp ToDate)">
69          <xs l:variable  name="Var ResultAsXM L">   69          <xs l:variable  name="Var ResultAsXM L">
70           <x sl:call-te mplate nam e="View-Co mmand">   70           <x sl:call-te mplate nam e="View-Co mmand">
71            < xsl:with-p aram name= "ParamConf igurationF ilesNode"  select="$V arConfigur ationFiles Node" />   71            < xsl:with-p aram name= "ParamConf igurationF ilesNode"  select="$V arConfigur ationFiles Node" />
72           </ xsl:call-t emplate>   72           </ xsl:call-t emplate>
73          </x sl:variabl e>   73          </x sl:variabl e>
74          <xs l:variable  name="Var Result" se lect="msxs l:node-set ($VarResul tAsXML)" / >   74          <xs l:variable  name="Var Result" se lect="msxs l:node-set ($VarResul tAsXML)" / >
75          <xs l:variable  name="Var WriteResul t" select= "wwexsldoc :Document( $VarResult , $VarPath , wwprojex t:GetForma tSetting(' encoding',  'utf-8'),  'text')"  />   75          <xs l:variable  name="Var WriteResul t" select= "wwexsldoc :Document( $VarResult , $VarPath , wwprojex t:GetForma tSetting(' encoding',  'utf-8'),  'text')"  />
76         </xs l:if>   76         </xs l:if>
77     77  
78         <wwf iles:File  path="{$Va rPath}" ty pe="{$Para meterType} " checksum ="{wwfiles ystem:GetC hecksum($V arPath)}"  projectche cksum="{$G lobalProje ct/wwproje ct:Project /@ChangeID }" groupID ="{$VarPro jectGroup/ @GroupID}"  documentI D="" actio nchecksum= "{$GlobalA ctionCheck sum}" cate gory="{$Pa rameterCat egory}" us e="{$Param eterUse}">   78         <wwf iles:File  path="{$Va rPath}" ty pe="{$Para meterType} " checksum ="{wwfiles ystem:GetC hecksum($V arPath)}"  projectche cksum="{$G lobalProje ct/wwproje ct:Project /@ChangeID }" groupID ="{$VarPro jectGroup/ @GroupID}"  documentI D="" actio nchecksum= "{$GlobalA ctionCheck sum}" cate gory="{$Pa rameterCat egory}" us e="{$Param eterUse}">
79          <ww files:Depe nds path=" {$VarConfi gurationFi lesNode/@p ath}" chec ksum="{$Va rConfigura tionFilesN ode/@check sum}" grou pID="{$Var Configurat ionFilesNo de/@groupI D}" docume ntID="{$Va rConfigura tionFilesN ode/@docum entID}" />   79          <ww files:Depe nds path=" {$VarConfi gurationFi lesNode/@p ath}" chec ksum="{$Va rConfigura tionFilesN ode/@check sum}" grou pID="{$Var Configurat ionFilesNo de/@groupI D}" docume ntID="{$Va rConfigura tionFilesN ode/@docum entID}" />
80         </ww files:File >   80         </ww files:File >
81        </xsl :if> <!--  end of not (wwprogres s:Abort())  -->   81        </xsl :if> <!--  end of not (wwprogres s:Abort())  -->
82       </xsl: for-each>  <!-- end o f $GlobalF iles[1] -- >   82       </xsl: for-each>  <!-- end o f $GlobalF iles[1] -- >
83     83  
84       <xsl:v ariable na me="VarPro gressEndGr oup" selec t="wwprogr ess:End()"  />   84       <xsl:v ariable na me="VarPro gressEndGr oup" selec t="wwprogr ess:End()"  />
85     85  
86      </xsl:f or-each> < !-- end of  $VarProje ctGroups - ->   86      </xsl:f or-each> < !-- end of  $VarProje ctGroups - ->
87      <xsl:va riable nam e="VarProg ressEndGro ups" selec t="wwprogr ess:End()"  />    87      <xsl:va riable nam e="VarProg ressEndGro ups" selec t="wwprogr ess:End()"  /> 
88     </wwfile s:Files>   88     </wwfile s:Files>
89    </xsl:tem plate>   89    </xsl:tem plate>
90     90  
91     91  
92    <xsl:temp late name= "View-Comm and">   92    <xsl:temp late name= "View-Comm and">
93     <xsl:par am name="P aramConfig urationFil esNode" />   93     <xsl:par am name="P aramConfig urationFil esNode" />
94     94  
95     <!-- Set  JDK path  -->   95     <!-- Set  JDK path  -->
96     <!--                -->   96     <!--                -->
97     <xsl:var iable name ="VarJDKPa th">   97     <xsl:var iable name ="VarJDKPa th">
98      <xsl:va riable nam e="VarJDKH omePathSet ting" sele ct="wwproj ext:GetFor matSetting ('local-jd k-location ', wwenv:J DKHome())"  />   98      <xsl:va riable nam e="VarJDKH omePathSet ting" sele ct="wwproj ext:GetFor matSetting ('local-jd k-location ', wwenv:J DKHome())"  />
99      <xsl:ch oose>   99      <xsl:ch oose>
100       <xsl:w hen test=" (string-le ngth($VarJ DKHomePath Setting) & gt; 0) and  (wwfilesy stem:Direc toryExists ($VarJDKHo mePathSett ing))">   100       <xsl:w hen test=" (string-le ngth($VarJ DKHomePath Setting) & gt; 0) and  (wwfilesy stem:Direc toryExists ($VarJDKHo mePathSett ing))">
101        <xsl: value-of s elect="$Va rJDKHomePa thSetting"  />   101        <xsl: value-of s elect="$Va rJDKHomePa thSetting"  />
102       </xsl: when>   102       </xsl: when>
103     103  
104       <xsl:o therwise>   104       <xsl:o therwise>
105        <xsl: value-of s elect="wwe nv:JDKHome ()" />   105        <xsl: value-of s elect="wwe nv:JDKHome ()" />
106       </xsl: otherwise>   106       </xsl: otherwise>
107      </xsl:c hoose>   107      </xsl:c hoose>
108     </xsl:va riable>   108     </xsl:va riable>
109     109  
110     <xsl:var iable name ="VarInsta llScriptPa th" select ="wwuri:As FilePath(' wwhelper:e clipse/ins tall.vbs') " />   110     <xsl:var iable name ="VarInsta llScriptPa th" select ="wwuri:As FilePath(' wwhelper:e clipse/ins tall.vbs') " />
111     <xsl:var iable name ="VarConfi gureScript Path" sele ct="wwuri: AsFilePath ('wwhelper :eclipse/c onfigure.v bs')" />   111     <xsl:var iable name ="VarConfi gureScript Path" sele ct="wwuri: AsFilePath ('wwhelper :eclipse/c onfigure.v bs')" />
112     <xsl:var iable name ="VarLaunc hScriptPat h" select= "wwuri:AsF ilePath('w whelper:ec lipse/laun ch.vbs')"  />   112     <xsl:var iable name ="VarLaunc hScriptPat h" select= "wwuri:AsF ilePath('w whelper:ec lipse/laun ch.vbs')"  />
113     113  
114     <xsl:var iable name ="VarInsta llCommand" >   114     <xsl:var iable name ="VarInsta llCommand" >
115      <xsl:te xt>"""</xs l:text>   115      <xsl:te xt>"""</xs l:text>
116      <xsl:va lue-of sel ect="$VarI nstallScri ptPath" />   116      <xsl:va lue-of sel ect="$VarI nstallScri ptPath" />
117      <xsl:te xt>"""</xs l:text>   117      <xsl:te xt>"""</xs l:text>
118     </xsl:va riable>   118     </xsl:va riable>
119        119     
120     <xsl:var iable name ="VarConfi gureComman d">   120     <xsl:var iable name ="VarConfi gureComman d">
121      <xsl:te xt>"""</xs l:text>   121      <xsl:te xt>"""</xs l:text>
122      <xsl:va lue-of sel ect="$VarC onfigureSc riptPath"  />   122      <xsl:va lue-of sel ect="$VarC onfigureSc riptPath"  />
123      <xsl:te xt>"" ""</ xsl:text>   123      <xsl:te xt>"" ""</ xsl:text>
124      <xsl:va lue-of sel ect="$Para mConfigura tionFilesN ode/@path"  />   124      <xsl:va lue-of sel ect="$Para mConfigura tionFilesN ode/@path"  />
125      <xsl:te xt>"""</xs l:text>   125      <xsl:te xt>"""</xs l:text>
126     </xsl:va riable>   126     </xsl:va riable>
127        127     
128     <xsl:var iable name ="VarLaunc hCommand">   128     <xsl:var iable name ="VarLaunc hCommand">
129      <xsl:te xt>"""</xs l:text>   129      <xsl:te xt>"""</xs l:text>
130      <xsl:va lue-of sel ect="$VarL aunchScrip tPath" />   130      <xsl:va lue-of sel ect="$VarL aunchScrip tPath" />
131      <xsl:te xt>"" ""</ xsl:text>   131      <xsl:te xt>"" ""</ xsl:text>
132      <xsl:va lue-of sel ect="wwfil esystem:Co mbine($Var JDKPath, ' bin', 'jav a.exe')" / >   132      <xsl:va lue-of sel ect="wwfil esystem:Co mbine($Var JDKPath, ' bin', 'jav a.exe')" / >
133      <xsl:te xt>"""</xs l:text>   133      <xsl:te xt>"""</xs l:text>
134     </xsl:va riable>   134     </xsl:va riable>
135     135  
136     <xsl:tex t>' view.v bs   136     <xsl:tex t>' view.v bs
137   '   137   '
138     138  
        139   ' Constant s
        140   '
        141   Const TEMP _FOLDER =  2
        142  
139   ' Instanti ate object s   143   ' Instanti ate object s
140   '   144   '
        145   Set fileSy stemObject  = CreateO bject("Scr ipting.Fil eSystemObj ect")
        146   Set tempDi rectory =  fileSystem Object.Get SpecialFol der(TEMP_F OLDER)
141   Set shell  = CreateOb ject("WScr ipt.Shell" )   147   Set shell  = CreateOb ject("WScr ipt.Shell" )
142     148  
        149   ' Change w orking dir ectory to  avoid lock  in projec t area.
        150   '
        151   shell.Curr entDirecto ry = tempD irectory
        152  
143   ' Install   153   ' Install
144   '   154   '
145   command =  </xsl:text ><xsl:valu e-of selec t="$VarIns tallComman d" /><xsl: text>   155   command =  </xsl:text ><xsl:valu e-of selec t="$VarIns tallComman d" /><xsl: text>
146   result = s hell.Run(c ommand, 0,  true)   156   result = s hell.Run(c ommand, 0,  true)
147     157  
148     158  
149   ' Configur e   159   ' Configur e
150   '   160   '
151   command =  </xsl:text ><xsl:valu e-of selec t="$VarCon figureComm and" /><xs l:text>   161   command =  </xsl:text ><xsl:valu e-of selec t="$VarCon figureComm and" /><xs l:text>
152   result = s hell.Run(c ommand, 0,  true)   162   result = s hell.Run(c ommand, 0,  true)
153     163  
154   ' Launch   164   ' Launch
155   '   165   '
156   command =  </xsl:text ><xsl:valu e-of selec t="$VarLau nchCommand " /><xsl:t ext>   166   command =  </xsl:text ><xsl:valu e-of selec t="$VarLau nchCommand " /><xsl:t ext>
157   result = s hell.Run(c ommand, 0,  true)     167   result = s hell.Run(c ommand, 0,  true)  
158   </xsl:text >   168   </xsl:text >
159    </xsl:tem plate>   169    </xsl:tem plate>
160   </xsl:styl esheet>   170   </xsl:styl esheet>
161     171