Araxis Merge Folder Comparison Report

Produced by Araxis Merge on Fri Oct 19 14:25:57 2007 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 Internet Explorer. For optimum results when printing this report, enable printing of background images and colours in your browser and use landscape orientation.

1. Folders compared

#FolderLocation
1V2_JAHIA_5_0_2C:/jahia/template_diff/
2V2_JAHIA_5_0_3C:/jahia/template_diff/

2. Summary for all files

DescriptionBetween Folders 1 and 2
FilesBlocksLines
Unchanged14340921296
Changed39116644
Inserted389649*
Removed110149422*
Note: Figures marked * relate only to changed and unchanged files; lines in inserted and removed files are not counted.

3. Summary for selected files

No files were selected.

4. Comparison options

Comparison methodFiles smaller than 512 KB are compared using the configured comparison rules to determine whether they are identical. For larger files, a faster byte-by-byte comparison is performed
DepthOnly the files in the top level of the folders are compared
WhitespaceAll differences in whitespace within lines are ignored
Character caseDifferences in character case are significant
Line endingsDifferences in line endings (CR and LF characters) are ignored
IgnoreFiles matching the pattern *.obj;*.o;*.cab;*.exe;*.dll;*.map;*.pch;*.idb;*.ncb;*.vcp;*.aps;*.res;*.sbr;*.bsc;*.ilk;*.pdb;*.ide;*.class;*.tlb;*.hlp;*.lib;*.exp;*.pdf;*.zip;*.jar;Debug/;Release/;WinDebug/;WinRel/;CVS/;RCS/;.svn/ are ignored
IncludeDisabled
Unchanged filesShown in the comparison detail
Timestamps and sizesNot shown in the comparison detail
Change countsShown in the comparison detail

5. Active regular expressions

No regular expressions were active.

6. Comparison detail

src 0 src  
java 0 java  
jahiatemplates 0 jahiatemplates  
org 0 org  
Corporate_portal_templates_v2.properties 23 Corporate_portal_templates_v2.properties  Report 1
Corporate_portal_templates_v2_de.properties 20 Corporate_portal_templates_v2_de.properties  Report 2
Corporate_portal_templates_v2_en.properties 10 Corporate_portal_templates_v2_en.properties  Report 3
Corporate_portal_templates_v2_es.properties 16 Corporate_portal_templates_v2_es.properties  Report 4
Corporate_portal_templates_v2_fr.properties 45 Corporate_portal_templates_v2_fr.properties  Report 5
Corporate_portal_templates_v2_it.properties 17 Corporate_portal_templates_v2_it.properties  Report 6
Corporate_portal_templates_v2_pt.properties 16 Corporate_portal_templates_v2_pt.properties  Report 7
jsp 0 jsp  
advsearch 0 advsearch  
advsearch.inc 0 advsearch.inc  
calendar.jsp 1 calendar.jsp  Report 8
detailed_search_result_list.inc 1 detailed_search_result_list.inc  Report 9
savesearch.inc 0 savesearch.inc  
search_result_list.inc 2 search_result_list.inc  Report 10
searchoptions.inc 0 searchoptions.inc  
simplesearch.inc 0 simplesearch.inc  
webdavsearch.jsp 4 webdavsearch.jsp  Report 11
webdavsearchcustomoptions.inc 0 webdavsearchcustomoptions.inc  
webdavsearchpropertydefinition.inc 0 webdavsearchpropertydefinition.inc  
websitesearch.inc 0 websitesearch.inc  
blogs 0 blogs  
addcomment_form.inc 0    
blog.jsp 0    
blog_listing.jsp 0    
categories.inc 0    
declarations.inc 0    
definitions.inc 0    
entries.inc 0    
entry.inc 0    
eventlistener.inc 1 eventlistener.inc  Report 12
filters.inc 0    
list.inc 0    
listing_filters.inc 0    
searchbox.inc 0    
view_comments.inc 0    
view_pingurl.inc 0    
view_trackbacks.inc 0    
box 0 box  
box.jsp 7 box.jsp  Report 13
dav.inc 0    
declarations.inc 3 declarations.inc  Report 14
files.inc 3 files.inc  Report 15
filterWizards.inc 0    
groupsContainer.inc 0    
lastNews.inc 4 lastNews.inc  Report 16
links.inc 0 links.inc  
pages.inc 0 pages.inc  
savedsearch.inc 0    
texts.inc 0 texts.inc  
usersContainer.inc 0    
webapps.inc 1 webapps.inc  Report 17
common 0 common  
adminbuttons.inc 0 adminbuttons.inc  
bottom.inc 0 bottom.inc  
common_vars.inc 2 common_vars.inc  Report 18
declarations.inc 4 declarations.inc  Report 19
definitions.inc 0 definitions.inc  
filters.inc 0 filters.inc  
footerlinks.inc 0 footerlinks.inc  
main_content.jsp 0 main_content.jsp  
pagetitle.jsp 1 pagetitle.jsp  Report 20
quicklinks.inc 1 quicklinks.inc  Report 21
site_settings.inc 0 site_settings.inc  
top.inc 7 top.inc  Report 22
top_declarations.inc 1 top_declarations.inc  Report 23
topmenu.inc 4 topmenu.inc  Report 24
css 0 css  
images 0 images  
actions.css 0 actions.css  
advsearch_css.jsp 0 advsearch_css.jsp  
   blog_css.xml  
button.css 0 button.css  
edit.css 1 edit.css  Report 25
jforum.css 0 jforum.css  
ldap.css 6 ldap.css  Report 26
lihover1.htc 0 lihover1.htc  
lihover2.htc 0 lihover2.htc  
lihover3.htc 0 lihover3.htc  
portlets.css 0 portlets.css  
print.css 0 print.css  
properties.css 0 properties.css  
screen.css 0 screen.css  
tab.css 0 tab.css  
template_css.jsp 9 template_css.jsp  Report 27
   template_css.xml  
transmenu.css 0 transmenu.css  
trhover.htc 0 trhover.htc  
doc 0 doc  
container_revisions_listing.inc 0    
declaration_sources.inc 0    
declaration_types.inc 0    
definitions.inc 0    
detail.jsp 0    
eventlistener.inc 1 eventlistener.inc  Report 28
filters.inc 0    
folderDocumentBox.jsp 0    
listing.jsp 0    
page_categories_list.inc 0    
pagination_bar.jsp 0    
sources.inc 0    
types.inc 0    
faq 0 faq  
form_generator 0 form_generator  
definitions.inc 0 definitions.inc  
display_form.inc 4 display_form.inc  Report 29
eventlistener.inc 0 eventlistener.inc  
form_generator.jsp 0 form_generator.jsp  
process_post.inc 7 process_post.inc  Report 30
img 0 img  
actions 0 actions  
blog 0    
arrow.gif 0    
arrow_on.gif 0    
icon_comment.gif 0    
icon_offsite.gif 0    
icon_pg.gif 0    
emotions 0 emotions  
files 0 files  
icones 0 icones  
icons 0 icons  
ldap 0    
arrow_down.gif 0    
arrow_off.gif 0    
arrow_up.gif 0    
fiche_left.gif 0    
fiche_rigth.gif 0    
groups0.gif 0    
groups1.gif 0    
mygroup.gif 0    
nb1.gif 0    
ne1.gif 0    
nl1.gif 0    
nr1.gif 0    
perso.gif 0    
pix.gif 0    
users0.gif 0    
users1.gif 0    
about.gif 0 about.gif  
add.gif 0 add.gif  
adminbox.gif 0 adminbox.gif  
alumni.jpg 0 alumni.jpg  
arrow.gif 0 arrow.gif  
arrow2.gif 0 arrow2.gif  
arrow2_left.gif 0 arrow2_left.gif  
arrow3.gif 0 arrow3.gif  
arrow3_left.gif 0 arrow3_left.gif  
arrow4.gif 0 arrow4.gif  
arrow5.gif 0 arrow5.gif  
arrow6.gif 0 arrow6.gif  
arrow7.gif 0 arrow7.gif  
arrow_left.gif 0 arrow_left.gif  
back.gif 0 back.gif  
bg_button_down.gif 0 bg_button_down.gif  
bg_button_up.gif 0 bg_button_up.gif  
box.gif 0 box.gif  
box_delete.gif 0 box_delete.gif  
box_fullscreen.gif 0 box_fullscreen.gif  
box_new.gif 0 box_new.gif  
box_prop.gif 0 box_prop.gif  
box_restore.gif 0 box_restore.gif  
box_title_orange.gif 0 box_title_orange.gif  
box_update.gif 0 box_update.gif  
box_upload.gif 0 box_upload.gif  
del.gif 0 del.gif  
delete.gif 0 delete.gif  
   differentACL.png  
dotted.gif 0 dotted.gif  
esi_invalidate_page.gif 0 esi_invalidate_page.gif  
folder_files.gif 0 folder_files.gif  
folder_link.gif 0 folder_link.gif  
folder_people.gif 0 folder_people.gif  
folder_project.gif 0 folder_project.gif  
footer.gif 0 footer.gif  
from.gif 0 from.gif  
grad.gif 0 grad.gif  
grey-40.png 0 grey-40.png  
header.gif 0 header.gif  
index.gif 0 index.gif  
jahia_powered.gif 0 jahia_powered.gif  
line.gif 0 line.gif  
line_200.gif 0 line_200.gif  
logo-jahia.gif 0 logo-jahia.gif  
logo.gif 0 logo.gif  
lucene_green_100.gif 0 lucene_green_100.gif  
mag.jpg 0 mag.jpg  
mail.gif 0 mail.gif  
mail_out.gif 0 mail_out.gif  
main.gif 0 main.gif  
menu_left.gif 0 menu_left.gif  
menu_left_tab.gif 0 menu_left_tab.gif  
menu_right.gif 0 menu_right.gif  
menu_right_tab.gif 0 menu_right_tab.gif  
nav.gif 0 nav.gif  
nav_bottom.gif 0 nav_bottom.gif  
nav_top.gif 0 nav_top.gif  
parag.gif 0 parag.gif  
pix.gif 0 pix.gif  
push.gif 0 push.gif  
query.gif 0 query.gif  
refresh.gif 0 refresh.gif  
search.gif 0 search.gif  
sort.gif 0 sort.gif  
splash.gif 0 splash.gif  
splash.jpg 0 splash.jpg  
step1.gif 0 step1.gif  
step2.gif 0 step2.gif  
subject.gif 0 subject.gif  
submenu-off.gif 0 submenu-off.gif  
submenu-on.gif 0 submenu-on.gif  
tab_border.gif 0 tab_border.gif  
tab_left.gif 0 tab_left.gif  
tab_right.gif 0 tab_right.gif  
to.gif 0 to.gif  
tocc.gif 0 tocc.gif  
top.gif 0 top.gif  
top_left.gif 0 top_left.gif  
top_right.gif 0 top_right.gif  
ttu.gif 0 ttu.gif  
tux.png 0 tux.png  
update.gif 0 update.gif  
warning.gif 0 warning.gif  
white-90.png 0 white-90.png  
x.gif 0 x.gif  
javascript 0 javascript  
actions.js 0 actions.js  
cptv2.js 0 cptv2.js  
transmenu.inc 1 transmenu.inc  Report 31
transmenu.js 0 transmenu.js  
transmenu_init.inc 0 transmenu_init.inc  
transmenu_js.jsp 2 transmenu_js.jsp  Report 32
yav-config_js.inc 1 yav-config_js.inc  Report 33
yav.js 0 yav.js  
ldap 0    
people_detail.inc 0    
people_ldap.inc 0    
people_ldap_list.inc 0    
mediagallery 0    
medialist.inc 0    
metadatas 0    
metadata_dates.jsp 0    
metadata_users.jsp 0    
nav 0 nav  
menu.jsp 4 menu.jsp  Report 34
news 0 news  
definitions.inc 0 definitions.inc  
eventlistener.inc 4 eventlistener.inc  Report 35
filters.inc 0 filters.inc  
news.jsp 1 news.jsp  Report 36
poll 0    
declarations.inc 0    
definitions.inc 0    
form.inc 0    
poll.jsp 0    
process.inc 0    
results.inc 0    
portal2 0    
box_files.inc 0    
box_link_news.inc 0    
box_links.inc 0    
box_news.inc 0    
box_text.inc 0    
box_webapps.inc 0    
layout.jsp 0    
layout_fullscreen.inc 0    
layout_standard.inc 0    
quizz 0    
declarations.inc 0    
definitions.inc 0    
form.inc 0    
quizz.jsp 0    
results.inc 0    
splash 0 splash  
survey 0    
declarations.inc 0    
definitions.inc 0    
form.inc 0    
results.inc 0    
survey.jsp 0    
advsearchresult.jsp 0 advsearchresult.jsp  
blog.jsp 0    
blog_listing.jsp 0    
blog_listing_rss_2_0.jsp 0    
blog_rss_2_0.jsp 0    
categories.jsp 0    
corporate_portal_templates.gif 0 corporate_portal_templates.gif  
directories.jsp 0    
docinfo.jsp 0    
document_detail.jsp 0    
document_listing.jsp 0    
double.jsp 0 double.jsp  
eventlistener.jsp 0 eventlistener.jsp  
faq.jsp 0 faq.jsp  
folder.jsp 0    
form_generator.jsp 0 form_generator.jsp  
fullbox.jsp 0 fullbox.jsp  
layout.jsp 0    
ldap.jsp 0    
ldap_pop.jsp 0    
ldap_search.jsp 0    
links.jsp 0 links.jsp  
mediagallery.jsp 0    
metadataapi.jsp 0    
mysettings.jsp 0 mysettings.jsp  
mysettingschanged.jsp 0 mysettingschanged.jsp  
news.jsp 1 news.jsp  Report 37
people.jsp 0    
poll.jsp 0    
project.jsp 0    
quizz.jsp 0    
quizz_csv.jsp 0    
search_file_hit_detail.inc 0 search_file_hit_detail.inc  
search_hit_detail.jsp 0 search_hit_detail.jsp  
search_result_pager.inc 0 search_result_pager.inc  
searchresult.jsp 2 searchresult.jsp  Report 38
simple.jsp 0 simple.jsp  
sitemap.jsp 0 sitemap.jsp  
survey.jsp 0    
survey_csv.jsp 0    
templates.xml 3 templates.xml  Report 39
testFields.jsp 0    
user_ldap_search.jsp 0    
webdav.jsp 0    
ant.build.properties.sample 0 ant.build.properties.sample  
build.xml 0 build.xml  

Araxis Merge (but not this generated report) is Copyright © 1993-2003 Araxis Ltd (www.araxis.com). All rights reserved.