39. Araxis Merge File Comparison Report

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

39.1 Files compared

#	Location	File	Last Modified
1	C:\devel_jahia\corp_V2TemplatesSP3\src\jsp\common	footerlinks.inc	Fri Jun 13 14:29:26 2008 UTC
2	C:\devel_jahia\corp_V2TemplatesSP4\src\jsp\common	footerlinks.inc	Fri Jun 13 14:30:12 2008 UTC

39.2 Comparison summary

Description	Between Files 1 and 2
Description	Text Blocks	Lines
Unchanged	17	108
Changed	9	117
Inserted	7	82
Removed	1	9

39.3 Comparison options

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
CR/LF characters	Not shown in the comparison detail

39.4 Active regular expressions

No regular expressions were active.

39.5 Comparison detail

1	<%--	1	<%--
2	Copyright 2002-2006 Jahia Ltd	2	Copyright 2002-2006 Jahia Ltd
3		3
4	Licensed u nder the J AHIA COMMO N DEVELOPM ENT AND DI STRIBUTION LICENSE ( JCDDL),	4	Licensed u nder the J AHIA COMMO N DEVELOPM ENT AND DI STRIBUTION LICENSE ( JCDDL),
5	Version 1. 0 (the "Li cense"), o r (at your option) a ny later v ersion; yo u may	5	Version 1. 0 (the "Li cense"), o r (at your option) a ny later v ersion; yo u may
6	not use th is file ex cept in co mpliance w ith the Li cense. You should ha ve	6	not use th is file ex cept in co mpliance w ith the Li cense. You should ha ve
7	received a copy of t he License along wit h this pro gram; if n ot, you ma y obtain	7	received a copy of t he License along wit h this pro gram; if n ot, you ma y obtain
8	a copy of the Licens e at	8	a copy of the Licens e at
9		9
10	http://ww w.jahia.or g/license/	10	http://ww w.jahia.or g/license/
11		11
12	Unless req uired by a pplicable law or agr eed to in writing, s oftware	12	Unless req uired by a pplicable law or agr eed to in writing, s oftware
13	distribute d under th e License is distrib uted on an "AS IS" B ASIS,	13	distribute d under th e License is distrib uted on an "AS IS" B ASIS,
14	WITHOUT WA RRANTIES O R CONDITIO NS OF ANY KIND, eith er express or implie d.	14	WITHOUT WA RRANTIES O R CONDITIO NS OF ANY KIND, eith er express or implie d.
15	See the Li cense for the specif ic languag e governin g permissi ons and	15	See the Li cense for the specif ic languag e governin g permissi ons and
16	limitation s under th e License.	16	limitation s under th e License.
17	--%>	17	--%>
18	<content:d eclareCont ainerList name='foot erLinksCon tainerList ' title='Q uick links '>	18	<content:d eclareCont ainerList name='foot erLinksCon tainerList ' title='Q uick links '>
19	<content:d eclareCont ainer>	19	<conte nt:declare Container>
20	<conte nt:declare Field name ='footerLi nk' title= 'Page'	20	<c ontent:dec lareField name='foot erLink' ti tle='Page'
21	ty pe='Page' value="<ja hia_linkon ly>"/>	21	type='Page ' value="< jahia_link only>"/>
22	</content: declareCon tainer>	22	</cont ent:declar eContainer >
23	</content: declareCon tainerList >	23	</content: declareCon tainerList >
24		24
25	<bean:defi ne id="foo terText" v alue=""/>	25	<bean:defi ne id="foo terText" v alue=""/>
26	<bean:defi ne id="isS iteSetting Avaliable" value="fa lse" scope ="request" />
27
28	<content:a bsoluteCon tainerList id="siteS ettingsLis t" name="s iteSetting s" pageLev el="1">
29	<conte nt:contain er id="sit eSettings" >
30	<c ontent:tex tField val ueId="foot erText" na me="footer Text" diff Active="tr ue" displa y="false" defaultVal ue=""/>
31	<% isSiteSet tingAvalia ble="true" ; %>
32	</cont ent:contai ner>
33	</content: absoluteCo ntainerLis t>
34
35		26
36	<%	27	<%
37	JahiaSite s = jParam s.getSite( );	28	JahiaS ite s = jP arams.getS ite();
38	JahiaPage hp = s.get HomePage(j Params.get EntryLoadR equest());	29	JahiaP age hp = s .getHomePa ge(jParams .getEntryL oadRequest ());
39	if (hp != null) {	30	if (hp != null) {
40	String t = hp.ge tTitle();	31	St ring t = h p.getTitle ();
41	%> <div class="foo terlink1"> <a href="<%=j Params.com poseSiteUr l()%>" class="fli nk"><%=t%> </a></div> <%	32	%>
		33	<div class="foo terlink1"> <a href="<%=j Params.com poseSiteUr l()%>" class="fli nk"><%=t%>
		34	</a></div>
		35	<%
42	}	36	}
43		37	final ContainerH TMLCache c acheInstan ce =
		38	Services Registry.g etInstance ().getCach eService() .getContai nerHTMLCac heInstance ();
		39	final Processing Context co ntext = jD ata.getPro cessingCon text();
		40	String cacheKey =
		41	Containe rHTMLCache .appendAES Mode(conte xt,
		42	new S tringBuffe r("_ctnLis tName_").a ppend("foo terLinksCo ntainerLis t")
		43	.append ("_siteKey _")
		44	.append (context.g etSiteKey( )).toStrin g());
		45	Contai nerHTMLCac heEntry ht mlCacheEnt ry =
		46	cacheIns tance.getF romContain erCache(nu ll, jData, cacheKey, false, 0, null, nul l);
		47	String htmlOutpu t;
		48	String cachePara m = contex t.getParam eter(Proce ssingConte xt.CONTAIN ERCACHE_MO DE_PARAMET ER);
		49	if (ht mlCacheEnt ry != null &&
		50	!" off".equal s(cachePar am) &&
		51	!( context.ge tEntryLoad Request() != null && context.g etEntryLoa dRequest() .isVersion ed())) {
		52	if ("debug". equals(cac heParam)) {
		53	pageCont ext.getOut ()
		54	.println(" ContainerC acheOnFire " + Simpl eDateForma t.getDateT imeInstanc e()
		55	.f ormat(cach eInstance. getExpirat ionFromCon tainerCach e(null,
		56	jData,
		57	cacheKey ,
		58	false,
		59	0,
		60	null,
		61	null)));
		62	}
		63	ht mlOutput = htmlCache Entry.getB odyContent ();
		64	}
		65	else {
		66	// topNavigat ionContain erList = j Data.conta iners().ge tAbsoluteC ontainerLi st( "topNa vigationCo ntainerLis t", homePa geId );
		67	St ringBuffer sbf = new StringBuf fer();
		68	Se t<ContentO bjectKey> dependenci es = new H ashSet<Con tentObject Key>();
44	JahiaConta inerList f ooterLinks ContainerL ist =	69	Ja hiaContain erList foo terLinksCo ntainerLis t =
45	jData. containers ().getAbso luteContai nerList("f ooterLinks ContainerL ist", home PageId);	70	jDat a.containe rs().getAb soluteCont ainerList( "footerLin ksContaine rList", ho mePageId);
46	if (footer LinksConta inerList ! = null) {	71	if (footerLi nksContain erList != null) {
47	ContainerL ist B e an footerLink sContainer List B e an =	72	dependenci es.add(new Content ContainerL ist K e y( footerLink sContainer List .g e tID()));
48	new ContainerL istBean(fo oterLinksC ontainerLi st, jParams);	73	ContainerL istBean footerLink sContainer ListBean = new ContainerL istBean(fo oterLinksC ontainerLi st, jParams);
49	Enumer ation foot erLinksCon tainers = footerLink sContainer List.getCo ntainers() ;	74	Enumerat ion footer LinksConta iners = fo oterLinksC ontainerLi st.getCont ainers();
50	while (footerLin ksContaine rs.hasMore Elements() ) {	75	while (f ooterLinks Containers .hasMoreEl ements()) {
51	JahiaConta iner footerLink sContainer =	76	JahiaConta iner footerLink sContainer = (JahiaCont ainer) footerLink sContainer s.nextElem ent();
52	(Jah i a Container ) footerLink sContainer s . nextElem e n t () ;	77	dependenc i es. a dd(new Content Container Key( footerLink sContainer . g e t ID () )) ;
53	Ja hiaPage fo oterLink = (JahiaPag e) footerL inksContai ner.getFie ldObject(" footerLink ");	78	Jahi aPage foot erLink = ( JahiaPage) footerLin ksContaine r.getField Object("fo oterLink") ;
54	if (footerLi nk != null ) {	79	if ( footerLink != null) {
55	%>	80	dependenci es.add(new ContentPa geKey(foot erLink.get ID()));
56	< d iv class= "f ooter link ">	81	sbf.append ("<div cla ss=\"foote rlink\"> < a href=\"" )
57	< a hr e f="<%= footerLink .get URL ( jParams ) %>"	82	.a ppend(foot erLink.get URL(jParam s))
58	title="<%= footerLink .getTitle( )%>" class ="flink">< span><%=fo oterLink.g etTitle()% ></span></ a>	83	.append("\ " title=\" ")
59	<%	84	.a ppend(foot erLink.get Title())
		85	.appen d ("\" class= \ "f link \ "> <span>")
		86	. a pp e nd( footerLink .get Title ( ) )
		87	.a ppend("</s pan></a>") ;
		88
60	if ( isEditMode ) {	89	if (isEdit Mode) {
61	ContainerB ean footerLink sContainer Bean =	90	ContainerB ean footerLink sContainer Bean = new ContainerB ean(footer LinksConta iner, jParams);
62	ne w Co n t a i n e rBea n (footerLin ksContaine r ,jPar a ms);	91	jData. gui()
63	jData.gui( ).html().d rawBeginAc tionMenu(f ooterLinks ContainerB ean ,	92	.html()
64	null, null, fals e, ".foote rLink", "j ahiatempla tes.Corpor ate_portal _templates _v2", null , out);	93	.dra w Begi n Ac t i o n M e n u (footerLin ksContaine r Be a n,
		94	null ,
		95	null,
		96	false,
		97	".foote rLink",
		98	"jahiat emplates.C orporate_p ortal_temp lates_v2",
		99	null,
		100	sbf);
65	}	101	}
66	%>	102	sbf.append ("</div>") ;
67	</div>	103	}
68	<%	104	else {
69	} else {
70	if (isEd itMode) {	105	if (isEdit Mode) {
71	logg er.warn("Q uick link for contai ner " + fo oterLinksC ontainer.g etID() + " is NULL") ;	106	logger .warn("Qui ck link fo r containe r " + foot erLinksCon tainer.get ID() + " i s NULL");
72	%>	107	sbf.append (" <div class= \ "footerlin k \"> <a href=\"#\" class=\"fl ink\ "> ")
73	<div class= "footerlin k ">	108	.append( JahiaResou rceBundle. getMessage Resource(" message.no Link",
74	<a href="# " class="f link"><con tent:resou rceBundle	109	jParams.ge tLocale(),
75	resourceBu ndle= "jahiatemp lates.Corp orate_port al_templat es_v2"	110	"jahiatemp lates.Corp orate_port al_templat es_v2" ))
76	resourceNa me="messag e.noLink"/ ></a>	111	.append( "</a>");
77	<%	112	Contai nerBean fo oterLinksC ontainerBe an = new C ontainerBe an(footerL inksContai ner, jPara ms);
78	ContainerB ean footer LinksConta inerBean =	113	jData. gui()
79	n ew Contain erBean(foo terLinksCo ntainer,jP arams);	114	.html()
80	jData.gui( ).html().d rawBeginAc tionMenu(f ooterLinks ContainerB ean ,	115	.drawBegin ActionMenu (footerLin ksContaine rBean,
81	null, null, false, ".footerLi nk", "jahiatemp lates.Corp orate_port al_templat es_v2", null, out);	116	null,
82	%>	117	n ull,
83	</div>	118	false ,
84	<%	119	".foote rLink",
		120	"jahiatemp lates.Corp orate_port al_templat es_v2",
		121	null,
		122	sbf);
		123	sbf.append ("</div>") ;
85	}	124	}
86	}	125	}
87	}	126	}
88	if (is EditMode) {	127	if (isEd itMode) {
		128	sbf. append("<d iv class=\ "footerlin k\">");
		129	jDat a.gui()
		130	.html( )
		131	.drawB eginAction Menu(foote rLinksCont ainerListB ean,
		132	null,
		133	null,
		134	false ,
		135	".foo terLinks",
		136	"jahi atemplates .Corporate _portal_te mplates_v2 ",
		137	null,
		138	sbf);
		139	sbf. append("</ div>");
		140	}
		141	}
		142	ht mlOutput = sbf.toStr ing();
		143	ca cheInstanc e.writeToC ontainerCa che(null, jData, htm lOutput, c acheKey, d ependencie s, -1);
		144	}
		145	if (Ja hia.getSet tings().is OutputCont ainerCache Activated( ) && !Jahi a.getSetti ngs().isEs iCacheActi vated())
		146	ou t.print("< esi:includ e src=\"" +
		147	co ntext.getS iteURL(con text.getSi te(), cont ext.getPag eID(), fal se, true, true) +
		148	"? ctnid=0&ca cheKey=" +
		149	ca cheKey +
		150	"\ ">");
		151	out.pr int(htmlOu tput);
		152	if (Ja hia.getSet tings().is OutputCont ainerCache Activated( ) && !Jahi a.getSetti ngs().isEs iCacheActi vated())
		153	ou t.print("< /esi:inclu de>\n");
89	%>	154	%>
		155
		156	<content:a bsoluteCon tainerList id="siteS ettingsLis t" name="s iteSetting s" pageLev el="1">
		157	<conte nt:contain er id="sit eSettings" cacheKey= "footer">
		158	<c ontent:tex tField val ueId="foot erText" na me="footer Text" diff Active="tr ue" displa y="false" defaultVal ue=""/>
		159
90	<d iv class=" footerlink ">	160	<d iv class=" footerlink ">
91	<%	161	<bean:wr ite name=" footerText " filter=" false"/>
92	jData.gu i().html() .drawBegin ActionMenu (footerLin ksContaine rListBean,
93	null , null, fa lse, ".foo terLinks", "jahiatem plates.Cor porate_por tal_templa tes_v2", n ull, out);
94	%>
95	</ div>	162	</ div>
		163	</cont ent:contai ner>
		164	<logic :equal nam e="siteSet tingsList" property= "fullSize" value="0" >
96	<%	165	<%
		166	cacheKey =
		167	ContainerH TMLCache.a ppendAESMo de(context ,
		168	new Str ingBuffer( "_ctnListN ame_").app end("siteS ettingsLis t_footer")
		169	.append(" _siteKey_" )
		170	.append(c ontext.get SiteKey()) .toString( ));
		171	htmlCach eEntry = c acheInstan ce.getFrom ContainerC ache(null, jData, ca cheKey, fa lse, 0, nu ll, null);
		172	htmlOutp ut = "";
		173	if (html CacheEntry != null & &
		174	!"of f".equals( cacheParam ) &&
		175	!(co ntext.getE ntryLoadRe quest() != null && c ontext.get EntryLoadR equest().i sVersioned ())) {
		176	if ( "debug".eq uals(cache Param)) {
		177	pageContex t.getOut()
		178	.p rintln("Co ntainerCac heOnFire " + SimpleD ateFormat. getDateTim eInstance( )
		179	.for mat(cacheI nstance.ge tExpiratio nFromConta inerCache( null,
		180	jData,
		181	cacheKey,
		182	false,
		183	0,
		184	null,
		185	null)));
97	}	186	}
		187	html Output = h tmlCacheEn try.getBod yContent() ;
98	}	188	}
		189	else {
		190	//to pNavigatio nContainer List = jDa ta.contain ers().getA bsoluteCon tainerList ( "topNavi gationCont ainerList" , homePage Id );
		191	Stri ngBuffer s bf = new S tringBuffe r();
		192	Set< ContentObj ectKey> de pendencies = new Has hSet<Conte ntObjectKe y>();
		193	depe ndencies.a dd(new Con tentContai nerListKey (((Contain erListBean ) (pageCon text.getAt tribute(
		194	"siteS ettingsLis t"))).getI D()));
		195	html Output = s bf.toStrin g();
		196	cach eInstance. writeToCon tainerCach e(null,
		197	jData,
		198	htmlOutp ut,
		199	cacheKey ,
		200	dependen cies,
		201	-1);// T his piece of html wi ll be expi red based on value o f containe rCacheDefa ultExpirat ionDelay i nside jahi a.properti es
		202	}
		203	if (Jahi a.getSetti ngs().isOu tputContai nerCacheAc tivated() && !Jahia. getSetting s().isEsiC acheActiva ted())
		204	out. print("<es i:include src=\"" +
		205	cont ext.getSit eURL(conte xt.getSite (), contex t.getPageI D(), false , true, tr ue) +
		206	"?ct nid=0&cach eKey=" +
		207	cach eKey +
		208	"\"> ");
		209	out.prin t(htmlOutp ut);
		210	if (Jahi a.getSetti ngs().isOu tputContai nerCacheAc tivated() && !Jahia. getSetting s().isEsiC acheActiva ted())
		211	out. print("</e si:include >\n");
99	%>	212	%>
		213	</logi c:equal>
		214	</content: absoluteCo ntainerLis t>
		215
		216
		217