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
Description	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
rolling_eyes.gif	0	rolling_eyes.gif
rose.gif	0	rose.gif
sad.gif	0	sad.gif
shame_on_you.gif	0	shame_on_you.gif
shhh.gif	0	shhh.gif
shock.gif	0	shock.gif
sick.gif	0	sick.gif
silly.gif	0	silly.gif
skull.gif	0	skull.gif
sleep.gif	0	sleep.gif
smile.gif	0	smile.gif
smug.gif	0	smug.gif
straight_face.gif	0	straight_face.gif
talk_to_the_hand.gif	0	talk_to_the_hand.gif
thinking.gif	0	thinking.gif
tired.gif	0	tired.gif
tongue.gif	0	tongue.gif
whistling.gif	0	whistling.gif
wink.gif	0	wink.gif
worried.gif	0	worried.gif
files	0	files
large	0	large
doc.gif	0	doc.gif
file.gif	0	file.gif
html.gif	0	html.gif
img.gif	0	img.gif
pdf.gif	0	pdf.gif
ppt.gif	0	ppt.gif
txt.gif	0	txt.gif
xls.gif	0	xls.gif
zip.gif	0	zip.gif
dir.gif	0	dir.gif
doc.gif	0	doc.gif
exe.gif	0	exe.gif
file.gif	0	file.gif
html.gif	0	html.gif
img.gif	0	img.gif
link.gif	0	link.gif
pdf.gif	0	pdf.gif
ppt.gif	0	ppt.gif
sound.gif	0	sound.gif
txt.gif	0	txt.gif
video.gif	0	video.gif
xls.gif	0	xls.gif
zip.gif	0	zip.gif
icones	0	icones
category_type.gif	0	category_type.gif
file_type.gif	0	file_type.gif
page_type.gif	0	page_type.gif
small_shared_type.gif	0	small_shared_type.gif
small_type.gif	0	small_type.gif
icons	0	icons
standard	0	standard
doc.gif	0	doc.gif
exe.gif	0	exe.gif
file.gif	0	file.gif
html.gif	0	html.gif
img.gif	0	img.gif
link.gif	0	link.gif
pdf.gif	0	pdf.gif
ppt.gif	0	ppt.gif
sound.gif	0	sound.gif
txt.gif	0	txt.gif
video.gif	0	video.gif
xls.gif	0	xls.gif
zip.gif	0	zip.gif
bottom.gif	0	bottom.gif
config_icon.gif	0	config_icon.gif
delete.gif	0	delete.gif
height_decrease.gif	0	height_decrease.gif
height_increase.gif	0	height_increase.gif
left.gif	0	left.gif
right.gif	0	right.gif
sep.gif	0	sep.gif
sep_bottom.gif	0	sep_bottom.gif
sep_left.gif	0	sep_left.gif
sep_right.gif	0	sep_right.gif
sep_top.gif	0	sep_top.gif
swap_horizontal.gif	0	swap_horizontal.gif
swap_vertical.gif	0	swap_vertical.gif
top.gif	0	top.gif
width_decrease.gif	0	width_decrease.gif
width_increase.gif	0	width_increase.gif
		ldap
		arrow_down.gif	Non-text files
		arrow_off.gif	Non-text files
		arrow_up.gif	Non-text files
		fiche_left.gif	Non-text files
		fiche_rigth.gif	Non-text files
		groups0.gif	Non-text files
		groups1.gif	Non-text files
		mygroup.gif	Non-text files
		nb1.gif	Non-text files
		ne1.gif	Non-text files
		nl1.gif	Non-text files
		nr1.gif	Non-text files
		perso.gif	Non-text files
		pix.gif	Non-text files
		users0.gif	Non-text files
		users1.gif	Non-text files
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_blue.gif	Non-text files
		box_title_grey.gif	Non-text files
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	0	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	38	actions.js	Report 63
cptv2.js	0	cptv2.js
transmenu.inc	14	transmenu.inc	Report 64
transmenu.js	0	transmenu.js
transmenu_init.inc	0	transmenu_init.inc
transmenu_js.jsp	0	transmenu_js.jsp
yav-config_js.inc	0	yav-config_js.inc
yav.js	0	yav.js
		ldap
		people_detail.inc	Report 65
		people_ldap.inc	Report 66
		people_ldap_list.inc	Report 67
		mediagallery
		medialist.inc	Report 68
		metadatas
		metadata_dates.jsp	Report 69
		metadata_users.jsp	Report 70
nav	0	nav
menu.jsp	27	menu.jsp	Report 71
news	0	news
definitions.inc	2	definitions.inc	Report 72
eventlistener.inc	1	eventlistener.inc	Report 73
filters.inc	1		Report 74
news.jsp	6	news.jsp	Report 75
		poll
		declarations.inc	Report 76
		definitions.inc	Report 77
		form.inc	Report 78
		poll.jsp	Report 79
		process.inc	Report 80
		results.inc	Report 81
		portal2
		box_files.inc	Report 82
		box_links.inc	Report 83
		box_link_news.inc	Report 84
		box_news.inc	Report 85
		box_text.inc	Report 86
		box_webapps.inc	Report 87
		layout.jsp	Report 88
		layout_fullscreen.inc	Report 89
		layout_standard.inc	Report 90
		quizz
		declarations.inc	Report 91
		definitions.inc	Report 92
		form.inc	Report 93
		quizz.jsp	Report 94
		results.inc	Report 95
splash	0	splash
splash.jsp	2	splash.jsp	Report 96
		survey
		declarations.inc	Report 97
		definitions.inc	Report 98
		form.inc	Report 99
		results.inc	Report 100
		survey.jsp	Report 101
advsearchresult.jsp	0	advsearchresult.jsp
		blog.jsp	Report 102
		blog_listing.jsp	Report 103
		blog_listing_rss_2_0.jsp	Report 104
		blog_rss_2_0.jsp	Report 105
		categories.jsp	Report 106
corporate_portal_templates.gif	0	corporate_portal_templates.gif
		directories.jsp	Report 107
		docinfo.jsp	Report 108
		document_detail.jsp	Report 109
		document_listing.jsp	Report 110
double.jsp	1	double.jsp	Report 111
eventlistener.jsp	6	eventlistener.jsp	Report 112
faq.jsp	0	faq.jsp
		folder.jsp	Report 113
form_generator.jsp	0	form_generator.jsp
fullbox.jsp	0	fullbox.jsp
		layout.jsp	Report 114
		ldap.jsp	Report 115
		ldap_pop.jsp	Report 116
		ldap_search.jsp	Report 117
links.jsp	0	links.jsp
		mediagallery.jsp	Report 118
		metadataapi.jsp	Report 119
mysettings.jsp	7	mysettings.jsp	Report 120
mysettingschanged.jsp	0	mysettingschanged.jsp
news.jsp	0	news.jsp
		people.jsp	Report 121
		poll.jsp	Report 122
		project.jsp	Report 123
		quizz.jsp	Report 124
		quizz_csv.jsp	Report 125
searchresult.jsp	1	searchresult.jsp	Report 126
search_file_hit_detail.inc	0	search_file_hit_detail.inc
search_hit_detail.jsp	2	search_hit_detail.jsp	Report 127
search_result_pager.inc	0	search_result_pager.inc
simple.jsp	1	simple.jsp	Report 128
sitemap.jsp	0	sitemap.jsp
		survey.jsp	Report 129
		survey_csv.jsp	Report 130
templates.xml	5	templates.xml	Report 131
		testFields.jsp	Report 132
		user_ldap_search.jsp	Report 133
		webdav.jsp	Report 134
ant.build.properties.sample	0	ant.build.properties.sample
build.xml	0	build.xml