From 99ccb72ea569e28c0dc428e7e79ca90a103eefbc Mon Sep 17 00:00:00 2001
From: Dave Ward <left@alfresco.com>
Date: Thu, 1 Mar 2012 11:41:07 +0000
Subject: [PATCH] =?UTF-8?q?Merged=20V4.0-BUG-FIX=20to=20HEAD=20=20=20=2034?=
 =?UTF-8?q?060:=20Merged=20V4.0=20(4.0)=20to=204.0-BUG-FIX=20(4.0.1)=20<<<?=
 =?UTF-8?q?=20NOTE=20ALF-12939=20still=20needs=20to=20be=20done=20to=20com?=
 =?UTF-8?q?plete=20this=20merge=20to=204.0.1=20>>>=20=20=20=20=20=20=20330?=
 =?UTF-8?q?56:=20Fix=20for=20ALF-12280:=20Upgrading=20from=20version=203.4?=
 =?UTF-8?q?.7=20to=204.0.0=20failed=20with=20MS=20SQL=20database=20=20=20?=
 =?UTF-8?q?=20=20=20=20=20-=20Added=20dialect-specific=20script=20for=20SQ?=
 =?UTF-8?q?L=20Server=20=20=20=20=20=20=2033059:=20Fix=20for=20ALF-12127,?=
 =?UTF-8?q?=20ALF-11161,=20ALF-11988=20=20=20=20=20=20=20=20=20=20Merged?=
 =?UTF-8?q?=20BRANCHES/DEV/THOR1=20to=20BRANCHES/V4.0=20=20=20=20=20=20=20?=
 =?UTF-8?q?=20=20=20=20=20=2033049:=20Fixed=20follow=20issues=20on=20THOR-?=
 =?UTF-8?q?839=20&=20THOR-826=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20?=
 =?UTF-8?q?=20=20=20=20=20-=20Following=20webscripts=20now=20sets=20"Conte?=
 =?UTF-8?q?nt-Type"=20response=20header=20to=20application/json=20=20=20?=
 =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20-=20which=20?=
 =?UTF-8?q?makes=20people=20search=20display=20follow=20buttons=20for=20pe?=
 =?UTF-8?q?ople=20correctly=20=20=20=20=20=20=20Fix=20for=20ALF-12077=20?=
 =?UTF-8?q?=20=20=20=20=20=20=20=20=20Merged=20BRANCHES/DEV/V3.4-BUG-FIX?=
 =?UTF-8?q?=20to=20BRANCHES/V4.0=20=20=20=20=20=20=20=20=20=20=20=20=20329?=
 =?UTF-8?q?99:=20Fix=20for=20ALF-12050=20-=20IE=20specific=20handling=20of?=
 =?UTF-8?q?=20Ajax=20requests=20does=20not=20correctly=20respect=20no-cach?=
 =?UTF-8?q?e=20setting,=20need=20to=20set=20Expires=20header=20also=20=20?=
 =?UTF-8?q?=20=20=20=20=2033060:=20Fix=20for=20ALF-12208=20-=20group=20nam?=
 =?UTF-8?q?e=20encoding=20=20=20=20=20=20=2033072:=20Merge=20from=20HEAD?=
 =?UTF-8?q?=20to=20V4.0=20=20=20=20=20=20=20=20=20=2033071:=20ALF-11843=20?=
 =?UTF-8?q?CLONE=20-=20Enterprise=20unlimited=20licenses=20still=20get=20i?=
 =?UTF-8?q?nvalidated=20turning=20the=20system=20into=20read-only=20mode?=
 =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20-=20Fixed=20build=20fail?=
 =?UTF-8?q?ure=20in=20HeartBeat.=20It=20had=20relied=20on=20the=20fact=20t?=
 =?UTF-8?q?hat=20the=20previous=20LicenseComponent=20kept=20calling=20onLi?=
 =?UTF-8?q?censeChange=20every=20time=20=20=20=20=20=20=20=20=20=20=20=20?=
 =?UTF-8?q?=20=20=20the=20license=20was=20checked.=20It=20needed=20the=20c?=
 =?UTF-8?q?heck=201=20minute=20after=20the=20initial=20bootstrap=20call=20?=
 =?UTF-8?q?as=20there=20was=20a=20memory=20model=20sync=20issue=20in=20the?=
 =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20HeartBeat=20constr?=
 =?UTF-8?q?uctor=20to=20do=20with=20setting=20the=20URL=20it=20needed=20to?=
 =?UTF-8?q?=20call.=20=20=20=20=20=20=2033073:=20Fix=20for=20ALF-12295=20-?=
 =?UTF-8?q?=20CLONE=20-=20Upload=20issue=20=3F=20-=20Failed=20to=20get=20c?=
 =?UTF-8?q?ontent=20...=20(No=20such=20file=20or=20directory)=20...=20x22?=
 =?UTF-8?q?=20=20=20=20=20=20=2033083:=20Merge=20from=20HEAD=20to=20V4.0?=
 =?UTF-8?q?=20=20=20=20=20=20=20=20=20=2033082:=20ALF-11843=20CLONE=20-=20?=
 =?UTF-8?q?Enterprise=20unlimited=20licenses=20still=20get=20invalidated?=
 =?UTF-8?q?=20turning=20the=20system=20into=20read-only=20mode=20=20=20=20?=
 =?UTF-8?q?=20=20=20=20=20=20=20=20=20-=20Did=20not=20refresh=20Tortoise?=
 =?UTF-8?q?=20window,=20this=20file=20was=20missed=20in=20the=20last=20com?=
 =?UTF-8?q?mit=20=20=20=20=20=20=20=20=20=2033080:=20ALF-11843=20CLONE=20-?=
 =?UTF-8?q?=20Enterprise=20unlimited=20licenses=20still=20get=20invalidate?=
 =?UTF-8?q?d=20turning=20the=20system=20into=20read-only=20mode=20=20=20?=
 =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20-=20On=20reflection=20de?=
 =?UTF-8?q?cided=20to=20call=20onLicenseChange=20every=20time=20the=20lice?=
 =?UTF-8?q?nse=20is=20checked.=20=20=20=20=20=20=20=20=20=20=20=20=20=20?=
 =?UTF-8?q?=20=20=20=20A=20change=20of=20valid=20license=20would=20not=20h?=
 =?UTF-8?q?ave=20resulted=20in=20a=20call=20to=20onLicenseChange=20=20=20?=
 =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20Also=20have=20been?=
 =?UTF-8?q?=20able=20to=20make=20failure=20and=20success=20code=20more=20s?=
 =?UTF-8?q?ymmetrical.=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20-=20?=
 =?UTF-8?q?The=20previous=20commit=20also=20added=20a=20RetryingTransactio?=
 =?UTF-8?q?n=20around=20the=20sendData()=20call=20to=20=20=20=20=20=20=20?=
 =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20currentRepoDescriptorDAO.getLi?=
 =?UTF-8?q?censeKey()=20which=20I=20found=20while=20making=20the=20HeartBe?=
 =?UTF-8?q?at=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20changes?=
 =?UTF-8?q?.=20As=20a=20result=20we=20should=20no=20longer=20see=20the=20e?=
 =?UTF-8?q?rror=20in=204.0=20about=20there=20not=20being=20a=20=20=20=20?=
 =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=20transaction.=20=20=20?=
 =?UTF-8?q?=20=20=20=2033087:=20Calendar:=20Permissions=20updates,=20fixes?=
 =?UTF-8?q?:=20ALF-12179=20&=20makes=20the=20permissions=20flag=20boolean.?=
 =?UTF-8?q?=20=20=20=20=20=20=2033088:=20FIXED=20:=20ALF-11862:=20An=20err?=
 =?UTF-8?q?or=20message=20appears=20when=20you=20open=20the=20"edit=20task?=
 =?UTF-8?q?",=20to=20request=20to=20join=20the=20"moderated=20site"=20=20?=
 =?UTF-8?q?=20=20=20=20=20Now=20handles=20null=20value=20=20=20=20=20=20?=
 =?UTF-8?q?=2033102:=20Fix=20for=20ACT=20#15024-37148=20(will=20update=20w?=
 =?UTF-8?q?ith=20JIRA=20no.=20once=20available)=20=20=20=20=20=20=20-=20is?=
 =?UTF-8?q?sue=20where=20in=20a=20load=20balanced=20Share=20environment=20?=
 =?UTF-8?q?(multiple=20web-tiers=20behind=20a=20reverse=20proxy)=20the=20m?=
 =?UTF-8?q?odification=20to=20the=20template=20layout=20selection=20for=20?=
 =?UTF-8?q?a=20site=20or=20user=20dashboard=20would=20not=20be=20reflected?=
 =?UTF-8?q?=20in=20all=20servers.=20=20=20=20=20=20=2033105:=20Bitrock=20l?=
 =?UTF-8?q?icense=20notice=20file.=20=20=20=20=20=20=2033114:=20Merged=20D?=
 =?UTF-8?q?EV=20to=20V4.0=20=20=20=20=20=20=20=20=20=2033067:=20Fix=20ALF-?=
 =?UTF-8?q?12206:=20CMIS:=20Error=20getting=20association=20information=20?=
 =?UTF-8?q?referencing=20archived=20node=20=20=20=20=20=20=2033122:=20Fix?=
 =?UTF-8?q?=20for=20ALF-12316=20Repo=20->=20SOLR=20query=20uses=20HTTPClie?=
 =?UTF-8?q?nt=20that=20only=20supports=202=20simultaneous=20connections=20?=
 =?UTF-8?q?=20=20=20=20=20=20-=20configurable=20via=20spring=20(default=20?=
 =?UTF-8?q?if=20unconfigured=20is=2040=20connections=20to=20one=20host=20a?=
 =?UTF-8?q?nd=2040=20max=20connections)=20=20=20=20=20=20=2033142:=20ALF-1?=
 =?UTF-8?q?2339:=20Prevents=20ArrayOutOfBoundsException=20that=20can=20occ?=
 =?UTF-8?q?ur=20with=20concurrent=20access=20of=20i18n=20bundle=20in=20Web?=
 =?UTF-8?q?Script=20=20=20=2034065:=20Fix=20for=20ALF-12708=20(part=202)?=
 =?UTF-8?q?=20=20=20=20=20=20-=20Alfresco=20opencmis=20extensions=20librar?=
 =?UTF-8?q?y=20=20=20=2034093:=20ALF-10902=20:=20CIFS:=20No=20friendly=20n?=
 =?UTF-8?q?otification=20occurs=20when=20Editor=20or=20Collaborator=20trie?=
 =?UTF-8?q?s=20to=20delete=20content=20=20=20=2034120:=20ALF-12767=20:=20C?=
 =?UTF-8?q?IFS=20TextEdit=20-=20File=20has=20been=20modified=20outside=20T?=
 =?UTF-8?q?extEdit=20=20=20=2034125:=20Merged=20BRANCHES\V4.0=20to=20BRANC?=
 =?UTF-8?q?HES\DEV\V4.0-BUG-FIX=20=20=20=20=20=20=20=2034094:=20Fix=20for?=
 =?UTF-8?q?=20ALF-12944=20OpenCMIS=20-=20CMIS-QL=20-=20Range=20queries=20f?=
 =?UTF-8?q?or=20date=20and=20datetime=20properties=20fail=20=20=20=20=20?=
 =?UTF-8?q?=20=20=2034095:=20Fix=20for=20ALF-12944=20OpenCMIS=20-=20CMIS-Q?=
 =?UTF-8?q?L=20-=20Range=20queries=20for=20date=20and=20datetime=20propert?=
 =?UTF-8?q?ies=20fail=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20-=20caug?=
 =?UTF-8?q?ht=20incorrect=20exception=20-=20so=20much=20for=20reading=20th?=
 =?UTF-8?q?e=20Java=20Doc=20:-)=20=20=20=20=20=20=20=20=20=20=20=20=20=20?=
 =?UTF-8?q?=20-=20build=20fix=20=20=20=2034138:=20ALF-564=20:=20Is=20netwo?=
 =?UTF-8?q?rk-protocol-context.xml=20still=20useful=20=3F=20=20=20=2034149?=
 =?UTF-8?q?:=20Removes=20more=20server=20side=20rendered=20dates:=20=20=20?=
 =?UTF-8?q?=20Fixes:=20ALF-12965,=20ALF-12984,=20ALF-12988.=20=20=20=20341?=
 =?UTF-8?q?58:=20Fix=20for=20ALF-12741=20-=20Steck=20specific=20:=20error?=
 =?UTF-8?q?=20on=20managing=20groups=20=20=20=2034176:=20Merged=20BRANCHES?=
 =?UTF-8?q?\V4.0=20to=20BRANCHES\DEV\V4.0-BUG-FIX=20=20=20=20=20=20=20=203?=
 =?UTF-8?q?4155:=20Fix=20for=20ALF-12979=20CLONE=20-=20Search=20-=20search?=
 =?UTF-8?q?ing=20in=20site=20without=20any=20images=20for=20*.jpg=20brings?=
 =?UTF-8?q?=20back=20all=20the=20documents=20=20=20=20=20=20=20=20=20=20?=
 =?UTF-8?q?=20=20=20=20=20-=20note=20this=20relies=20on=20wildcard/prefix/?=
 =?UTF-8?q?term/phrase=20all=20going=20through=20the=20phrase=20implementa?=
 =?UTF-8?q?tion=20for=20wildcard=20from=20ALF-12162=20=20=20=2034193:=20Fi?=
 =?UTF-8?q?x=20for=20ALF-12205=20=20=20=2034196:=20Fix=20for=20ALF-12758?=
 =?UTF-8?q?=20=20=20=2034201:=20ALF-12892:=20Ensure=20that=20document=20pe?=
 =?UTF-8?q?rmissions=20are=20refreshed=20in=20the=20dialog=20after=20being?=
 =?UTF-8?q?=20changed=20=20=20=2034214:=20Switched=20off=20the=20CIFS=20Ke?=
 =?UTF-8?q?rberos=20ticket=20cracking=20code=20by=20default,=20added=20a?=
 =?UTF-8?q?=20config=20value=20to=20enable=20it,=20latest=20JVMs=20do=20no?=
 =?UTF-8?q?t=20require=20this.=20Part=20of=20ALF-12294.=20=20=20=20CIFS=20?=
 =?UTF-8?q?Kerberos=20authentication=20now=20works=20with=20the=20IBM=20JD?=
 =?UTF-8?q?K.=20=20=20=2034215:=20Switched=20off=20the=20CIFS=20Kerberos?=
 =?UTF-8?q?=20ticket=20cracking=20code=20by=20default,=20added=20a=20prope?=
 =?UTF-8?q?rty=20to=20enable=20it,=20latest=20JVMs=20do=20not=20require=20?=
 =?UTF-8?q?this.=20Part=20of=20ALF-12294.=20=20=20=20CIFS=20Kerberos=20aut?=
 =?UTF-8?q?hentication=20now=20works=20with=20the=20IBM=20JDK=20(and=20Ope?=
 =?UTF-8?q?nJDK,=20Oracle/Sun=20JVMs)=20=20=20=2034219:=20Merged=20BRANCHE?=
 =?UTF-8?q?S/DEV/THOR1=20to=20BRANCHES/DEV/V4.0-BUG-FIX:=20=20=20=20=20=20?=
 =?UTF-8?q?=2032096:=20THOR-429:=20Fix=20"MT:=20Thumbnail=20+=20Preview=20?=
 =?UTF-8?q?are=20not=20updated=20(after=20uploading=20new=20version)"=20?=
 =?UTF-8?q?=20=20=20=20=20=2032125:=20THOR-429:=20Fix=20"MT:=20Thumbnail?=
 =?UTF-8?q?=20+=20Preview=20are=20not=20updated=20(after=20uploading=20new?=
 =?UTF-8?q?=20version)"=20=20=20=2034220:=20Minor:=20follow-on=20to=20r342?=
 =?UTF-8?q?19=20(ALF-11563)=20=20=20=2034226:=20ALF-12780:=09Mac=20OS=20X?=
 =?UTF-8?q?=20Lion=2010.7.2:=20Editing=20a=20document=20via=20CIFS=20and?=
 =?UTF-8?q?=20TextEdit=20removes=20versionable=20aspect=20from=20this=20fi?=
 =?UTF-8?q?le=20=20=20=2034228:=20ALF-12689:=20Fixed=20character=20encodin?=
 =?UTF-8?q?g=20issue=20with=20dynamic=20welcome=20dashlet=20=20=20=2034237?=
 =?UTF-8?q?:=20ALF-12740:=20Updated=20XHR=20requests=20to=20include=20a=20?=
 =?UTF-8?q?noCache=20request=20parameter=20to=20address=20IE=20issue=20whe?=
 =?UTF-8?q?re=20304=20reponse=20is=20assumed=20for=20XHR=20request=20=20?=
 =?UTF-8?q?=20=2034240:=20ALF-12835:=20Second=20click=20in=20status=20box?=
 =?UTF-8?q?=20no=20longer=20clears=20status=20=20=20=2034241:=20ALF-11991:?=
 =?UTF-8?q?=20Updated=20DocLib=20to=20support=20categories=20=20=20=203424?=
 =?UTF-8?q?5:=20Merged=20BRANCHES/DEV/THOR1=5FSPRINTS=20to=20BRANCHES/DEV/?=
 =?UTF-8?q?V4.0-BUG-FIX:=20=20=20=20=20=20=2033420:=20THOR-1000:=20Solr=20?=
 =?UTF-8?q?tracking:=20NodeContentGet=20should=20not=20create=20(empty)=20?=
 =?UTF-8?q?temp=20file=20if=20there=20is=20no=20transformer=20(eg.=20for?=
 =?UTF-8?q?=20image=20node)=20=20=20=2034246:=20Reverse=20merge=20of=20BRA?=
 =?UTF-8?q?NCHES/DEV/V4.0-BUG-FIX=20-c=2034245=20=20=20=20Due=20to=20an=20?=
 =?UTF-8?q?'svn=20commit'=20command=20argument=20ordering=20error,=20I=20c?=
 =?UTF-8?q?hecked=20in=20the=20solrcore.properties=20files.=20This=20rever?=
 =?UTF-8?q?se=20merge=20removes=20those=20changes.=20=20=20=2034247:=20Mer?=
 =?UTF-8?q?ged=20BRANCHES/DEV/THOR1=5FSPRINTS=20to=20BRANCHES/DEV/V4.0-BUG?=
 =?UTF-8?q?-FIX:=20=20=20=20=20=20=2033420:=20THOR-1000:=20Solr=20tracking?=
 =?UTF-8?q?:=20NodeContentGet=20should=20not=20create=20(empty)=20temp=20f?=
 =?UTF-8?q?ile=20if=20there=20is=20no=20transformer=20(eg.=20for=20image?=
 =?UTF-8?q?=20node)=20=20=20=2034249:=20ALF-12782=20:=20IMAP=20-=20No=20fr?=
 =?UTF-8?q?iendly=20notification=20occurs=20when=20a=20user=20without=20de?=
 =?UTF-8?q?lete=20permissions=20tries=20to=20delete=20content=20=20=20=203?=
 =?UTF-8?q?4254:=20Fix=20for=20ALF-13090=20SOLR=20-=20cross=20tokenisation?=
 =?UTF-8?q?=20field=20matches=20too=20much=20for=20"*u*a"=20=20=20=2034262?=
 =?UTF-8?q?:=20Fixes:=20ALF-11557:=20Publishing=20Balloon=20popups=20appea?=
 =?UTF-8?q?ring=20in=20wrong=20locations.=20Now=20appears=20in=20correct?=
 =?UTF-8?q?=20location=20in=20Doc=20Lib=20&=20replaced=20with=20standard?=
 =?UTF-8?q?=20popup=20message=20on=20Channel=20Admin=20page.=20=20=20=2034?=
 =?UTF-8?q?279:=20NodeDAO:=20re-parent=20"lost=20&=20found"=20orphan=20chi?=
 =?UTF-8?q?ld=20nodes=20(see=20ALF-12358=20&=20ALF-13066=20/=20SYS-301)=20?=
 =?UTF-8?q?=20=20=20-=20if=20orphaned=20nodes=20are=20identified=20(eg.=20?=
 =?UTF-8?q?via=20getPath(s))=20then=20attempt=20partial=20recovery=20by=20?=
 =?UTF-8?q?placing=20them=20in=20(temp)=20lost=5Ffound=20=20=20=20-=20...?=
 =?UTF-8?q?=20ALF-12358=20('child'=20node=20has=20deleted=20parent(s))=20?=
 =?UTF-8?q?=20=20=20-=20...=20ALF-13066=20(non-root=20'child'=20node=20has?=
 =?UTF-8?q?=20no=20parent(s))=20=20=20=20-=20for=20internal=20use=20only?=
 =?UTF-8?q?=20-=20allows=20index=20tracking=20(eg.=20Solr)=20to=20continue?=
 =?UTF-8?q?=20=20=20=20-=20precursor=20to=20fixing=20underlying=20root=20c?=
 =?UTF-8?q?auses=20=20=20=20-=20includes=20merge=20&=20extension=20of=20"t?=
 =?UTF-8?q?estConcurrentLinkToDeletedNode"=20(from=20DEV/DEREK/ALF-12358)?=
 =?UTF-8?q?=20=20=20=2034298:=20Merged=20V3.4-BUG-FIX=20to=20V4.0-BUG-FIX?=
 =?UTF-8?q?=20=20=20=20=20=20=2034068:=20Fix=20for=20ALF-342=20-=20Enterin?=
 =?UTF-8?q?g=20a=20search=20containing=20a=20double=20quote=20displays=20p?=
 =?UTF-8?q?op-up=20500=20error=20in=20OpenSearch=20JSF=20component=20=20?=
 =?UTF-8?q?=20=20=20=20=2034069:=20Fix=20for=20ALF-342=20-=20Completed=20f?=
 =?UTF-8?q?ix=20with=20additional=20encoded=20of=20output=20HTML=20=20=20?=
 =?UTF-8?q?=20=20=20=2034070:=20Fix=20for=20ALF-12553=20-=20Users=20are=20?=
 =?UTF-8?q?unable=20to=20see=20more=20than=20100=20sites=20under=20'My=20S?=
 =?UTF-8?q?ites'=20page.=20List=20length=20now=20configurable.=20=20=20=20?=
 =?UTF-8?q?=20=20=2034080:=20Fix=20for=20ALF-10306=20-=20Share=20Advanced?=
 =?UTF-8?q?=20search=20issue=20with=20the=20Date=20Range=20form=20values?=
 =?UTF-8?q?=20=20=20=20=20=20=2034107:=20Added=20missing=20jar=20lib=20to?=
 =?UTF-8?q?=20wcmquickstart=20and=20webeditor=20dependencies=20=20=20=20?=
 =?UTF-8?q?=20=20=2034114:=20Fix=20for=20ALF-10284=20-=20User=20should=20b?=
 =?UTF-8?q?e=20informed=20when=20user=20provides=20invalid=20credentials?=
 =?UTF-8?q?=20while=20opening=20document=20using=20link=20=20=20=20=20=20?=
 =?UTF-8?q?=2034151:=20Merged=20V3.4=20(3.4.8)=20to=20V3.4-BUG-FIX=20(3.4.?=
 =?UTF-8?q?9)=20=20=20=20=20=20=20=20=20=2034121:=20Merged=20BELARUS/V3.4-?=
 =?UTF-8?q?BUG-FIX-2012=5F01=5F26=20to=20V3.4=20(3.4.8)=20=20=20=20=20=20?=
 =?UTF-8?q?=20=20=20=20=20=20=20Should=20have=20been=20done=20in=203.4.7?=
 =?UTF-8?q?=20in=20ALF-12174=20but=20was=20not=20found=20by=20Eclipse=20se?=
 =?UTF-8?q?arch=20=20=20=20=20=20=20=20=20=20=20=20=2034100:=20ALF-12948?=
 =?UTF-8?q?=20:=20Copyright=20year=20on=20"About=20Alfresco"=20page=20is?=
 =?UTF-8?q?=20out=20of=20date=20=20=20=20=20=20=20=20=20=20=20=20=20Update?=
 =?UTF-8?q?d=20copyright=20year=20to=202012.=20=20=20=20=20=20=20=20=20=20?=
 =?UTF-8?q?34150:=20ALF-10976=20(relates=20to=20ALF-10412)=20=20=20=20=20?=
 =?UTF-8?q?=20=20=20=20=20=20=20=20-=20Thumbnail=20mimetype=20check=20shou?=
 =?UTF-8?q?ld=20have=20been=20>=3D=200=20not=20>=200.=20=20=20=20=20=20=20?=
 =?UTF-8?q?34171:=20ALF-13016=20:=20TestModel=20class=20exits=20with=20a?=
 =?UTF-8?q?=20return=20code=20of=200=20even=20if=20model=20fails=20validat?=
 =?UTF-8?q?ion.=20=20=20=20=20=20=2034190:=20A=20modifiable=20map=20that?=
 =?UTF-8?q?=20protects=20and=20underlying=20map=20from=20modification=20?=
 =?UTF-8?q?=20=20=20=20=20=20=20-=20When=20cloning=20the=20backing=20map?=
 =?UTF-8?q?=20(in=20the=20event=20of=20an=20potentially-modifying=20operat?=
 =?UTF-8?q?ion)=20keys=20and=20values=20=20=20=20=20=20=20=20=20=20are=20s?=
 =?UTF-8?q?pecifically=20checked=20for=20mutability=20to=20prevent=20exces?=
 =?UTF-8?q?sive=20cloning.=20=20=20=20=20=20=20=20-=20Working=20towards=20?=
 =?UTF-8?q?fix=20for=20ALF-12855=20=20=20=20=20=20=2034191:=20Fix=20ALF-12?=
 =?UTF-8?q?855:=20Improvement=20for=20Lucene=20in=20memory=20sorting=20and?=
 =?UTF-8?q?=20improvement=20for=20nodeService.getProperty()=20=20=20=20=20?=
 =?UTF-8?q?=20=20=20-=20Use=20ValueProtectingMap=20when=20passing=20values?=
 =?UTF-8?q?=20out=20of=20the=20NodeDAO=20=20=20=20=20=20=20=20-=20Solves?=
 =?UTF-8?q?=20the=20problem=20of=20map=20cloning=20when=20used=20internall?=
 =?UTF-8?q?y=20as=20well=20as=20when=20calling=20NodeService.getProperty()?=
 =?UTF-8?q?=20=20=20=20=20=20=20=20-=20If=20client=20code=20retrieves=20im?=
 =?UTF-8?q?mutable=20values=20from=20the=20properties,=20then=20they=20wil?=
 =?UTF-8?q?l=20not=20be=20cloned=20=20=20=20=20=20=20=20-=20TODO:=20Specia?=
 =?UTF-8?q?l=20handling=20of=20entrySet()=20and=20keySet()=20methods=20(se?=
 =?UTF-8?q?e=20ALF-12868)=20to=20prevent=20interceptors=20from=20=20=20=20?=
 =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20triggering=20map=20cloning?=
 =?UTF-8?q?=20=20=20=20=20=20=2034230:=20Fixes:=20ALF-12520.=20Adds=20i18n?=
 =?UTF-8?q?=20strings=20for=20siteModel=20=20=20=20=20=20=2034253:=20Fix?=
 =?UTF-8?q?=20for=20ALF-13102=20-=20JBoss:=20Unathorized=20responce=20reci?=
 =?UTF-8?q?eved=20on=20a=20wcs/touch=20request=20with=20clustered=20alfres?=
 =?UTF-8?q?cos=20(ntlm=20sso=20enabled).=20=20=20=20=20=20=2034272:=20ALF-?=
 =?UTF-8?q?13136=20Merged=20V3.4.7=20(3.4.7.5)=20to=20V3.4-BUG-FIX=20(3.4.?=
 =?UTF-8?q?9)=20=20=20=20=20=20=20=20=20=2034267:=20ALF-12419=20"Garbage?=
 =?UTF-8?q?=20collector=20error"=20LockAcquisition=20on=20the=20OrphanReap?=
 =?UTF-8?q?er=20process=20=20=20=20=20=20=20=20=20=20=20=20=20-=20Modified?=
 =?UTF-8?q?=20OrphanReaper=20to=20use=20newer=20JobLockRefreshCallback.=20?=
 =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=20Refresh=20lock=20ever?=
 =?UTF-8?q?y=20minute=20and=20timeout=20if=20it=20takes=20longer=20than=20?=
 =?UTF-8?q?an=20hour.=20=20=20=20=20=20=2034281:=20ALF-13145:=20Merged=20P?=
 =?UTF-8?q?ATCHES/V3.4.7=20to=20V3.4-BUG-FIX=20=20=20=20=20=20=20=20=20=20?=
 =?UTF-8?q?34273:=20ALF-13112:=20Groups=20are=20not=20displayed=20when=206?=
 =?UTF-8?q?0k=20sites=20and=2060=20groups=20in=20the=20system=20=20=20=20?=
 =?UTF-8?q?=20=20=20=20=20=20=20=20=20-=20Timeout=20adjustment=20approved?=
 =?UTF-8?q?=20by=20Kev=20and=20Erik=20=20=20=20=20=20=2034291:=20Merged=20?=
 =?UTF-8?q?V3.4=20to=20V3.4-BUG-FIX=20=20=20=20=20=20=20=20=20=2034197:=20?=
 =?UTF-8?q?ALF-12900=20Error=20occurs=20in=20My=20Documents=20dashlet=20?=
 =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20NodeRef=20(ScriptNode)=20pa?=
 =?UTF-8?q?ssed=20to=20the=20doclist.get.js=20doesn't=20have=20any=20conte?=
 =?UTF-8?q?nt.=20Not=20sure=20why=20yet.=20=20=20=20=20=20=20=20=20=20=20?=
 =?UTF-8?q?=20=20Investigation=20continues,=20so=20there=20may=20be=20more?=
 =?UTF-8?q?=20changes=20to=20stop=20such=20nodes=20being=20passed=20in=20t?=
 =?UTF-8?q?he=20first=20place.=20=20=20=20=20=20=20=20=20=20=20=20=20NPE?=
 =?UTF-8?q?=20is=20as=20a=20result=20of=20having=20a=20nodeRef=20without?=
 =?UTF-8?q?=20content.=20It=20falls=20over=20on=20new=20code=20in=203.4.8?=
 =?UTF-8?q?=20for=20ALF-10976=20and=20ALF-10412.=20=20=20=20=20=20=20=20?=
 =?UTF-8?q?=20=20=20=20=20Not=20too=20sure=20what=20would=20have=20happene?=
 =?UTF-8?q?d=20in=203.4.7,=20but=20expect=20there=20world=20have=20been=20?=
 =?UTF-8?q?another=20exception=20in=20the=20transformer=20code.=20=20=20?=
 =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20-=20Addition=20of=20defensive=20c?=
 =?UTF-8?q?ode=20around=20contentData=20being=20null=20and=20the=20reader?=
 =?UTF-8?q?=20given=20to=20the=20transformer=20being=20null.=20=20=20=20?=
 =?UTF-8?q?=20=20=20=20=20=2034198:=20ALF-12900=20Error=20occurs=20in=20My?=
 =?UTF-8?q?=20Documents=20dashlet=20=20=20=20=20=20=20=20=20=20=20=20=20-?=
 =?UTF-8?q?=20File=20missing=20from=20last=20commit=20=20=20=20=20=20=20?=
 =?UTF-8?q?=20=20=2034242:=20ALF-13078=20Copyright=20notice=20shows=20Alfr?=
 =?UTF-8?q?esco=20Software,=20Inc.=20=C2=A9=202005-2011=20All=20rights=20r?=
 =?UTF-8?q?eserved....=20should=20now=20be=20to=202012=20=20=20=20=20=20?=
 =?UTF-8?q?=20=20=20=20=20=20=20-=20Should=20have=20been=20done=20in=203.4?=
 =?UTF-8?q?.7=20in=20ALF-12174=20but=20was=20not=20found=20by=20Eclipse=20?=
 =?UTF-8?q?search=20=20=20=20=20=20=20=20=20=2034265:=20Updated=20installe?=
 =?UTF-8?q?r=20splash=20screen=20for=202012=20(thanks=20Linton!)=20=20=20?=
 =?UTF-8?q?=20=20=20=20=20=20=2034282:=20ALF-13059:=20Windows=207=20specif?=
 =?UTF-8?q?ic:=20It's=20impossible=20to=20add=20documents=20to=20DWS=20=20?=
 =?UTF-8?q?=20=20=20=20=20=20=20=20-=20Fix=20by=20Alex=20Malinovsky=20=20?=
 =?UTF-8?q?=20=20=20=20=20=20=20=2034286:=20ALF-12949:=20Merged=20V4.0=20t?=
 =?UTF-8?q?o=20V3.4=20=20=20=20=20=20=20=20=20=20=20=20=2034248:=20ALF-131?=
 =?UTF-8?q?02:=20NTLM=20on=20JBoss=20-=20Fix=20problem=20with=20Share=20SS?=
 =?UTF-8?q?O=20Authentication=20Filter=20corrupting=20cookie=20headers=20?=
 =?UTF-8?q?=20=20=20=20=20=2034292:=20Merged=20V3.4=20to=20V3.4-BUG-FIX=20?=
 =?UTF-8?q?(RECORD=20ONLY)=20=20=20=20=20=20=20=20=20=2034284:=20ALF-12949?=
 =?UTF-8?q?:=20Merged=20V3.4-BUG-FIX=20to=20V3.4=20=20=20=20=20=20=20=20?=
 =?UTF-8?q?=20=20=20=20=2034253:=20Fix=20for=20ALF-13102=20-=20Surf=20mixi?=
 =?UTF-8?q?ng=20up=20cookies=20for=20different=20sessions=20=20=20=2034299?=
 =?UTF-8?q?:=20Merged=20V4.0=20to=20V4.0-BUG-FIX=20=20=20=20=20=20=2034067?=
 =?UTF-8?q?:=20ALF-12423:=20Prevent=20script=20error=20on=20IE9=20=20=20?=
 =?UTF-8?q?=20=20=20=2034102:=20SPANISH:=20Fixes=20minor=20encoding=20erro?=
 =?UTF-8?q?r=20=20=20=20=20=20=2034115:=20Merged=20BRANCHES/DEV/BELARUS/V4?=
 =?UTF-8?q?.0-BUG-FIX-2012=5F01=5F20=20to=20BRANCHES/V4.0:=20=20=20=20=20?=
 =?UTF-8?q?=20=20=20=20=2034099:=20ALF-12710:=20Stack=20specific:=20It's?=
 =?UTF-8?q?=20impossible=20to=20log=20into=20CMIS=20Workbench=20through=20?=
 =?UTF-8?q?WebServices=20binding=20=20=20=20=20=20=2034156:=20Missed=20fro?=
 =?UTF-8?q?m=20commit=20for=20r34154=20=20=20=20=20=20=2034189:=20Fix=20fo?=
 =?UTF-8?q?r=20ALF-12822=20-=20Script=20error=20when=20Add=20translation?=
 =?UTF-8?q?=20=20=20=20=20=20=2034216:=20Fixes:=20ALF-11938=20-=20A=20dist?=
 =?UTF-8?q?inction=20needed=20making=20between=20the=20i18n=20labels=20for?=
 =?UTF-8?q?=20company=20address=20and=20personal=20address=20-=20I=20exten?=
 =?UTF-8?q?ded=20this=20to=20other=20company=20specific=20fields=20too.=20?=
 =?UTF-8?q?=20=20=20=20=20=2034238:=20ALF-12864:=20Removed=20trailing=20sp?=
 =?UTF-8?q?aces=20from=20installed=20jodconverter=20defaults=20=20=20=20?=
 =?UTF-8?q?=20=20=20-=20Stopped=20forms=20from=20recognising=20booleans=20?=
 =?UTF-8?q?=20=20=20=20=20=2034243:=20NFS,=20switch=20from=20read-only=20t?=
 =?UTF-8?q?o=20writeable=20file=20if=20write=20access=20required=20and=20c?=
 =?UTF-8?q?ached=20file=20was=20opened=20read-only.=20ALF-12193.=20=20=20?=
 =?UTF-8?q?=20=20=20=20Fix=20I/O=20error=20saving=20from=20OpenOffice=20on?=
 =?UTF-8?q?=20Linux.=20=20=20=20=20=20=2034263:=20Merged=20HEAD=20to=20V4.?=
 =?UTF-8?q?0=20=20=20=20=20=20=20=20=20=2034250:=20Fixed=20THOR-1137=20"Ma?=
 =?UTF-8?q?ke=20Spring=20Surf=20enable-auto-deploy-modules=20by=20default"?=
 =?UTF-8?q?=20=20=20=20=20=20=2034264:=20ALF-12975:=20alfresco-enterprise-?=
 =?UTF-8?q?4.0.1-installer-win-x64.exe=20/=20x32=20installers=20fail=20=20?=
 =?UTF-8?q?=20=20=20=20=20-=20Due=20to=20not=20detecting=20new=20stderr=20?=
 =?UTF-8?q?file=20=20=20=20=20=20=2034278:=20ALF-12763:=20Re-applied=20cha?=
 =?UTF-8?q?nge=20from=20ALF-7528=20after=20it=20was=20lost=20in=20r28224?=
 =?UTF-8?q?=20/=20ALF-5900=20=20=20=20=20=20=20=20=20=20-=20PutMethod=20wa?=
 =?UTF-8?q?s=20modified=20to=20use=20only=20guessed=20mime=20type=20for=20?=
 =?UTF-8?q?documents=20and=20completely=20ignore=20the=20Content-Type=20he?=
 =?UTF-8?q?ader=20from=20client.=20=20=20=2034303:=20Merged=20V4.0=20to=20?=
 =?UTF-8?q?V4.0-BUG-FIX=20(RECORD=20ONLY)=20=20=20=20=20=20=2033110:=20Mer?=
 =?UTF-8?q?ged=20BRANCHES/DEV/V4.0-BUG-FIX=20to=20BRANCHES/V4.0:=20=20=20?=
 =?UTF-8?q?=20=20=20=20=20=20=2033109:=20ALF-11479:=20When=20upgrading=20f?=
 =?UTF-8?q?rom=20Alfresco=20Community=203.4.d=20to=204.0.b,=20some=20nodes?=
 =?UTF-8?q?=20that=20are=20blocked=20and=20have=20versions=20fail=20after?=
 =?UTF-8?q?=20the=20upgrade=20=20=20=20=20=20=2033320:=20Merged=20BRANCHES?=
 =?UTF-8?q?\DEV\V4.0-BUG-FIX=20to=20BRANCHESV4.0=20=20=20=20=20=20=20=20?=
 =?UTF-8?q?=20=20=2033305:=20ALF-12463=20Error=20querying=20database=20was?=
 =?UTF-8?q?=20detected=20during=20upgrade=20process=20from=203.1=20to=204.?=
 =?UTF-8?q?0.0.=20=20=20=20=20=20=2033326:=20Merged=20BRANCHES/DEV/V3.4-BU?=
 =?UTF-8?q?G-FIX=20to=20BRANCHES/V4.0=20=20=20=20=20=20=20=20=20=20=203327?=
 =?UTF-8?q?7=20=20=20=20ALF-12468=20CLONE=20-=20Regression.=20Searches=20c?=
 =?UTF-8?q?ause=20database=20server=20to=20thrash=20CPU=20-=20ALF-12426=20?=
 =?UTF-8?q?=20=20=20=20=20=2033331:=20Merged=20BRANCHES\DEV\V3.4-BUG-FIX?=
 =?UTF-8?q?=20to=20BRANCHES\V4.0=20=20=20=20=20=20=20=20=20=20=2033301:=20?=
 =?UTF-8?q?ALF-12464:=20Merged=20PATCHES/V3.4.5=20to=20V3.4-BUG-FIX=20=20?=
 =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=2033299:=20ALF-12281:=20Me?=
 =?UTF-8?q?mory=20leak=20in=20ReferenceCountingReadOnlyIndexReaderFactory?=
 =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=2033303:=20ALF-12464:=20Merged?=
 =?UTF-8?q?=20PATCHES/V3.4.5=20to=20V3.4-BUG-FIX=20=20=20=20=20=20=20=20?=
 =?UTF-8?q?=20=20=20=20=20=20=2033302:=20ALF-12281:=20Correction=20to=20pr?=
 =?UTF-8?q?evious=20checkin=20-=20deal=20with=20the=20initial=20reference?=
 =?UTF-8?q?=20created=20by=20the=20constructor=20and=20cleared=20by=20clos?=
 =?UTF-8?q?eIfRequired()=20=20=20=20=20=20=2033398:=20Merged=20V4.0-BUG-FI?=
 =?UTF-8?q?X=20to=20V4.0=20=20=20=20=20=20=20=20=20=2033116:=20ALF-12517:?=
 =?UTF-8?q?=20Allow=20multiple=20deferred=20requests=20per=20oplock=20brea?=
 =?UTF-8?q?k,=20next=20level=20of=20fix=20for=20ALF-11935.=20=20=20=20=20?=
 =?UTF-8?q?=20=20=20=20=2033147:=20FTP=20implemented=20set=20modification?=
 =?UTF-8?q?=20date/time=20command=20(MFMT).=20ALF-12105.=20=20=20=20=20=20?=
 =?UTF-8?q?=20=20=20=2033151:=20Fix=20problems=20with=20FTP=20and=20UTF-8.?=
 =?UTF-8?q?=20JLAN-81.=20=20=20=20=20=20=20=20=20=20When=20using=20the=20J?=
 =?UTF-8?q?ava6=20Normalizer=20use=20the=20NFC=20form.=20=20=20=20=20=20?=
 =?UTF-8?q?=20=20=20=2033158:=20Fix=20NFS=20server=20swallows=20exceptions?=
 =?UTF-8?q?.=20ALF-11667.=20=20=20=20=20=20=20=20=20=20Startup=20exception?=
 =?UTF-8?q?=20details=20are=20now=20saved.=20=20=20=20=20=20=20=20=20=2033?=
 =?UTF-8?q?183:=20Minor=20fix=20to=20exception=20string=20in=20extendBuffe?=
 =?UTF-8?q?r().=20=20=20=20=20=20=2034061:=20Merged=20V4.0-BUG-FIX=20to=20?=
 =?UTF-8?q?V4.0=20(Start=20of=204.0.1)=20=20=20=20=20=20=2034062:=20Merge?=
 =?UTF-8?q?=20V4.0-BUG-FIX=20to=20V4.0=20RECORD=20ONLY=20(changes=20that?=
 =?UTF-8?q?=20came=20from=20V4.0)=20=20=20=20=20=20=2034109:=20Merged=20BR?=
 =?UTF-8?q?ANCHES/DEV/V4.0-BUG-FIX=20to=20BRANCHES/V4.0=20=20=20=20=20=20?=
 =?UTF-8?q?=20=20=20=2034108:=20Merged=20BRANCHES/DEV/V3.4-BUG-FIX=20to=20?=
 =?UTF-8?q?BRANCHES/DEV/V4.0-BUG-FIX=20=20=20=20=20=20=20=20=20=20=20=20?=
 =?UTF-8?q?=20Added=20missing=20jar=20lib=20to=20wcmquickstart=20and=20web?=
 =?UTF-8?q?editor=20dependencies=20=20=20=20=20=20=2034154:=20Merged=20BRA?=
 =?UTF-8?q?NCHES/DEV/V4.0-BUG-FIX/=20to=20BRANCHES/V4.0:=20=20=20=20=20=20?=
 =?UTF-8?q?=20=20=20=2034149:=20Removes=20more=20server=20side=20rendered?=
 =?UTF-8?q?=20dates:=20Fixes:=20ALF-12965,=20ALF-12984,=20ALF-12988.=20=20?=
 =?UTF-8?q?=20=20=20=20=2034274:=20Merged=20V4.0-BUG-FIX=20to=20V4.0=20=20?=
 =?UTF-8?q?=20=20=20=20=20=20=20=2034237:=20ALF-12740:=20Updated=20XHR=20r?=
 =?UTF-8?q?equests=20to=20include=20a=20noCache=20request=20parameter=20to?=
 =?UTF-8?q?=20address=20IE=20issue=20where=20304=20reponse=20is=20assumed?=
 =?UTF-8?q?=20for=20XHR=20request=20=20=20=20=20=20=2034288:=20Merged=20V3?=
 =?UTF-8?q?.4=20to=20V4.0=20=20=20=20=20=20=20=20=20=2034197:=20ALF-12900?=
 =?UTF-8?q?=20Error=20occurs=20in=20My=20Documents=20dashlet=20=20=20=20?=
 =?UTF-8?q?=20=20=20=20=20=20=20=20=20NodeRef=20(ScriptNode)=20passed=20to?=
 =?UTF-8?q?=20the=20doclist.get.js=20doesn't=20have=20any=20content.=20Not?=
 =?UTF-8?q?=20sure=20why=20yet.=20=20=20=20=20=20=20=20=20=20=20=20=20Inve?=
 =?UTF-8?q?stigation=20continues,=20so=20there=20may=20be=20more=20changes?=
 =?UTF-8?q?=20to=20stop=20such=20nodes=20being=20passed=20in=20the=20first?=
 =?UTF-8?q?=20place.=20=20=20=20=20=20=20=20=20=20=20=20=20NPE=20is=20as?=
 =?UTF-8?q?=20a=20result=20of=20having=20a=20nodeRef=20without=20content.?=
 =?UTF-8?q?=20It=20falls=20over=20on=20new=20code=20in=203.4.8=20for=20ALF?=
 =?UTF-8?q?-10976=20and=20ALF-10412.=20=20=20=20=20=20=20=20=20=20=20=20?=
 =?UTF-8?q?=20Not=20too=20sure=20what=20would=20have=20happened=20in=203.4?=
 =?UTF-8?q?.7,=20but=20expect=20there=20world=20have=20been=20another=20ex?=
 =?UTF-8?q?ception=20in=20the=20transformer=20code.=20=20=20=20=20=20=20?=
 =?UTF-8?q?=20=20=20=20=20=20-=20Addition=20of=20defensive=20code=20around?=
 =?UTF-8?q?=20contentData=20being=20null=20and=20the=20reader=20given=20to?=
 =?UTF-8?q?=20the=20transformer=20being=20null.=20=20=20=20=20=20=20=20=20?=
 =?UTF-8?q?=2034198:=20ALF-12900=20Error=20occurs=20in=20My=20Documents=20?=
 =?UTF-8?q?dashlet=20=20=20=20=20=20=20=20=20=20=20=20=20-=20File=20missin?=
 =?UTF-8?q?g=20from=20last=20commit=20=20=20=20=20=20=20=20=20=2034242:=20?=
 =?UTF-8?q?ALF-13078=20Copyright=20notice=20shows=20Alfresco=20Software,?=
 =?UTF-8?q?=20Inc.=20=C2=A9=202005-2011=20All=20rights=20reserved....=20sh?=
 =?UTF-8?q?ould=20now=20be=20to=202012=20=20=20=20=20=20=20=20=20=20=20=20?=
 =?UTF-8?q?=20-=20Should=20have=20been=20done=20in=203.4.7=20in=20ALF-1217?=
 =?UTF-8?q?4=20but=20was=20not=20found=20by=20Eclipse=20search=20=20=20=20?=
 =?UTF-8?q?=20=20=20=20=20=2034265:=20Updated=20installer=20splash=20scree?=
 =?UTF-8?q?n=20for=202012=20(thanks=20Linton!)=20=20=20=20=20=20=20=20=20?=
 =?UTF-8?q?=2034284:=20ALF-12949:=20Merged=20V3.4-BUG-FIX=20to=20V3.4=20?=
 =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=2034253:=20Fix=20for=20ALF-13?=
 =?UTF-8?q?102=20-=20Surf=20mixing=20up=20cookies=20for=20different=20sess?=
 =?UTF-8?q?ions=20=20=20=20=20=20=20=20=20=2034286:=20ALF-12949:=20Merged?=
 =?UTF-8?q?=20V4.0=20to=20V3.4=20=20=20=20=20=20=20=20=20=20=20=20=2034248?=
 =?UTF-8?q?:=20ALF-13102:=20NTLM=20on=20JBoss=20-=20Fix=20problem=20with?=
 =?UTF-8?q?=20Share=20SSO=20Authentication=20Filter=20corrupting=20cookie?=
 =?UTF-8?q?=20headers?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@34305 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../app/servlet/GlobalLocalizationFilter.java    |  7 ++++++-
 source/web/jsp/ml/add-translation-dialog.jsp     |  5 +----
 source/web/scripts/ajax/common.js                | 13 +++++++++++--
 source/web/scripts/ajax/opensearch.js            | 16 +++++++++-------
 4 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/source/java/org/alfresco/web/app/servlet/GlobalLocalizationFilter.java b/source/java/org/alfresco/web/app/servlet/GlobalLocalizationFilter.java
index 6d85d5727c..094471801f 100644
--- a/source/java/org/alfresco/web/app/servlet/GlobalLocalizationFilter.java
+++ b/source/java/org/alfresco/web/app/servlet/GlobalLocalizationFilter.java
@@ -83,7 +83,12 @@ public class GlobalLocalizationFilter implements Filter
                       String name = param.substring(0, sepIndex).trim();
                       if (name.equalsIgnoreCase("charset"))
                       {
-                          setCharacterEncoding(param.substring(sepIndex+1).trim());
+                          String charset = param.substring(sepIndex + 1).trim();
+                          if ((null != charset) && ((charset.startsWith("\"") && charset.endsWith("\"")) || (charset.startsWith("'") && charset.endsWith("'"))))
+                          {
+                              charset = charset.substring(1, (charset.length() - 1));
+                          }
+                          setCharacterEncoding(charset);
                           break;
                       }
                   }
diff --git a/source/web/jsp/ml/add-translation-dialog.jsp b/source/web/jsp/ml/add-translation-dialog.jsp
index affdb8fd12..10c1816cfb 100644
--- a/source/web/jsp/ml/add-translation-dialog.jsp
+++ b/source/web/jsp/ml/add-translation-dialog.jsp
@@ -175,15 +175,13 @@
       <f:verbatim>
 </table>
 
-
-
 <script type="text/javascript">
       var finishButtonPressed = false;
       addEventToElement(window, 'load', pageLoaded, false);
 
       function pageLoaded()
       {
-         document.getElementById("dialog:finish-button").onclick = function() {finishButtonPressed = true; clear_add_2Dcontent_2Dupload_2Dend();}
+         document.getElementById("dialog:finish-button").onclick = function() {finishButtonPressed = true; clear_dialog();}
          checkButtonState();
       }
 
@@ -200,6 +198,5 @@
             document.getElementById("dialog:finish-button").disabled = false;
          }
       }
-
 </script>
 </f:verbatim>
\ No newline at end of file
diff --git a/source/web/scripts/ajax/common.js b/source/web/scripts/ajax/common.js
index 6ec218da05..b62e5c630f 100644
--- a/source/web/scripts/ajax/common.js
+++ b/source/web/scripts/ajax/common.js
@@ -551,6 +551,17 @@ function onlyDigits(e)
                el.style.top = ypos + "px";
             }
          }
+      },
+      
+      encodeHTML: function(text)
+      {
+         if (text === null || typeof text == "undefined")
+         {
+            return "";
+         }
+         
+         text = "" + text;
+         return text.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;");
       }
    };
 })();
@@ -736,5 +747,3 @@ function openWindowOnCallback(fromTimeout)
       openWindowCallbackFn = null;
    }
 }
-
-
diff --git a/source/web/scripts/ajax/opensearch.js b/source/web/scripts/ajax/opensearch.js
index e6abeece37..fc3c7df95f 100644
--- a/source/web/scripts/ajax/opensearch.js
+++ b/source/web/scripts/ajax/opensearch.js
@@ -229,14 +229,14 @@ Alfresco.OpenSearchClient.prototype =
       var term = document.getElementById(this.id + _SEARCH_TERM_FIELD_ID).value;
       var count = document.getElementById(this.id + _PAGE_SIZE_FIELD_ID).value;
       
-   	  // ADB-134 fix (Error message about not enough search criteria)
-   	  if (term.length < this.minTermLength)
-	  {
+      // ADB-134 fix (Error message about not enough search criteria)
+      if (term.length < this.minTermLength)
+      {
          var errorMsg = this.msgInvalidTermLength.replace("{0}", this.minTermLength);
          handleCaughtError(errorMsg);
          return;
-	  } 
-   	
+      } 
+      
       // default the count if its invalid
       if (count.length == 0 || isNaN(count) || count < 1)
       {
@@ -329,6 +329,8 @@ Alfresco.OpenSearchClient.prototype =
    {
       var searchUrl = null;
       
+      term = encodeURIComponent(term);
+      
       // define regex pattern to look for params
       var pattern = /\{+\w*\}+|\{+\w*\?\}+|\{+\w*:\w*\}+|\{+\w*:\w*\?\}+/g;
    
@@ -503,7 +505,7 @@ Alfresco.OpenSearchClient.prototype =
                   sb[sb.length] = link;
                   sb[sb.length] = "'>";
                }
-               sb[sb.length] = title;
+               sb[sb.length] = Alfresco.Dom.encodeHTML(title);
                if (link != null)
                {
                   sb[sb.length] = "</a>";
@@ -520,7 +522,7 @@ Alfresco.OpenSearchClient.prototype =
             if (summary != null)
             {
                sb[sb.length] = "<div class='osResultSummary'>";
-               sb[sb.length] = summary;
+               sb[sb.length] = Alfresco.Dom.encodeHTML(summary);
                sb[sb.length] = "</div>";
             }
             sb[sb.length] = "</td></tr>";