Araxis Merge Folder Comparison Report

Produced by Araxis Merge on Fri Oct 19 14:25:41 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

2. Summary for all files

3. Summary for selected files

No files were selected.

4. Comparison options

5. Active regular expressions

No regular expressions were active.

6. Comparison detail

src	0		src
etc	0
struts	0
corporateportal-validation.xml	0
java	0		java
jahiatemplates	0		jahiatemplates
org	0		org
jahia	0		jahia
corporateportal	0
validation	0
beans	0
.cvsignore	0
BoxValidationBean.java	0
LeftMenuValidationBean.java	0
MainMenuValidationBean.java	0
PeopleValidationBean.java	0
ProjectValidationBean.java	0
			corporateportalv2
			ldap
			adminBundleProvider.java
			enginesBundleProvider.java
			GroupWrapper.java
			UserWrapper.java
			search
			FormGeneratorContainerSearcher.java
			validation
			beans
			BlogValidationBean.java
			BoxValidationBean.java
			navigationValidationBean.java
			PeopleValidationBean.java
			ProjectValidationBean.java
Corporate_portal_templates.properties	0
Corporate_portal_templates_de.properties	0
Corporate_portal_templates_en.properties	0
Corporate_portal_templates_es.properties	0
Corporate_portal_templates_fr.properties	0
Corporate_portal_templates_it.properties	0
			Corporate_portal_templates_v2.properties
			Corporate_portal_templates_v2_de.properties
			Corporate_portal_templates_v2_en.properties
			Corporate_portal_templates_v2_es.properties
			Corporate_portal_templates_v2_fr.properties
			Corporate_portal_templates_v2_it.properties
			Corporate_portal_templates_v2_pt.properties
Corporate_portal_templates_zh.properties	0
			jsp
			advsearch
			advsearch.inc
			calendar.jsp
			detailed_search_result_list.inc
			savesearch.inc
			search_result_list.inc
			searchoptions.inc
			simplesearch.inc
			webdavsearch.jsp
			webdavsearchcustomoptions.inc
			webdavsearchpropertydefinition.inc
			websitesearch.inc
			blogs
			eventlistener.inc
			box
			box.jsp
			declarations.inc
			files.inc
			lastNews.inc
			links.inc
			pages.inc
			texts.inc
			webapps.inc
			common
			adminbuttons.inc
			bottom.inc
			common_vars.inc
			declarations.inc
			definitions.inc
			filters.inc
			footerlinks.inc
			main_content.jsp
			pagetitle.jsp
			quicklinks.inc
			site_settings.inc
			top.inc
			top_declarations.inc
			topmenu.inc
			css
			images
			portlets
			tabBorder.gif
			tabLeft.gif
			tabRight.gif
			windowStates.gif
			windowStates_maximized.gif
			windowStates_minimized.gif
			windowStates_normal.gif
			actions.css
			advsearch_css.jsp
			blog_css.xml
			button.css
			edit.css
			jforum.css
			ldap.css
			lihover1.htc
			lihover2.htc
			lihover3.htc
			portlets.css
			print.css
			properties.css
			screen.css
			tab.css
			template_css.jsp
			template_css.xml
			transmenu.css
			trhover.htc
			doc
			eventlistener.inc
			faq
			definitions.inc
			faq.jsp
			form_generator
			definitions.inc
			display_form.inc
			eventlistener.inc
			form_generator.jsp
			process_post.inc
			img
			actions
			action.gif
			add.gif
			component_add.gif
			copy.gif
			delete.gif
			image_add.gif
			note_add.gif
			paste.gif
			update.gif
			upload.gif
			emotions
			alien_1.gif
			alien_2.gif
			angel.gif
			angry.gif
			applause.gif
			batting_eyelashes.gif
			beat_up.gif
			biggrin.gif
			blushing.gif
			chicken.gif
			clown.gif
			coffee.gif
			confused.gif
			cool.gif
			cow.gif
			cowboy.gif
			cry.gif
			crying.gif
			d_oh.gif
			dancing.gif
			devilish.gif
			drooling.gif
			flag.gif
			frown.gif
			frustrated.gif
			good_luck.gif
			hugs.gif
			hypnotized.gif
			idea.gif
			kiss.gif
			laughing.gif
			liar.gif
			love.gif
			money_eyes.gif
			monkey.gif
			nerd.gif
			not_talking.gif
			peace.gif
			pig.gif
			praying.gif
			pumpkin.gif
			raised_eyebrow.gif
			rolling_eyes.gif
			rose.gif
			sad.gif
			shame_on_you.gif
			shhh.gif
			shock.gif
			sick.gif
			silly.gif
			skull.gif
			sleep.gif
			smile.gif
			smug.gif
			straight_face.gif
			talk_to_the_hand.gif
			thinking.gif
			tired.gif
			tongue.gif
			whistling.gif
			wink.gif
			worried.gif
			files
			large
			doc.gif
			file.gif
			html.gif
			img.gif
			pdf.gif
			ppt.gif
			txt.gif
			xls.gif
			zip.gif
			dir.gif
			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
			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
			about.gif
			add.gif
			adminbox.gif
			alumni.jpg
			arrow.gif
			arrow2.gif
			arrow2_left.gif
			arrow3.gif
			arrow3_left.gif
			arrow4.gif
			arrow5.gif
			arrow6.gif
			arrow7.gif
			arrow_left.gif
			back.gif
			bg_button_down.gif
			bg_button_up.gif
			box.gif
			box_delete.gif
			box_fullscreen.gif
			box_new.gif
			box_prop.gif
			box_restore.gif
			box_title_orange.gif
			box_update.gif
			box_upload.gif
			del.gif
			delete.gif
			differentACL.png
			dotted.gif
			esi_invalidate_page.gif
			folder_files.gif
			folder_link.gif
			folder_people.gif
			folder_project.gif
			footer.gif
			from.gif
			grad.gif
			grey-40.png
			header.gif
			index.gif
			jahia_powered.gif
			line.gif
			line_200.gif
			logo-jahia.gif
			logo.gif
			lucene_green_100.gif
			mag.jpg
			mail.gif
			mail_out.gif
			main.gif
			menu_left.gif
			menu_left_tab.gif
			menu_right.gif
			menu_right_tab.gif
			nav.gif
			nav_bottom.gif
			nav_top.gif
			parag.gif
			pix.gif
			push.gif
			query.gif
			refresh.gif
			search.gif
			sort.gif
			splash.gif
			splash.jpg
			step1.gif
			step2.gif
			subject.gif
			submenu-off.gif
			submenu-on.gif
			tab_border.gif
			tab_left.gif
			tab_right.gif
			to.gif
			tocc.gif
			top.gif
			top_left.gif
			top_right.gif
			ttu.gif
			tux.png
			update.gif
			warning.gif
			white-90.png
			x.gif
			javascript
			actions.js
			cptv2.js
			transmenu.inc
			transmenu.js
			transmenu_init.inc
			transmenu_js.jsp
			yav-config_js.inc
			yav.js
			nav
			menu.jsp
			news
			definitions.inc
			eventlistener.inc
			filters.inc
			news.jsp
			splash
			splash.jsp
			advsearchresult.jsp
			corporate_portal_templates.gif
			double.jsp
			eventlistener.jsp
			faq.jsp
			form_generator.jsp
			fullbox.jsp
			links.jsp
			mysettings.jsp
			mysettingschanged.jsp
			news.jsp
			search_file_hit_detail.inc
			search_hit_detail.jsp
			search_result_pager.inc
			searchresult.jsp
			simple.jsp
			sitemap.jsp
			templates.xml
view	0
jsp	0
advsearch	0
advsearch.inc	0
calendar.jsp	0
detailed_search_result_list.inc	0
savesearch.inc	0
search_result_list.inc	0
searchoptions.inc	0
simplesearch.inc	0
webdavsearch.jsp	0
webdavsearchcustomoptions.inc	0
webdavsearchpropertydefinition.inc	0
websitesearch.inc	0
Global	0
fckstyles.xml	0
fcktemplates.xml	0
images	0
emotion	0
alien_1.gif	0
alien_2.gif	0
angel.gif	0
angry.gif	0
applause.gif	0
batting_eyelashes.gif	0
beat_up.gif	0
biggrin.gif	0
blushing.gif	0
chicken.gif	0
clown.gif	0
coffee.gif	0
confused.gif	0
cool.gif	0
cow.gif	0
cowboy.gif	0
cry.gif	0
crying.gif	0
d_oh.gif	0
dancing.gif	0
devilish.gif	0
drooling.gif	0
flag.gif	0
frown.gif	0
frustrated.gif	0
good_luck.gif	0
hugs.gif	0
hypnotized.gif	0
idea.gif	0
kiss.gif	0
laughing.gif	0
liar.gif	0
love.gif	0
money_eyes.gif	0
monkey.gif	0
nerd.gif	0
not_talking.gif	0
peace.gif	0
pig.gif	0
praying.gif	0
pumpkin.gif	0
raised_eyebrow.gif	0
rolling_eyes.gif	0
rose.gif	0
sad.gif	0
shame_on_you.gif	0
shhh.gif	0
shock.gif	0
sick.gif	0
silly.gif	0
skull.gif	0
sleep.gif	0
smile.gif	0
smug.gif	0
straight_face.gif	0
talk_to_the_hand.gif	0
thinking.gif	0
tired.gif	0
tongue.gif	0
whistling.gif	0
wink.gif	0
worried.gif	0
icons	0
standard	0
doc.gif	0
exe.gif	0
file.gif	0
html.gif	0
img.gif	0
link.gif	0
pdf.gif	0
ppt.gif	0
sound.gif	0
txt.gif	0
video.gif	0
xls.gif	0
zip.gif	0
bottom.gif	0
config_icon.gif	0
delete.gif	0
height_decrease.gif	0
height_increase.gif	0
left.gif	0
right.gif	0
sep.gif	0
sep_bottom.gif	0
sep_left.gif	0
sep_right.gif	0
sep_top.gif	0
swap_horizontal.gif	0
swap_vertical.gif	0
top.gif	0
width_decrease.gif	0
width_increase.gif	0
portlets	0
tabBorder.gif	0
tabLeft.gif	0
tabRight.gif	0
windowStates.gif	0
windowStates_maximized.gif	0
windowStates_minimized.gif	0
windowStates_normal.gif	0
action.gif	0
add.gif	0
add_locked.gif	0
add_portlet.gif	0
arrow.gif	0
arrow_on.gif	0
banner_home.gif	0
box_delete.gif	0
box_fullscreen.gif	0
box_new.gif	0
box_prop.gif	0
box_properties.gif	0
box_restore.gif	0
box_update.gif	0
box_upload.gif	0
cellpic1.gif	0
cellpic2.jpg	0
cellpic3.gif	0
consultant.gif	0
corner_admin.gif	0
del.gif	0
delete.gif	0
delete_locked.gif	0
employee.gif	0
esi_invalidate_page.gif	0
folder.gif	0
folder_files.gif	0
folder_link.gif	0
folder_off.gif	0
folder_on.gif	0
folder_people.gif	0
folder_project.gif	0
folder_skills.gif	0
footer_bar.gif	0
help.gif	0
horizontaleline.gif	0
i.gif	0
icon_comment.gif	0
icon_offsite.gif	0
icon_pg.gif	0
jahia_logo.gif	0
jahia_loze.gif	0
jahia_powered.gif	0
l.gif	0
languages_corner.gif	0
lastnode.gif	0
lastnodeminus.gif	0
lastnodeplus.gif	0
leftmenuoff.gif	0
leftmenuon.gif	0
leftmenuon_blue.gif	0
leftmenuon_green.gif	0
leftmenuon_orange.gif	0
leftmenuon_red.gif	0
line_200.gif	0
local.gif	0
lock.gif	0
lock_grey.gif	0
logo.gif	0
lucene_green_100.gif	0
node.gif	0
node_last.gif	0
node_minus.gif	0
node_minus_end.gif	0
node_node.gif	0
node_plus.gif	0
node_plus_end.gif	0
node_vertline.gif	0
nodeminus.gif	0
nodeplus.gif	0
path_separator.gif	0
pix.gif	0
portal.gif	0
print.gif	0
properties.gif	0
properties_button.gif	0
properties_locked.gif	0
remote.gif	0
reset.gif	0
search.gif	0
shortcut.gif	0
sort_asc.gif	0
sort_asc_w.gif	0
sort_desc.gif	0
sort_desc_w.gif	0
splash.gif	0
t.gif	0
top_menu_left_blue_on.gif	0
top_menu_left_green_on.gif	0
top_menu_left_off.gif	0
top_menu_left_on.gif	0
top_menu_left_orange_on.gif	0
top_menu_left_red_on.gif	0
tree_i.gif	0
tree_l.gif	0
tree_t.gif	0
triangle.gif	0
ttu.gif	0
tux.png	0
unlock.gif	0
up.gif	0
update.gif	0
update_locked.gif	0
verticaleline.gif	0
vertline.gif	0
include	0
admin_menu.inc	0
blog_addcomment_form.inc	0
blog_categories.inc	0
blog_declarations.inc	0
blog_definitions.inc	0
blog_entries.inc	0
blog_entry.inc	0
blog_filters.inc	0
blog_list.inc	0
blog_listing_filters.inc	0
blog_searchbox.inc	0
blog_view_comments.inc	0
blog_view_pingurl.inc	0
blog_view_trackbacks.inc	0
box.jsp	0
box_declarations.inc	0
box_files.inc	0
box_link_news.inc	0
box_links.inc	0
box_news.inc	0
box_news_list.inc	0
box_newslast5.inc	0
box_newslast5_cached.inc	0
box_text.inc	0
box_webapps.inc	0
categories.inc	0
categories_list.inc	0
colors_declaration.inc	0
container_revisions_listing.jsp	0
declarations.inc	0
doc.inc	0
faq.inc	0
files.inc	0
filters.inc	0
folder_tree.inc	0
folderDocumentBox.jsp	0
footer.inc	0
globals.inc	0
groupsContainer.inc	0
guestbook.inc	0
header.inc	0
html_file_clipping.inc	0
image.inc	0
language.inc	0
layout.jsp	0
layout_fullscreen.inc	0
layout_process.inc	0
layout_standard.inc	0
left_menu.inc	0
links.inc	0
main_content.jsp	0
main_menu.inc	0
metadataapi.inc	0
multivalues.inc	0
news_body.inc	0
news_declaration.inc	0
news_list.inc	0
page_categories_list.inc	0
page_title.inc	0
page_title_ctn.inc	0
pagination_bar.jsp	0
people.inc	0
people_detail.inc	0
people_list.inc	0
project.inc	0
project_categories.inc	0
quicklink.inc	0
search_result_pager.inc	0
simple_form_generator_definitions.inc	0
simple_form_generator_display_form.inc	0
simple_form_generator_process_post.inc	0
site_settings.inc	0
sitemap.inc	0
skills.inc	0
sources.inc	0
splash.inc	0
top_banner.inc	0
types.inc	0
usersContainer.inc	0
actions.css	0
actions.js	0
advsearch_css.jsp	0
advsearchresult.jsp	0
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
directories.jsp	0
document_detail.jsp	0
document_listing.jsp	0
double.jsp	0
eventlistener.jsp	0
faq.jsp	0
folder.jsp	0
guestbook.jsp	0
home.jsp	0
html_file_clipping.jsp	0
jforum.css	0
layout.jsp	0
links.jsp	0
menu.js	0
metadata_dates.jsp	0
metadata_users.jsp	0
metadataapi.jsp	0
mysettings.jsp	0
mysettingschanged.jsp	0
news_detail.jsp	0
news_list.jsp	0
newuserregistration.jsp	0
people.jsp	0
portlets.css	0
project.jsp	0
search_file_hit_detail.inc	0
search_hit_detail.jsp	0
searchresult.jsp	0
simple.jsp	0
simple_form_generator.jsp	0
sitemap.jsp	0
template_css.jsp	0
templates.xml	0
user_ldap_search.jsp	0
userregistrationok.jsp	0
various.js	0
web_css.jsp	0
ypSlideOutMenu.js	0
.cvsignore	0
ant.build.properties.example	0
			ant.build.properties.sample
build.xml	7		build.xml	Report 1

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