Araxis Merge Folder Comparison Report

Produced by Araxis Merge on Fri Jun 13 14:30: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.

1. Folders compared

# Location Folder
1 C:/devel_jahia corp_V2TemplatesSP3
2 C:/devel_jahia/ corp_V2TemplatesSP4

2. Summary for all files

Line counts exclude files larger than 512 KB. To include them, uncheck the Compare byte-by-byte for files larger than 512 KB option on the Folder Comparisons option page.

Between Folders 1 and 2
19958 lines in
291 pairs of unchanged files
23528 lines in
43 pairs of changed files
14914 lines in
113 inserted files
41 lines in
1 removed file
Description Between Folders 1 and 2
Lines (Folder 1) Lines (Folder 2) Lines (Total) Text Blocks
Unchanged 20563 20563 41126 379
Changed 371 955 1326 142
Inserted 0 15664 15664 220
Removed 325 0 325 35

3. Summary for selected files

No files were selected.

4. Comparison options

Comparison method Files 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
Depth All files in the folder hierarchy are compared
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
Include Items matching Folders - * are included in the comparison
Include Items matching Files - * are included in the comparison
Ignore Items matching Files & Folders - *.svn are not included in the comparison
Unchanged files Shown in the comparison detail
Timestamps and sizes Not shown in the comparison detail
Change counts Shown 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 		  
adminBundleProvider.java 		 0  
adminBundleProvider.java 		  
enginesBundleProvider.java 		 0  
enginesBundleProvider.java 		  
GroupWrapper.java 		 0  
GroupWrapper.java 		  
UserWrapper.java 		 0  
UserWrapper.java 		  
search 		 0  
search 		  
FormGeneratorContainerSearcher.java 		 3  
FormGeneratorContainerSearcher.java 		  Report 1
validation 		 0  
validation 		  
beans 		 0  
beans 		  
BlogValidationBean.java 		 0  
BlogValidationBean.java 		  
BoxValidationBean.java 		 0  
BoxValidationBean.java 		  
navigationValidationBean.java 		 0  
navigationValidationBean.java 		  
PeopleValidationBean.java 		 0  
PeopleValidationBean.java 		  
ProjectValidationBean.java 		 0  
ProjectValidationBean.java 		  
Corporate_portal_templates_v2.properties 		 7  
Corporate_portal_templates_v2.properties 		  Report 2
Corporate_portal_templates_v2_de.properties 		 6  
Corporate_portal_templates_v2_de.properties 		  Report 3
Corporate_portal_templates_v2_en.properties 		 6  
Corporate_portal_templates_v2_en.properties 		  Report 4
Corporate_portal_templates_v2_es.properties 		 5  
Corporate_portal_templates_v2_es.properties 		  Report 5
Corporate_portal_templates_v2_fr.properties 		 6  
Corporate_portal_templates_v2_fr.properties 		  Report 6
Corporate_portal_templates_v2_it.properties 		 5  
Corporate_portal_templates_v2_it.properties 		  Report 7
Corporate_portal_templates_v2_pt.properties 		 5  
Corporate_portal_templates_v2_pt.properties 		  Report 8
jsp 		 0  
jsp 		  
advsearch 		 0  
advsearch 		  
advsearch.inc 		 0  
advsearch.inc 		  
calendar.jsp 		 0  
calendar.jsp 		  
detailed_search_result_list.inc 		 0  
detailed_search_result_list.inc 		  
savesearch.inc 		 0  
savesearch.inc 		  
searchoptions.inc 		 0  
searchoptions.inc 		  
search_result_list.inc 		 0  
search_result_list.inc 		  
simplesearch.inc 		 0  
simplesearch.inc 		  
webdavsearch.jsp 		 0  
webdavsearch.jsp 		  
webdavsearchcustomoptions.inc 		 0  
webdavsearchcustomoptions.inc 		  
webdavsearchpropertydefinition.inc 		 0  
webdavsearchpropertydefinition.inc 		  
websitesearch.inc 		 1  
websitesearch.inc 		  Report 9
blogs 		 0  
blogs 		  
     
addcomment_form.inc 		  Report 10
     
blog.jsp 		  Report 11
     
blog_listing.jsp 		  Report 12
     
categories.inc 		  Report 13
     
declarations.inc 		  Report 14
     
definitions.inc 		  Report 15
     
entries.inc 		  Report 16
     
entry.inc 		  Report 17
eventlistener.inc 		 1  
eventlistener.inc 		  Report 18
     
filters.inc 		  Report 19
     
list.inc 		  Report 20
     
listing_filters.inc 		  Report 21
     
searchbox.inc 		  Report 22
     
view_comments.inc 		  Report 23
     
view_pingurl.inc 		  Report 24
     
view_trackbacks.inc 		  Report 25
box 		 0  
box 		  
box.jsp 		 2  
box.jsp 		  Report 26
     
dav.inc 		  Report 27
declarations.inc 		 3  
declarations.inc 		  Report 28
files.inc 		 0  
files.inc 		  
     
filterWizards.inc 		  Report 29
     
groupsContainer.inc 		  Report 30
lastNews.inc 		 21  
lastNews.inc 		  Report 31
links.inc 		 0  
links.inc 		  
pages.inc 		 0  
pages.inc 		  
     
pollbox.inc 		  Report 32
     
savedsearch.inc 		  Report 33
texts.inc 		 0  
texts.inc 		  
     
usersContainer.inc 		  Report 34
webapps.inc 		 3  
webapps.inc 		  Report 35
common 		 0  
common 		  
adminbuttons.inc 		 0  
adminbuttons.inc 		  
bottom.inc 		 2  
bottom.inc 		  Report 36
common_vars.inc 		 3  
common_vars.inc 		  Report 37
declarations.inc 		 5  
declarations.inc 		  Report 38
definitions.inc 		 0  
definitions.inc 		  
filters.inc 		 0  
filters.inc 		  
footerlinks.inc 		 17  
footerlinks.inc 		  Report 39
main_content.jsp 		 2  
main_content.jsp 		  Report 40
pagetitle.jsp 		 0  
pagetitle.jsp 		  
quicklinks.inc 		 2  
quicklinks.inc 		  Report 41
site_settings.inc 		 1  
site_settings.inc 		  Report 42
top.inc 		 18  
top.inc 		  Report 43
topmenu.inc 		 17  
topmenu.inc 		  Report 44
top_declarations.inc 		 1  
top_declarations.inc 		  Report 45
css 		 0  
css 		  
images 		 0  
images 		  
portlets 		 0  
portlets 		  
tabBorder.gif 		 0  
tabBorder.gif 		  
tabLeft.gif 		 0  
tabLeft.gif 		  
tabRight.gif 		 0  
tabRight.gif 		  
windowStates.gif 		 0  
windowStates.gif 		  
windowStates_maximized.gif 		 0  
windowStates_maximized.gif 		  
windowStates_minimized.gif 		 0  
windowStates_minimized.gif 		  
windowStates_normal.gif 		 0  
windowStates_normal.gif 		  
actions.css 		 6  
actions.css 		  Report 46
advsearch_css.jsp 		 0  
advsearch_css.jsp 		  
blog_css.xml 		 0  
blog_css.xml 		  
button.css 		 0  
button.css 		  
edit.css 		 2  
edit.css 		  Report 47
jforum.css 		 0  
jforum.css 		  
ldap.css 		 0  
ldap.css 		  
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 		 14  
template_css.jsp 		  Report 48
template_css.xml 		 0  
template_css.xml 		  
transmenu.css 		 0  
transmenu.css 		  
trhover.htc 		 0  
trhover.htc 		  
doc 		 0  
doc 		  
     
container_revisions_listing.inc 		  Report 49
     
declaration_sources.inc 		  Report 50
     
declaration_types.inc 		  Report 51
     
definitions.inc 		  Report 52
     
detail.jsp 		  Report 53
eventlistener.inc 		 1  
eventlistener.inc 		  Report 54
     
filters.inc 		  Report 55
     
folderDocumentBox.jsp 		  Report 56
     
listing.jsp 		  Report 57
     
page_categories_list.inc 		  Report 58
     
pagination_bar.jsp 		  Report 59
     
sources.inc 		  Report 60
     
types.inc 		  Report 61
faq 		 0  
faq 		  
definitions.inc 		 0  
definitions.inc 		  
faq.jsp 		 5  
faq.jsp 		  Report 62
form_generator 		 0  
form_generator 		  
definitions.inc 		 0  
definitions.inc 		  
display_form.inc 		 0  
display_form.inc 		  
eventlistener.inc 		 0  
eventlistener.inc 		  
form_generator.jsp 		 0  
form_generator.jsp 		  
process_post.inc 		 0  
process_post.inc 		  
img 		 0  
img 		  
actions 		 0  
actions 		  
action.gif 		 0  
action.gif 		  
add.gif 		 0  
add.gif 		  
component_add.gif 		 0  
component_add.gif 		  
copy.gif 		 0  
copy.gif 		  
delete.gif 		 0  
delete.gif 		  
image_add.gif 		 0  
image_add.gif 		  
note_add.gif 		 0  
note_add.gif 		  
paste.gif 		 0  
paste.gif 		  
update.gif 		 0  
update.gif 		  
upload.gif 		 0  
upload.gif 		  
     
blog 		  
     
arrow.gif 		  Non-text files
     
arrow_on.gif 		  Non-text files
     
icon_comment.gif 		  Non-text files
     
icon_offsite.gif 		  Non-text files
     
icon_pg.gif 		  Non-text files
emotions 		 0  
emotions 		  
alien_1.gif 		 0  
alien_1.gif 		  
alien_2.gif 		 0  
alien_2.gif 		  
angel.gif 		 0  
angel.gif 		  
angry.gif 		 0  
angry.gif 		  
applause.gif 		 0  
applause.gif 		  
batting_eyelashes.gif 		 0  
batting_eyelashes.gif 		  
beat_up.gif 		 0  
beat_up.gif 		  
biggrin.gif 		 0  
biggrin.gif 		  
blushing.gif 		 0  
blushing.gif 		  
chicken.gif 		 0  
chicken.gif 		  
clown.gif 		 0  
clown.gif 		  
coffee.gif 		 0  
coffee.gif 		  
confused.gif 		 0  
confused.gif 		  
cool.gif 		 0  
cool.gif 		  
cow.gif 		 0  
cow.gif 		  
cowboy.gif 		 0  
cowboy.gif 		  
cry.gif 		 0  
cry.gif 		  
crying.gif 		 0  
crying.gif 		  
dancing.gif 		 0  
dancing.gif 		  
devilish.gif 		 0  
devilish.gif 		  
drooling.gif 		 0  
drooling.gif 		  
d_oh.gif 		 0  
d_oh.gif 		  
flag.gif 		 0  
flag.gif 		  
frown.gif 		 0  
frown.gif 		  
frustrated.gif 		 0  
frustrated.gif 		  
good_luck.gif 		 0  
good_luck.gif 		  
hugs.gif 		 0  
hugs.gif 		  
hypnotized.gif 		 0  
hypnotized.gif 		  
idea.gif 		 0  
idea.gif 		  
kiss.gif 		 0  
kiss.gif 		  
laughing.gif 		 0  
laughing.gif 		  
liar.gif 		 0  
liar.gif 		  
love.gif 		 0  
love.gif 		  
money_eyes.gif 		 0  
money_eyes.gif 		  
monkey.gif 		 0  
monkey.gif 		  
nerd.gif 		 0  
nerd.gif 		  
not_talking.gif 		 0  
not_talking.gif 		  
peace.gif 		 0  
peace.gif 		  
pig.gif 		 0  
pig.gif 		  
praying.gif 		 0  
praying.gif 		  
pumpkin.gif 		 0  
pumpkin.gif 		  
raised_eyebrow.gif 		 0  
raised_eyebrow.gif