Araxis Merge Folder Comparison Report

Produced by Araxis Merge on Fri Oct 19 14:25:17 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_0C:/jahia/template_diff/
2V2_JAHIA_5_0_3C:/jahia/template_diff/

2. Summary for all files

DescriptionBetween Folders 1 and 2
FilesBlocksLines
Unchanged10249714643
Changed521912301
Inserted752071062*
Removed7310683*
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  
jahia 0 jahia  
corporateportalv2 0 corporateportalv2  
ldap 0 ldap  
   search  
   FormGeneratorContainerSearcher.java  
validation 0 validation  
beans 0 beans  
   BlogValidationBean.java  
BoxValidationBean.java 2 BoxValidationBean.java  Report 1
navigationValidationBean.java 0 navigationValidationBean.java  
   PeopleValidationBean.java  
   ProjectValidationBean.java  
Corporate_portal_templates_v2.properties 42 Corporate_portal_templates_v2.properties  Report 2
   Corporate_portal_templates_v2_de.properties  
Corporate_portal_templates_v2_en.properties 36 Corporate_portal_templates_v2_en.properties  Report 3
   Corporate_portal_templates_v2_es.properties  
Corporate_portal_templates_v2_fr.properties 49 Corporate_portal_templates_v2_fr.properties  Report 4
   Corporate_portal_templates_v2_it.properties  
   Corporate_portal_templates_v2_pt.properties  
jsp 0 jsp  
advsearch 0 advsearch  
advsearch.inc 0 advsearch.inc  
calendar.jsp 1 calendar.jsp  Report 5
detailed_search_result_list.inc 0 detailed_search_result_list.inc  
savesearch.inc 0 savesearch.inc  
search_result_list.inc 5 search_result_list.inc  Report 6
searchoptions.inc 0 searchoptions.inc  
simplesearch.inc 0 simplesearch.inc  
webdavsearch.jsp 6 webdavsearch.jsp  Report 7
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 8
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 9
dav.inc 0    
declarations.inc 3 declarations.inc  Report 10
files.inc 3 files.inc  Report 11
filterWizards.inc 0    
groupsContainer.inc 0    
lastNews.inc 8 lastNews.inc  Report 12
links.inc 1 links.inc  Report 13
pages.inc 1 pages.inc  Report 14
savedsearch.inc 0    
texts.inc 0 texts.inc  
usersContainer.inc 0    
webapps.inc 5 webapps.inc  Report 15
common 0 common  
adminbuttons.inc 0 adminbuttons.inc  
bottom.inc 3 bottom.inc  Report 16
common_vars.inc 4 common_vars.inc  Report 17
declarations.inc 3 declarations.inc  Report 18
definitions.inc 1 definitions.inc  Report 19
   filters.inc  
   footerlinks.inc  
footerlinks.jsp 0    
main_content.jsp 0 main_content.jsp  
pagetitle.jsp 1 pagetitle.jsp  Report 20
quicklinks.inc 2 quicklinks.inc  Report 21
quicklinks.jsp 0    
site_settings.inc 4 site_settings.inc  Report 22
top.inc 21 top.inc  Report 23
top_declarations.inc 2 top_declarations.inc  Report 24
topmenu.inc 4 topmenu.inc  Report 25
topmenu.jsp 0    
css 0 css  
images 0 images  
actions.css 0 actions.css  
advsearch_css.jsp 0 advsearch_css.jsp  
   blog_css.xml  
   button.css  
edit.css 1 edit.css  Report 26
jforum.css 0 jforum.css  
ldap.css 6 ldap.css  Report 27
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 4 screen.css  Report 28
tab.css 0 tab.css  
   template_css.jsp  
   template_css.xml  
transmenu.css 0 transmenu.css  
trhover.htc 0 trhover.htc  
doc 0 doc  
declaration_sources.inc 0    
declaration_types.inc 0    
definitions.inc 0    
detail.jsp 0    
eventlistener.inc 1 eventlistener.inc  Report 29
filters.inc 0    
listing.jsp 0    
page_categories_list.inc 0    
pagination_bar.jsp 0    
sources.inc 0    
types.inc 0    
faq 0 faq  
definitions.inc 0 definitions.inc  
faq.jsp 2 faq.jsp  Report 30
form_generator 0 form_generator  
definitions.inc 5 definitions.inc  Report 31
display_form.inc 40 display_form.inc  Report 32
   eventlistener.inc  
form_generator.jsp 1 form_generator.jsp  Report 33
process_post.inc 16 process_post.inc  Report 34
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  
   category_type.gif  
   file_type.gif  
   page_type.gif  
   small_shared_type.gif  
   small_type.gif  
   icons  
   standard  
   doc.gif  
   exe.gif  
   file.gif  
   html.gif  
   img.gif  
   link.gif  
   pdf.gif  
   ppt.gif  
   sound.gif  
   txt.gif  
   video.gif  
   xls.gif  
   zip.gif  
   bottom.gif  
   config_icon.gif  
   delete.gif  
   height_decrease.gif  
   height_increase.gif  
   left.gif  
   right.gif  
   sep.gif  
   sep_bottom.gif  
   sep_left.gif  
   sep_right.gif  
   sep_top.gif  
   swap_horizontal.gif  
   swap_vertical.gif  
   top.gif  
   width_decrease.gif  
   width_increase.gif  
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  
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  
   bg_button_up.gif  
box.gif 0 box.gif  
   box_delete.gif  
   box_fullscreen.gif  
   box_new.gif  
   box_prop.gif  
   box_restore.gif  
box_title_orange.gif 0 box_title_orange.gif  
   box_update.gif  
   box_upload.gif  
   del.gif  
   delete.gif  
   differentACL.png  
dotted.gif 0 dotted.gif  
esi_invalidate_page.gif 0 esi_invalidate_page.gif  
   folder_files.gif  
   folder_link.gif  
   folder_people.gif  
   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  
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  
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  
   warning.gif  
white-90.png 0 white-90.png  
x.gif 0 x.gif  
javascript 0 javascript  
actions.js 5 actions.js  Report 35
cptv2.js 0 cptv2.js  
transmenu.inc 5 transmenu.inc  Report 36
transmenu.js 0 transmenu.js  
transmenu_init.inc 0 transmenu_init.inc  
transmenu_js.jsp 2 transmenu_js.jsp  Report 37
   yav-config_js.inc  
   yav.js  
ldap 0    
people_detail.inc 0    
people_ldap.inc 0    
people_ldap_list.inc 0    
mediagallery 0    
medialist.jsp 0    
metadatas 0    
metadata_dates.jsp 0    
metadata_users.jsp 0    
nav 0 nav  
menu.jsp 7 menu.jsp  Report 38
news 0 news  
definitions.inc 0 definitions.inc  
eventlistener.inc 4 eventlistener.inc  Report 39
filters.inc 0 filters.inc  
news.jsp 1 news.jsp  Report 40
splash 0 splash  
splash.jsp 1 splash.jsp  Report 41
advsearchresult.jsp 2 advsearchresult.jsp  Report 42
blog.jsp 0    
blog_listing.jsp 0    
blog_listing_rss_2_0.jsp 0    
blog_rss_2_0.jsp 0    
corporate_portal_templates.gif 0 corporate_portal_templates.gif  
docinfo.jsp 0    
document_detail.jsp 0    
document_listing.jsp 0    
double.jsp 3 double.jsp  Report 43
eventlistener.jsp 3 eventlistener.jsp  Report 44
faq.jsp 1 faq.jsp  Report 45
form_generator.jsp 0 form_generator.jsp  
   fullbox.jsp  
ldap.jsp 0    
ldap_pop.jsp 0    
ldap_search.jsp 0    
   links.jsp  
mediagallery.jsp 0    
mysettings.jsp 12 mysettings.jsp  Report 46
mysettingschanged.jsp 0 mysettingschanged.jsp  
news.jsp 1 news.jsp  Report 47
search_file_hit_detail.inc 0 search_file_hit_detail.inc  
search_hit_detail.jsp 3 search_hit_detail.jsp  Report 48
search_result_pager.inc 0 search_result_pager.inc  
searchresult.jsp 10 searchresult.jsp  Report 49
simple.jsp 0 simple.jsp  
sitemap.jsp 1 sitemap.jsp  Report 50
templates.xml 2 templates.xml  Report 51
user_ldap_search.jsp 0    
webdav.jsp 0    
ant.build.properties.sample 0 ant.build.properties.sample  
build.xml 2 build.xml  Report 52

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