From a5f31cd37ecbfd23ee3cf2dc8e37f160ac7883ad Mon Sep 17 00:00:00 2001
From: Dave Ward <left@alfresco.com>
Date: Wed, 9 Jun 2010 14:01:07 +0000
Subject: [PATCH] =?UTF-8?q?Merged=20V3.3=20to=20HEAD=20=20=20=2020167:=20M?=
 =?UTF-8?q?erged=20HEAD=20to=20BRANCHES/V3.3:=20(RECORD=20ONLY)=20=20=20?=
 =?UTF-8?q?=20=20=20=2020166:=20Fix=20ALF-2765:=20Renditions=20created=20v?=
 =?UTF-8?q?ia=203.3=20RenditionService=20are=20not=20exposed=20via=20OpenC?=
 =?UTF-8?q?MIS=20rendition=20API=20=20=20=2020232:=20Fix=20problem=20openi?=
 =?UTF-8?q?ng=20AVM=20web=20project=20folders=20via=20FTP.=20ALF-2738.=20?=
 =?UTF-8?q?=20=20=2020234:=20ALF-2352:=20Cannot=20create=20folders=20in=20?=
 =?UTF-8?q?Share=20doclib=20without=20admin=20user=20in=20authentication?=
 =?UTF-8?q?=20chain=20=20=20=2020235:=20Fix=20for=20unable=20to=20create?=
 =?UTF-8?q?=20folders=20in=20web=20project=20via=20CIFS.=20ALF-2736.=20=20?=
 =?UTF-8?q?=20=2020258:=20Reverse-merged=20rev=2020254:=20'When=20dropping?=
 =?UTF-8?q?=20the=20mysql=20database=20...'=20=20=20=2020262:=20Merged=20V?=
 =?UTF-8?q?3.3-BUG-FIX=20to=20V3.3=20=20=20=20=20=20=2020251:=20Fix=20for?=
 =?UTF-8?q?=20ALF-2804=20-=20Unable=20to=20browse=20into=20folders=20in=20?=
 =?UTF-8?q?Share=20Site=20in=20certain=20situations.=20=20=20=20=20=20=20?=
 =?UTF-8?q?=20=20=20=20=20=20=20=20-=20Browser=20history=20filter=20object?=
 =?UTF-8?q?=20in=20incorrect=20state=20after=20page=20refresh.=20=20=20=20?=
 =?UTF-8?q?20264:=20Updated=20Oracle=20build=20support=20(to=20fix=20grant?=
 =?UTF-8?q?s)=20=20=20=2020282:=20Merged=20PATCHES/V3.2.0=20to=20V3.3=20?=
 =?UTF-8?q?=20=20=20=20=20=2020266:=20Test=20reproduction=20of=20ALF-2839?=
 =?UTF-8?q?=20failure:=20Node=20pre-loading=20generates=20needless=20resul?=
 =?UTF-8?q?tset=20rows=20=20=20=20=20=20=2020280:=20Fixed=20ALF-2839:=20No?=
 =?UTF-8?q?de=20pre-loading=20generates=20needless=20resultset=20rows=20?=
 =?UTF-8?q?=20=20=2020283:=20Merged=20BRANCHES/DEV/V3.3-BUG-FIX=20to=20BRA?=
 =?UTF-8?q?NCHES/V3.3:=20=20=20=20=20=20=2020194:=20AVMTestSuite=20-=20sca?=
 =?UTF-8?q?le=20down=20unit=20tests=20(slightly)=20=20=20=20=20=20=2020247?=
 =?UTF-8?q?:=20AVMServiceTest.testVersionByDate=20-=20build=20(add=20delay?=
 =?UTF-8?q?)=20=20=20=2020290:=20Fixed=20ALF-2851=20"Drag=20n=20Drop=20iss?=
 =?UTF-8?q?ues=20in=20IE6=20&=20IE7"=20=20=20=20=20=20=20-=20Reordering=20?=
 =?UTF-8?q?rules-list=20with=20drag=20and=20drop=20didn't=20work=20at=20al?=
 =?UTF-8?q?l=20because=20each=20rule=20was=20created=20using=20a=20templat?=
 =?UTF-8?q?e=20that=20had=20the=20"id"-attribute=20set,=20which=20made=20I?=
 =?UTF-8?q?E=20confused=20after=20using=20HTMLELement.clone()=20even=20tho?=
 =?UTF-8?q?ugh=20the=20id=20was=20resetted=20=20=20=20=20=20=20-=20Both=20?=
 =?UTF-8?q?customise-dashlets=20&=20rules-list=20got=20an=20error=20when?=
 =?UTF-8?q?=20"throwing"=20away=20the=20dashlet=20or=20rule=20instead=20of?=
 =?UTF-8?q?=20releasing=20it=20"carefully",=20reason=20was=20becuuase=20IE?=
 =?UTF-8?q?=20didnt=20capture=20the=20x:y-position=20which=20made=20the=20?=
 =?UTF-8?q?animation=20fail.=20Now=20no=20animation=20is=20done=20if=20x:y?=
 =?UTF-8?q?=20isn't=20found.=20=20=20=2020296:=20Merged=20PATCHES/V3.1.0?=
 =?UTF-8?q?=20to=20V3.3=20(RECORD=20ONLY)=20=20=20=20=20=20=2020249:=20Mer?=
 =?UTF-8?q?ged=20V3.1=20to=20PATCHES/V3.1.0=20=20=20=20=20=20=20=20=20=201?=
 =?UTF-8?q?4565:=20Updated=20version=20to=20include=20revision=20number=20?=
 =?UTF-8?q?(x.y.z)=20=20=20=20=20=20=2020246:=20Merged=20V3.1=20to=20PATCH?=
 =?UTF-8?q?ES/V3.1.0=20=20=20=20=20=20=20=20=20=2013841:=20Build=20fix=20?=
 =?UTF-8?q?=20=20=20=20=20=2020245:=20Merged=20V3.1=20to=20PATCHES/V3.1.0?=
 =?UTF-8?q?=20=20=20=20=20=20=20=20=20=2016185:=20AbstractLuceneIndexerAnd?=
 =?UTF-8?q?SearcherFactory.getTransactionId()=20must=20return=20null=20whe?=
 =?UTF-8?q?n=20there=20is=20no=20transaction=20=20=20=20=20=20=2020241:=20?=
 =?UTF-8?q?Merged=20V3.1=20to=20PATCHES/V3.1.0=20=20=20=20=20=20=20=20=20?=
 =?UTF-8?q?=2014187:=20Fix=20for=20ETHREEOH-2023:=20LDAP=20import=20must?=
 =?UTF-8?q?=20lower=20case=20the=20local=20name=20of=20the=20association?=
 =?UTF-8?q?=20to=20person.=20=20=20=20=20=20=20=20=20=2016167:=20ETHREEOH-?=
 =?UTF-8?q?2475:=20Fixed=20nested=20transaction=20handling=20in=20Abstract?=
 =?UTF-8?q?LuceneIndexerAndSearcherFactory=20to=20allow=20duplicate=20user?=
 =?UTF-8?q?=20processing=20in=20PersonServiceImpl=20to=20actually=20work?=
 =?UTF-8?q?=20=20=20=20=20=20=20=20=20=2016168:=20ETHREEOH-2797:=20Force?=
 =?UTF-8?q?=20patch.db-V2.2-Person=20to=20apply=20one=20more=20time=20to?=
 =?UTF-8?q?=20fix=20up=20corrupt=20users=20created=20by=20LDAP=20Import=20?=
 =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20-=20Problem=20due=20to=20ET?=
 =?UTF-8?q?HREEOH-2023,=20fixed=20in=203.1.1=20=20=20=20=20=20=20=20=20=20?=
 =?UTF-8?q?=20=20=20-=20Also=20corrects=20ldap.synchronisation.defaultHome?=
 =?UTF-8?q?FolderProvider=20to=20be=20userHomesHomeFolderProvider=20=20=20?=
 =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20-=20Also=20requires=20fix=20to=20?=
 =?UTF-8?q?ETHREEOH-2475=20to=20fix=20up=20duplicate=20users=20=20=20=20?=
 =?UTF-8?q?=20=20=2020221:Merged=20PATCHES/V3.1.2=20to=20PATCHES/V3.1.0=20?=
 =?UTF-8?q?=20=20=20=20=20=20=20=20=2020217:=20Merged=20PATCHES/V3.2.0=20t?=
 =?UTF-8?q?o=20PATCHES/V3.1.2=20=20=20=20=20=20=20=20=20=20=20=20=2019793:?=
 =?UTF-8?q?=20Merged=20HEAD=20to=20V3.2.0=20=20=20=20=20=20=20=20=20=20=20?=
 =?UTF-8?q?=20=20=20=20=2019786:=20Refactor=20of=20previous=20test=20fix.?=
 =?UTF-8?q?=20I=20have=20pushed=20down=20the=20OOo-specific=20parts=20of?=
 =?UTF-8?q?=20the=20change=20from=20AbstractContentTransformerTest=20to=20?=
 =?UTF-8?q?OpenOfficeContentTransformerTest=20leaving=20an=20extension=20p?=
 =?UTF-8?q?oint=20in=20the=20base=20class=20should=20other=20transformatio?=
 =?UTF-8?q?ns=20need=20to=20be=20excluded=20in=20the=20future.=20=20=20=20?=
 =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=2019785:=20Fix=20for=20failin?=
 =?UTF-8?q?g=20test=20OpenOfficeContentTransformerTest.testAllConversions.?=
 =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20Variou?=
 =?UTF-8?q?s=20OOo-related=20transformations=20are=20returned=20as=20avail?=
 =?UTF-8?q?able=20but=20fail=20on=20our=20test=20server=20with=20OOo=20on?=
 =?UTF-8?q?=20it.=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20?=
 =?UTF-8?q?Pending=20further=20work=20on=20these=20failings,=20I=20am=20di?=
 =?UTF-8?q?sabling=20those=20transformations=20in=20test=20code=20whilst?=
 =?UTF-8?q?=20leaving=20them=20available=20in=20the=20product=20code.=20Th?=
 =?UTF-8?q?is=20is=20because=20in=20the=20wild=20a=20different=20OOo=20ver?=
 =?UTF-8?q?sion=20may=20succeed=20with=20these=20transformations.=20=20=20?=
 =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20I=20had=20previ?=
 =?UTF-8?q?ously=20explicitly=20disabled=203=20transformations=20in=20the?=
 =?UTF-8?q?=20product=20and=20I=20am=20moving=20that=20restriction=20from?=
 =?UTF-8?q?=20product=20to=20test=20code=20for=20the=20same=20reason.=20?=
 =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=20=2019707:=20Return=20?=
 =?UTF-8?q?value=20from=20isTransformationBlocked=20was=20inverted.=20Fixe?=
 =?UTF-8?q?d=20now.=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=2019705:?=
 =?UTF-8?q?=20Refinement=20of=20previous=20check-in=20re=20OOo=20transform?=
 =?UTF-8?q?ations.=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20?=
 =?UTF-8?q?=20I=20have=20pulled=20up=20the=20code=20that=20handles=20block?=
 =?UTF-8?q?ed=20transformations=20into=20a=20superclass=20so=20that=20the?=
 =?UTF-8?q?=20JodConverter-based=20transformer=20worker=20can=20inherit=20?=
 =?UTF-8?q?the=20same=20list=20of=20blocked=20transformations.=20To=20reit?=
 =?UTF-8?q?erate,=20blocked=20transformations=20are=20those=20that=20the?=
 =?UTF-8?q?=20OOo=20integration=20code=20believes=20should=20work=20but=20?=
 =?UTF-8?q?which=20are=20broken=20in=20practice.=20These=20are=20blocked?=
 =?UTF-8?q?=20by=20the=20transformers=20and=20will=20always=20be=20unavail?=
 =?UTF-8?q?able=20regardless=20of=20the=20OOo=20connection=20state.=20=20?=
 =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=2019702:=20Fix=20for=20?=
 =?UTF-8?q?HEAD=20builds=20running=20on=20panda=20build=20server.=20=20=20?=
 =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20OOo=20was=20rec?=
 =?UTF-8?q?ently=20installed=20on=20panda=20which=20has=20activated=20vari?=
 =?UTF-8?q?ous=20OOo-related=20transformations/extractions=20in=20the=20te?=
 =?UTF-8?q?st=20code.=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20?=
 =?UTF-8?q?=20=20It=20appears=20that=20OOo=20does=20not=20support=20some?=
 =?UTF-8?q?=20transformations=20from=20Office=2097=20to=20Office=202007.?=
 =?UTF-8?q?=20Specifically=20doc=20to=20docx=20and=20xls=20to=20xlsx.=20Th?=
 =?UTF-8?q?ese=20transformations=20have=20now=20been=20marked=20as=20unava?=
 =?UTF-8?q?ilable.=20=20=20=20=20=20=2020220:=20Created=20hotfix=20branch?=
 =?UTF-8?q?=20off=20TAGS/ENTERPRISE/V3.1.0=20=20=20=2020297:=20Merged=20PA?=
 =?UTF-8?q?TCHES/V3.1.2=20to=20V3.3=20(RECORD=20ONLY)=20=20=20=20=20=20=20?=
 =?UTF-8?q?20268:=20Increment=20version=20number=20=20=20=20=20=20=2020267?=
 =?UTF-8?q?:=20ALF-550:=20Merged=20V3.2=20to=20PATCHES/V3.1.2=20=20=20=20?=
 =?UTF-8?q?=20=20=20=20=20=2017768:=20Merged=20DEV/BELARUS/V3.2-2009=5F11?=
 =?UTF-8?q?=5F24=20to=20V3.2=20=20=20=20=20=20=20=20=20=20=20=20=2017758:?=
 =?UTF-8?q?=20ETHREEOH-3757:=20Oracle=20upgrade=20issue:=20failed=20"invit?=
 =?UTF-8?q?eEmailTemplate"=20patch=20-=20also=20causes=20subsequent=20patc?=
 =?UTF-8?q?hes=20to=20not=20be=20applied=20=20=20=20=20=20=2020217:=20Merg?=
 =?UTF-8?q?ed=20PATCHES/V3.2.0=20to=20PATCHES/V3.1.2=20=20=20=20=20=20=20?=
 =?UTF-8?q?=20=20=2019793:=20Merged=20HEAD=20to=20V3.2.0=20=20=20=20=20=20?=
 =?UTF-8?q?=20=20=20=20=20=20=2019786:=20Refactor=20of=20previous=20test?=
 =?UTF-8?q?=20fix.=20I=20have=20pushed=20down=20the=20OOo-specific=20parts?=
 =?UTF-8?q?=20of=20the=20change=20from=20AbstractContentTransformerTest=20?=
 =?UTF-8?q?to=20OpenOfficeContentTransformerTest=20leaving=20an=20extensio?=
 =?UTF-8?q?n=20point=20in=20the=20base=20class=20should=20other=20transfor?=
 =?UTF-8?q?mations=20need=20to=20be=20excluded=20in=20the=20future.=20=20?=
 =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=2019785:=20Fix=20for=20failing?=
 =?UTF-8?q?=20test=20OpenOfficeContentTransformerTest.testAllConversions.?=
 =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20Various=20OOo-r?=
 =?UTF-8?q?elated=20transformations=20are=20returned=20as=20available=20bu?=
 =?UTF-8?q?t=20fail=20on=20our=20test=20server=20with=20OOo=20on=20it.=20?=
 =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20Pending=20further?=
 =?UTF-8?q?=20work=20on=20these=20failings,=20I=20am=20disabling=20those?=
 =?UTF-8?q?=20transformations=20in=20test=20code=20whilst=20leaving=20them?=
 =?UTF-8?q?=20available=20in=20the=20product=20code.=20This=20is=20because?=
 =?UTF-8?q?=20in=20the=20wild=20a=20different=20OOo=20version=20may=20succ?=
 =?UTF-8?q?eed=20with=20these=20transformations.=20=20=20=20=20=20=20=20?=
 =?UTF-8?q?=20=20=20=20=20=20=20=20I=20had=20previously=20explicitly=20dis?=
 =?UTF-8?q?abled=203=20transformations=20in=20the=20product=20and=20I=20am?=
 =?UTF-8?q?=20moving=20that=20restriction=20from=20product=20to=20test=20c?=
 =?UTF-8?q?ode=20for=20the=20same=20reason.=20=20=20=20=20=20=20=20=20=20?=
 =?UTF-8?q?=20=20=2019707:=20Return=20value=20from=20isTransformationBlock?=
 =?UTF-8?q?ed=20was=20inverted.=20Fixed=20now.=20=20=20=20=20=20=20=20=20?=
 =?UTF-8?q?=20=20=20=2019705:=20Refinement=20of=20previous=20check-in=20re?=
 =?UTF-8?q?=20OOo=20transformations.=20=20=20=20=20=20=20=20=20=20=20=20?=
 =?UTF-8?q?=20=20=20=20I=20have=20pulled=20up=20the=20code=20that=20handle?=
 =?UTF-8?q?s=20blocked=20transformations=20into=20a=20superclass=20so=20th?=
 =?UTF-8?q?at=20the=20JodConverter-based=20transformer=20worker=20can=20in?=
 =?UTF-8?q?herit=20the=20same=20list=20of=20blocked=20transformations.=20T?=
 =?UTF-8?q?o=20reiterate,=20blocked=20transformations=20are=20those=20that?=
 =?UTF-8?q?=20the=20OOo=20integration=20code=20believes=20should=20work=20?=
 =?UTF-8?q?but=20which=20are=20broken=20in=20practice.=20These=20are=20blo?=
 =?UTF-8?q?cked=20by=20the=20transformers=20and=20will=20always=20be=20una?=
 =?UTF-8?q?vailable=20regardless=20of=20the=20OOo=20connection=20state.=20?=
 =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=2019702:=20Fix=20for=20HEAD?=
 =?UTF-8?q?=20builds=20running=20on=20panda=20build=20server.=20=20=20=20?=
 =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20OOo=20was=20recently=20inst?=
 =?UTF-8?q?alled=20on=20panda=20which=20has=20activated=20various=20OOo-re?=
 =?UTF-8?q?lated=20transformations/extractions=20in=20the=20test=20code.?=
 =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20It=20appears=20?=
 =?UTF-8?q?that=20OOo=20does=20not=20support=20some=20transformations=20fr?=
 =?UTF-8?q?om=20Office=2097=20to=20Office=202007.=20Specifically=20doc=20t?=
 =?UTF-8?q?o=20docx=20and=20xls=20to=20xlsx.=20These=20transformations=20h?=
 =?UTF-8?q?ave=20now=20been=20marked=20as=20unavailable.=20=20=20=20=20=20?=
 =?UTF-8?q?=2020204:=20Moved=20version=20label=20to=20'.6'=20=20=20=202029?=
 =?UTF-8?q?8:=20Merged=20PATCHES/V3.2.0=20to=20V3.3=20(RECORD=20ONLY)=20?=
 =?UTF-8?q?=20=20=20=20=20=2020281:=20Incremented=20version=20number=20to?=
 =?UTF-8?q?=20'10'=20=20=20=20=20=20=2020272:=20Backports=20to=20help=20fi?=
 =?UTF-8?q?x=20ALF-2839:=20Node=20pre-loading=20generates=20needless=20res?=
 =?UTF-8?q?ultset=20rows=20=20=20=20=20=20=20=20=20=20Merged=20BRANCHES/V3?=
 =?UTF-8?q?.2=20to=20PATCHES/V3.2.0:=20=20=20=20=20=20=20=20=20=20=20=20?=
 =?UTF-8?q?=2018490:=20Added=20cache=20for=20alf=5Fcontent=5Fdata=20=20=20?=
 =?UTF-8?q?=20=20=20=20=20=20=20Merged=20BRANCHES/DEV/V3.3-BUG-FIX=20to=20?=
 =?UTF-8?q?PATCHES/V3.2.0:=20=20=20=20=20=20=20=20=20=20=20=20=2020231:=20?=
 =?UTF-8?q?Fixed=20ALF-2784:=20Degradation=20of=20performance=20between=20?=
 =?UTF-8?q?3.1.1=20and=203.2x=20(observed=20in=20JSF)=20=20=20=2020299:=20?=
 =?UTF-8?q?Merged=20PATCHES/V3.2.1=20to=20V3.3=20(RECORD=20ONLY)=20=20=20?=
 =?UTF-8?q?=20=20=20=2020279:=20Incremented=20version=20label=20=20=20=20?=
 =?UTF-8?q?=20=20=2020211:=20Reinstated=20patch=20'patch.convertContentUrl?=
 =?UTF-8?q?s'=20(reversed=20rev=2020205=20ALF-2719)=20=20=20=20=20=20=2020?=
 =?UTF-8?q?210:=20Incremented=20version=20label=20to=20'.3'=20=20=20=20=20?=
 =?UTF-8?q?=20=2020206:=20Bumped=20version=20label=20to=20'.2'=20=20=20=20?=
 =?UTF-8?q?=20=20=2020205:=20Workaround=20for=20ALF-2719=20by=20disabling?=
 =?UTF-8?q?=20patch.convertContentUrls=20and=20ContentStoreCleaner=20=20?=
 =?UTF-8?q?=20=20=20=20=2020149:=20Incremented=20version=20label=20=20=20?=
 =?UTF-8?q?=20=20=20=2020101:=20Created=20hotfix=20branch=20off=20ENTERPRI?=
 =?UTF-8?q?SE/V3.2.1=20=20=20=2020300:=20Merged=20BRANCHES/DEV/BELARUS/HEA?=
 =?UTF-8?q?D-2010=5F04=5F28=20to=20BRANCHES/V3.3:=20=20=20=20=20=20=202029?=
 =?UTF-8?q?3:=20ALF-767:=20remove-AVM-issuer.sql=20upgrade=20does=20not=20?=
 =?UTF-8?q?account=20for=20column=20(mis-)order=20-=20fixed=20for=20MySQL,?=
 =?UTF-8?q?=20PostgreSQL=20and=20Oracle=20(DB2=20&=20MS=20SQL=20Server=20a?=
 =?UTF-8?q?lready=20OK)=20=20=20=2020301:=20Merged=20PATCHES/V3.2.1=20to?=
 =?UTF-8?q?=20V3.3=20=20=20=20=20=20=2020278:=20ALF-206:=20Make=20it=20pos?=
 =?UTF-8?q?sible=20to=20follow=20hyperlinks=20to=20document=20JSF=20client?=
 =?UTF-8?q?=20URLs=20from=20MS=20Office=20=20=20=20=20=20=20=20=20=20-=20A?=
 =?UTF-8?q?=20request=20parameter=20rather=20than=20a=20(potentially=20for?=
 =?UTF-8?q?gotten)=20session=20attribute=20is=20used=20to=20propagate=20th?=
 =?UTF-8?q?e=20URL=20to=20redirect=20to=20after=20successful=20login=20=20?=
 =?UTF-8?q?=20=2020303:=20Fixed=20ALF-2855:=20FixAuthorityCrcValuesPatch?=
 =?UTF-8?q?=20reports=20NPE=20during=20upgrade=20from=202.1.7=20to=203.3E?=
 =?UTF-8?q?=20=20=20=20=20=20=20-=20Auto-unbox=20NPE=20on=20Long->long:=20?=
 =?UTF-8?q?Just=20used=20the=20Long=20directly=20for=20reporting=20=20=20?=
 =?UTF-8?q?=2020319:=20Fixed=20ALF-2854:=20User=20Usage=20Queries=20use=20?=
 =?UTF-8?q?read-write=20methods=20on=20QNameDAO=20=20=20=2020322:=20Fixed?=
 =?UTF-8?q?=20ALF-1998:=20contentStoreCleanerJob=20leads=20to=20foreign=20?=
 =?UTF-8?q?key=20exception=20=20=20=20=20=20=20-=20Possible=20concurrent?=
 =?UTF-8?q?=20modification=20of=20alf=5Fcontent=5Furl.orphan=5Ftime=20led?=
 =?UTF-8?q?=20to=20false=20orphan=20detection=20=20=20=20=20=20=20-=20Fixe?=
 =?UTF-8?q?d=20queries=20to=20check=20for=20dereferencing=20AND=20use=20th?=
 =?UTF-8?q?e=20indexed=20orphan=5Ftime=20column=20=20=20=20=20=20=20-=20Mo?=
 =?UTF-8?q?re=20robust=20use=20of=20EagerContentStoreCleaner:=20On=20eager?=
 =?UTF-8?q?=20cleanup,=20ensure=20that=20URLs=20are=20deleted=20=20=20=20?=
 =?UTF-8?q?=20=20=20-=20Added=20optimistic=20lock=20checks=20on=20updates?=
 =?UTF-8?q?=20and=20deletes=20of=20alf=5Fcontent=5Furl=20=20=20=2020335:?=
 =?UTF-8?q?=20Merged=20DEV/V3.3-BUG-FIX=20to=20V3.3=20=20=20=20=20=20=2020?=
 =?UTF-8?q?334:=20ALF-2473:=20Changes=20for=20clean=20startup=20and=20shut?=
 =?UTF-8?q?down=20of=20subsystems=20on=20Spring=203=20=20=20=20=20=20=20?=
 =?UTF-8?q?=20=20=20-=20Removed=20previous=20SafeEventPublisher=20workarou?=
 =?UTF-8?q?nd=20for=20startup=20errors=20and=20associated=20changes=20=20?=
 =?UTF-8?q?=20=20=20=20=20=20=20=20-=20Replaced=20with=20SafeApplicationEv?=
 =?UTF-8?q?entMulticaster=20which=20queues=20up=20events=20while=20an=20ap?=
 =?UTF-8?q?plication=20context=20isn't=20started=20=20=20=20=20=20=20=20?=
 =?UTF-8?q?=20=20-=20Now=20all=20subsystems=20shut=20down=20cleanly=20=20?=
 =?UTF-8?q?=20=20=20=20=20=20=20=20-=20Fixes=20problem=20with=20FileConten?=
 =?UTF-8?q?tStore=20visibility=20in=20JMX=20too!=20=20=20=2020341:=20ALF-2?=
 =?UTF-8?q?517=20Quick=20fix=20which=20means=20rules=20which=20compare=20t?=
 =?UTF-8?q?he=20creation/modification=20date=20of=20content=20should=20now?=
 =?UTF-8?q?=20correctly=20be=20applied=20when=20content=20is=20uploaded=20?=
 =?UTF-8?q?to=20a=20folder.=20=20=20=2020346:=20ALF-2839:=20Node=20pre-loa?=
 =?UTF-8?q?ding=20generates=20needless=20resultset=20rows=20=20=20=20=20?=
 =?UTF-8?q?=20=20-=20Added=20missing=20Criteria.list()=20call=20=20=20=202?=
 =?UTF-8?q?0347:=20Merged=20BRANCHES/DEV/V3.3-BUG-FIX=20to=20BRANCHES/V3.3?=
 =?UTF-8?q?:=20=20=20=20=20=20=2020231:=20Fixed=20ALF-2784:=20Degradation?=
 =?UTF-8?q?=20of=20performance=20between=203.1.1=20and=203.2x=20(observed?=
 =?UTF-8?q?=20in=20JSF)=20=20=20=2020356:=20Merged=20DEV/BELARUS/HEAD-2010?=
 =?UTF-8?q?=5F03=5F30=20to=20V3.3=20(with=20corrections)=20=20=20=20=20=20?=
 =?UTF-8?q?=2019735:=20ALF-686:=20Alfresco=20cannot=20start=20if=20read/wr?=
 =?UTF-8?q?ite=20mode=20in=20Sysadmin=20subsystem=20is=20configured=20=20?=
 =?UTF-8?q?=20=20=20=20=20=20=20=201.=20org.alfresco.repo.module.ModuleCom?=
 =?UTF-8?q?ponentHelper=20was=20modified=20to=20allow=20=E2=80=9CSystem?=
 =?UTF-8?q?=E2=80=9D=20user=20run=20write=20operations=20in=20read-only=20?=
 =?UTF-8?q?system.=20=20=20=20=20=20=20=20=20=202.=20Startup=20of=20?=
 =?UTF-8?q?=E2=80=9CSynchronization=E2=80=9D=20subsystem=20failed=20with?=
 =?UTF-8?q?=20the=20same=20error=20as=20was=20occurred=20in=20issue=20duri?=
 =?UTF-8?q?ng=20modules=20start.=20org.alfresco.repo.security.sync.Chainin?=
 =?UTF-8?q?gUserRegistrySynchronizer=20was=20also=20modified=20to=20allow?=
 =?UTF-8?q?=20=E2=80=9CSystem=E2=80=9D=20user=20run=20write=20operations?=
 =?UTF-8?q?=20in=20read-only=20mode.=20=20=20=2020361:=20Merged=20HEAD=20t?=
 =?UTF-8?q?o=20BRANCHES/V3.3:=20(RECORD=20ONLY)=20=20=20=20=20=20=2020345:?=
 =?UTF-8?q?=20Fix=20ALF-2319:=20CMIS=20'current'=20version=20mapping=20is?=
 =?UTF-8?q?=20not=20compliant=20with=20spec=20=20=20=20=20=20=2020354:=20U?=
 =?UTF-8?q?pdate=20test=20to=20reflect=20changes=20to=20CMIS=20version=20m?=
 =?UTF-8?q?apping.=20=20=20=2020363:=20Merge=20from=20V3.2=20to=20V3.2=20(?=
 =?UTF-8?q?all=20record-only)=20=20=20=20=20=20=20c.=2019448=20OOoJodConve?=
 =?UTF-8?q?rter=20worker=20bean=20correctly=20handles=20isAvailable()=20wh?=
 =?UTF-8?q?en=20subsystem=20is=20disabled.=20=20=20=20=20=20=20c.=2019484?=
 =?UTF-8?q?=20JodConverter-backed=20thumbnailing=20test=20now=20explicitly?=
 =?UTF-8?q?=20sets=20OOoDirect=20and=20OOoJodconverter=20enabled-ness=20ba?=
 =?UTF-8?q?ck=20to=20default=20settings=20in=20tearDown=20=20=20=20=20=20?=
 =?UTF-8?q?=20c.=2020175=20Fix=20for=20ALF-2773=20JMX=20configuration=20of?=
 =?UTF-8?q?=20enterprise=20logging=20broken=20=20=20=2020376:=20Altered=20?=
 =?UTF-8?q?URL=20of=20online=20help=20to=20point=20at=20http://www.alfresc?=
 =?UTF-8?q?o.com/help/33/enterprise/webeditor/=20=20=20=2020395:=20set=20g?=
 =?UTF-8?q?oogle=20docs=20off=20=20=20=2020398:=20Fixed=20ALF-2890:=20Upgr?=
 =?UTF-8?q?ade=20removes=20content=20if=20transaction=20retries=20are=20tr?=
 =?UTF-8?q?iggered=20=20=20=20=20=20=20-=20Setting=20ContentData=20that=20?=
 =?UTF-8?q?was=20derived=20outside=20of=20the=20current=20transaction=20op?=
 =?UTF-8?q?ened=20up=20a=20window=20=20=20=20=20=20=20=20=20for=20the=20po?=
 =?UTF-8?q?st-rollback=20code=20to=20delete=20the=20underlying=20binary.?=
 =?UTF-8?q?=20The=20binaries=20are=20only=20registered=20=20=20=20=20=20?=
 =?UTF-8?q?=20=20=20for=20writers=20fetched=20via=20the=20ContentService?=
 =?UTF-8?q?=20now;=20the=20low-level=20DAO=20no=20longer=20does=20manageme?=
 =?UTF-8?q?nt=20=20=20=20=20=20=20=20=20because=20it=20can't=20assume=20th?=
 =?UTF-8?q?at=20a=20new=20content=20URL=20indicates=20a=20new=20underlying?=
 =?UTF-8?q?=20binary.=20=20=20=20=20=20=20-=20The=20contentUrlConverter=20?=
 =?UTF-8?q?was=20creating=20new=20URLs=20and=20thus=20the=20low-level=20DA?=
 =?UTF-8?q?O=20cleaned=20up=20=20=20=20=20=20=20=20=20live=20content=20whe?=
 =?UTF-8?q?n=20retrying=20collisions=20took=20place.=20The=20cleanup=20is?=
 =?UTF-8?q?=20no=20longer=20on=20the=20stack=20=20=20=20=20=20=20=20=20for?=
 =?UTF-8?q?=20the=20patch.=20=20=20=20=20=20=20-=20Removes=20the=20ALF-558?=
 =?UTF-8?q?=20changes=20around=20ContentData.reference()=20=20=20=2020399:?=
 =?UTF-8?q?=20Remove=20googledocs=20aspect=20option=20=20=20=2020400:=20Pu?=
 =?UTF-8?q?rgeTestP=20(AVM)=20-=20increase=20wait=20cycles=20=20=20=202042?=
 =?UTF-8?q?2:=20Added=20ooo=20converter=20properties=20=20=20=2020425:=20M?=
 =?UTF-8?q?erge=20V3.3-BUG-FIX=20to=20V3.3=20=20=20=20=20=20=2020392=20:?=
 =?UTF-8?q?=20ALF-2716=20-=20imap=20mail=20metadata=20extraction=20fails?=
 =?UTF-8?q?=20when=20alfresco=20server=20locale=20is=20non=20English=20=20?=
 =?UTF-8?q?=20=20=20=20=2020365=20:=20Merge=20DEV=20to=20V3.3-BUG=5FFIX=20?=
 =?UTF-8?q?=20=20=20=20=20=20=20=20=2018011=20:=20ETHREEOH-3804=20-=20IMAP?=
 =?UTF-8?q?=20message=20body=20doesn't=20appears=20in=20IMAP=20folder=20wh?=
 =?UTF-8?q?en=20message=20subject=20is=20equal=20to=20the=20attachment=20n?=
 =?UTF-8?q?ame=20=20=20=20=20=20=2020332=20:=20Build=20fix=20-=20rework=20?=
 =?UTF-8?q?to=20the=20ImapServiceUnit=20tests.=20=20=20=20=20=20=2020325?=
 =?UTF-8?q?=20:=20build=20fix=20=20=20=20=20=20=2020318=20:=20MERGE=20DEV?=
 =?UTF-8?q?=20TO=20V3.3-BUG-FIX=20=20=20=20=20=20=20=20=20=2020287=20:=20A?=
 =?UTF-8?q?LF-2754:=20Alfresco=20IMAP=20and=20Zimbra=20Desktop=20Client.?=
 =?UTF-8?q?=20=20=20=20=20=20=2020317=20:=20ALF-2716=20-=20imap=20mail=20m?=
 =?UTF-8?q?etadata=20extraction=20fails=20when=20alfresco=20server=20local?=
 =?UTF-8?q?e=20is=20non=20English=20=20=20This=20change=20reworks=20the=20?=
 =?UTF-8?q?received=20date=20metadata=20extraction.=20=20=20=20=20=20=2020?=
 =?UTF-8?q?316=20:=20ALF-1912=20:=20Problem=20with=20IMAP=20Sites=20visibi?=
 =?UTF-8?q?lity=20=20=20Now=20only=20IMAP=20favouries=20are=20shown.=20=20?=
 =?UTF-8?q?=20Also=20major=20rework=20to=20the=20way=20that=20this=20servi?=
 =?UTF-8?q?ce=20uses=20the=20FileFolderService.=20=20=20=20=20=20=2020315?=
 =?UTF-8?q?=20:=20ALF-1912=20Updates=20to=20the=20FileFolderService=20to?=
 =?UTF-8?q?=20support=20the=20Imap=20Service=20=20=20=20-=20add=20listDeep?=
 =?UTF-8?q?Folders=20=20=20=20-=20remove=20"makeFolders"=20which=20moves?=
 =?UTF-8?q?=20to=20its=20own=20Utility=20class.=20=20=20=20-=20update=20to?=
 =?UTF-8?q?=20JavaDoc=20=20=20=2020429:=20Merged=20BRANCHES/DEV/V3.3-BUG-F?=
 =?UTF-8?q?IX=20to=20BRANCHES/V3.3:=20=20=20=20=20=20=2020171:=203.3SP1=20?=
 =?UTF-8?q?bug=20fix=20branch=20=20=20=20=20=20=2020174:=20Fix=20for=20ALF?=
 =?UTF-8?q?-960=20and=20ALFCOM-1980:=20WCM=20-=20File=20Picker=20Restricti?=
 =?UTF-8?q?on=20relative=20to=20folder=20not=20web=20project=20=20=20=20?=
 =?UTF-8?q?=20=20=2020179:=20ALF-2629=20Now=20when=20a=20workflow=20timer?=
 =?UTF-8?q?=20signals=20a=20transition=20it=20also=20ends=20the=20associat?=
 =?UTF-8?q?ed=20task.=20=20=20=2020433:=20Merged=20BRANCHES/DEV/V3.3-BUG-F?=
 =?UTF-8?q?IX=20to=20BRANCHES/V3.3:=20=20=20=20=20=20=2020184:=20ALF-2772:?=
 =?UTF-8?q?=20Added=20new=20test=20case=20to=20RepoTransferReceiverImplTes?=
 =?UTF-8?q?t=20and=20fixed=20the=20fault=20in=20the=20primary=20manifest?=
 =?UTF-8?q?=20processor.=20=20=20=20=20=20=2020196:=20Temporary=20fix=20to?=
 =?UTF-8?q?=20SandboxServiceImplTest,=20which=20reverses=20the=20fix=20to?=
 =?UTF-8?q?=20ALF-2529.=20=20=20=2020434:=20Merged=20BRANCHES/DEV/V3.3-BUG?=
 =?UTF-8?q?-FIX=20to=20BRANCHES/V3.3:=20(RECORD=20ONLY)=20=20=20=20=20=20?=
 =?UTF-8?q?=2020213:=20(RECORD=20ONLY)=20Merge=20from=20V3.3=20to=20V3.3-B?=
 =?UTF-8?q?UG-FIX=20=20=20=20=20=20=20=20=20=20r20176=20Merge=20from=20V3.?=
 =?UTF-8?q?2=20to=20V3.3.=20=20=20=20=20=20=20=20=20=20=20=20=20=20r20175.?=
 =?UTF-8?q?=20JMX=20configuration=20of=20enterprise=20logging=20broken=20(?=
 =?UTF-8?q?fix).=20=20=20=20=20=20=2020215:=20(RECORD=20ONLY)=20Merge=20fr?=
 =?UTF-8?q?om=20V3.3=20to=20V3.3-BUG-FIX=20=20=20=20=20=20=20=20=20=20r201?=
 =?UTF-8?q?78=20JodConverter=20loggers=20are=20now=20exposed=20in=20JMX.?=
 =?UTF-8?q?=20=20=20=20=20=20=2020218:=20(RECORD=20ONLY)=20Merged=20BRANCH?=
 =?UTF-8?q?ES/V3.3=20to=20BRANCHES/DEV/V3.3-BUG-FIX:=20=20=20=20=20=20=20?=
 =?UTF-8?q?=20=20=2020195:=20Form=20fields=20for=20numbers=20are=20now=20r?=
 =?UTF-8?q?endered=20much=20smaller=20that=20...=20=20=20=20=20=20=2020248?=
 =?UTF-8?q?:=20(RECORD=20ONLY)=20Merging=20HEAD=20into=20V3.3=20=20=20=20?=
 =?UTF-8?q?=20=20=2020284:=20(RECORD=20ONLY)=20Merged=20BRANCHES/V3.3=20to?=
 =?UTF-8?q?=20BRANCHES/DEV/V3.3-BUG-FIX:=20=20=20=20=20=20=20=20=20=202017?=
 =?UTF-8?q?7:=20Add=20'MaxPermSize'=20setting=20for=20DOD=20JUnit=20tests?=
 =?UTF-8?q?=20=20=20=20=20=20=2020305:=20(RECORD=20ONLY)=20Merged=20BRANCH?=
 =?UTF-8?q?ES/V3.3=20to=20BRANCHES/DEV/V3.3-BUG-FIX:=20=20=20=20=20=20=20?=
 =?UTF-8?q?=20=20=2020236:=20Add=20Oracle=20support=20for=20creating/dropp?=
 =?UTF-8?q?ing=20"databases"=20(users)=20in=20continuous.xml=20=20=20=20?=
 =?UTF-8?q?=20=20=20=20=20=2020264:=20Updated=20Oracle=20build=20support?=
 =?UTF-8?q?=20(to=20fix=20grants)=20=20=20=2020435:=20Merged=20BRANCHES/DE?=
 =?UTF-8?q?V/V3.3-BUG-FIX=20to=20BRANCHES/V3.3:=20=20=20=20=20=20=2020233:?=
 =?UTF-8?q?=20Part=20fix=20for=20ALF-2811:=20DOD5015=20module=20breaks=20C?=
 =?UTF-8?q?MIS=20tck=20=20=20=20=20=20=2020239:=20Final=20part=20of=20fix?=
 =?UTF-8?q?=20for=20ALF-2811:=20DOD5015=20module=20breaks=20CMIS=20tck=20?=
 =?UTF-8?q?=20=20=20=20=20=2020250:=20Merge=20from=20DEV/BELARUS/HEAD-2010?=
 =?UTF-8?q?=5F04=5F28=20to=20V3.3-BUG-FIX=20=20=20=20=20=20=20=20=20=20202?=
 =?UTF-8?q?30=20ALF-2450:=20latin/utf-8=20HTML=20file=20cannot=20be=20text?=
 =?UTF-8?q?-extracted.=20=20=20=20=20=20=2020253:=20ALF-2629=20Now=20tasks?=
 =?UTF-8?q?=20should=20correctly=20be=20ended=20when=20an=20associated=20t?=
 =?UTF-8?q?imer=20is=20triggered.=20Should=20no=20longer=20cause=20WCM=20w?=
 =?UTF-8?q?orkflows=20to=20fail.=20=20=20=20=20=20=2020254:=20ALF-2579=20C?=
 =?UTF-8?q?hanged=20teh=20status=20code=20on=20incorrect=20password=20to?=
 =?UTF-8?q?=20'401'=20to=20reflect=20that=20it=20is=20an=20authorisation?=
 =?UTF-8?q?=20error.=20=20=20=20=20=20=2020263:=20Fix=20for=20ALF-2500:=20?=
 =?UTF-8?q?query=20with=20a=20!=20in=20contains=20search=20make=20it=20str?=
 =?UTF-8?q?ange=20=20=20=20=20=20=2020265:=20Fix=20for=20ALF-1495.=20Reind?=
 =?UTF-8?q?exing=20of=20OOo-transformed=20content=20after=20OOo=20crash.?=
 =?UTF-8?q?=20=20=20=2020436:=20Merged=20BRANCHES/DEV/V3.3-BUG-FIX=20to=20?=
 =?UTF-8?q?BRANCHES/V3.3:=20=20=20=20=20=20=2020292:=20(RECORD=20ONLY)=20L?=
 =?UTF-8?q?atest=20SpringSurf=20libs:=20=20=20=20=20=20=2020308:=20(RECORD?=
 =?UTF-8?q?=20ONLY)=20Latest=20SpringSurf=20libs:=20=20=20=20=20=20=202036?=
 =?UTF-8?q?6:=20(RECORD=20ONLY)=20Latest=20SpringSurf=20libs:=20=20=20=20?=
 =?UTF-8?q?=20=20=2020415:=20Latest=20SpringSurf=20libs:=20=20=20=2020437:?=
 =?UTF-8?q?=20Merged=20BRANCHES/DEV/V3.3-BUG-FIX=20to=20BRANCHES/V3.3:=20?=
 =?UTF-8?q?=20=20=20=20=20=2020270:=20Build=20times:=20SearchTestSuite=20?=
 =?UTF-8?q?=20=20=20=20=20=2020273:=20Fix=20for=20ALF-2125=20-=20Accessing?=
 =?UTF-8?q?=20a=20deleted=20page=20in=20Share=20does=20not=20return=20an?=
 =?UTF-8?q?=20error=20page,=20instead=20the=20document-details=20page=20br?=
 =?UTF-8?q?eaks=20=20=20=20=20=20=2020274:=20Fix=20for=20ALF-2518:=20It's?=
 =?UTF-8?q?=20impossible=20to=20find=20user=20by=20user=20name=20in=20Add?=
 =?UTF-8?q?=20User=20or=20Group=20window=20at=20Manage=20permissions=20pag?=
 =?UTF-8?q?e=20(also=20allows=20users=20to=20be=20found=20by=20username=20?=
 =?UTF-8?q?in=20the=20Share=20Admin=20Console).=20=20=20=20=20=20=2020277:?=
 =?UTF-8?q?=20Fix=20for=20ALF-2417:=20Create=20Web=20Content=20Wizard=20if?=
 =?UTF-8?q?=20cancelling/aborting=20Step=20Two=20-=20Author=20Web=20Conten?=
 =?UTF-8?q?t,=20any=20asset=20being=20uploaded=20gets=20locked=20=20=20=20?=
 =?UTF-8?q?=20=20=2020291:=20Reduce=20build=20time:=20Added=20security=20t?=
 =?UTF-8?q?est=20suite=20to=20cover=2017=20security=20tests=20=20=20=20204?=
 =?UTF-8?q?39:=20Merged=20BRANCHES/DEV/V3.3-BUG-FIX=20to=20BRANCHES/V3.3:?=
 =?UTF-8?q?=20=20=20=20=20=20=2020302:=20Fixed=20ALF-727:=20=20Oracle=20iB?=
 =?UTF-8?q?atis=20fails=20on=20PropertyValueDAOTest=20Double.MAX=5FVALUE?=
 =?UTF-8?q?=20=20=20=20=20=20=2020307:=20VersionStore=20-=20minor=20fixes?=
 =?UTF-8?q?=20if=20running=20deprecated=20V1=20=20=20=20=20=20=2020310:=20?=
 =?UTF-8?q?Fixed=20a=20bug=20in=20UIContentSelector=20which=20was=20buildi?=
 =?UTF-8?q?ng=20lucene=20search=20queries=20incorrectly.=20=20=20=20=20=20?=
 =?UTF-8?q?=2020314:=20Fix=20for=20ALF-2789=20-=20DispatcherServlet=20not?=
 =?UTF-8?q?=20correctly=20retrieving=20Object=20ID=20from=20request=20para?=
 =?UTF-8?q?meters=20=20=20=20=20=20=2020320:=20Merged=20DEV/TEMPORARY=20to?=
 =?UTF-8?q?=20V3.3-BUG-FIX=20=20=20=20=20=20=20=20=20=2020313:=20ALF-2507:?=
 =?UTF-8?q?=20Not=20able=20to=20email=20space=20users=20even=20if=20the=20?=
 =?UTF-8?q?user=20owns=20the=20space=20=20=20=20=20=20=2020324:=20Fixed=20?=
 =?UTF-8?q?ALF-2078=20"Content=20doesn't=20make=20checked=20in=20after=20a?=
 =?UTF-8?q?pplying=20'Check-in'=20rule=20in=20Share"=20=20=20=20=20=20=202?=
 =?UTF-8?q?0327:=20Fix=20Quickr=20project=20to=20compile=20in=20Eclipse=20?=
 =?UTF-8?q?=20=20=20=20=20=2020367:=20ALF-2829:=20Avoid=20reading=20entire?=
 =?UTF-8?q?=20result=20set=20into=20memory=20in=20FixNameCrcValuesPatch=20?=
 =?UTF-8?q?=20=20=20=20=20=2020368:=20Work-around=20for=20ALF-2366:=20patc?=
 =?UTF-8?q?h.updateDmPermissions=20takes=20too=20long=20to=20complete=20?=
 =?UTF-8?q?=20=20=20=20=20=2020369:=20Part=201=20of=20fix=20for=20ALF-2943?=
 =?UTF-8?q?:=20Update=20incorrect=20mimetypes=20(Excel=20and=20Powerpoint)?=
 =?UTF-8?q?=20=20=20=20=20=20=2020370:=20Version=20Migrator=20(ALF-1000)?=
 =?UTF-8?q?=20-=20use=20common=20batch=20processor=20to=20enable=20multipl?=
 =?UTF-8?q?e=20workers=20=20=20=20=20=20=2020373:=20Version=20Migrator=20(?=
 =?UTF-8?q?ALF-1000)=20-=20resolve=20runtime=20conflict=20(w/=20r20334)=20?=
 =?UTF-8?q?=20=20=20=20=20=2020378:=20Merged=20BRANCHES/DEV/BELARUS/HEAD-2?=
 =?UTF-8?q?010=5F04=5F28=20to=20BRANCHES/DEV/V3.3-BUG-FIX:=20=20=20=20=20?=
 =?UTF-8?q?=20=20=20=20=2020312:=20ALF-2162:=20Error=20processing=20WCM=20?=
 =?UTF-8?q?form:=20XFormsBindingException:=20property=20'constraint'=20alr?=
 =?UTF-8?q?eady=20present=20at=20model=20item=20=20=20=20=20=20=2020381:?=
 =?UTF-8?q?=20Fixed=20ALF-2943:=20Update=20incorrect=20mimetypes=20(Excel?=
 =?UTF-8?q?=20and=20Powerpoint)?=
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@20571 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 config/alfresco/audit-services-context.xml    |   3 -
 config/alfresco/cache-context.xml             |   4 +-
 config/alfresco/content-services-context.xml  |  25 +-
 config/alfresco/core-services-context.xml     |  16 +-
 .../remove-AVM-issuer.sql                     |   2 +-
 .../remove-AVM-issuer.sql                     |   2 +-
 .../index-recovery-context.xml.sample         |  33 -
 .../mt/mt-contentstore-context.xml.sample     |   3 -
 .../use-old-dm-alcs-context.xml.sample        |  53 ++
 config/alfresco/hibernate-context.xml         |   3 +
 .../content-common-SqlMap.xml                 |  35 +-
 .../patch-common-SqlMap.xml                   |  14 +
 config/alfresco/index-recovery-context.xml    |  32 +-
 .../messages/jbpm-engine-messages.properties  |  76 +--
 .../messages/patch-service.properties         |  12 +-
 .../messages/version-service.properties       |  12 +-
 .../alfresco/patch/patch-services-context.xml |  54 +-
 .../public-services-security-context.xml      |   2 +-
 config/alfresco/repository.properties         |  14 +
 config/alfresco/scheduled-jobs-context.xml    |  13 +-
 config/alfresco/version.properties            |   2 +-
 .../cmis/search/CMISFTSQueryParser.java       | 414 +++++++++++
 .../alfresco/cmis/search/CMISQueryParser.java |  10 +-
 .../org/alfresco/cmis/search/QueryTest.java   |  16 +-
 .../handler/AbstractEmailMessageHandler.java  |  31 +
 .../alfresco/filesys/avm/AVMDiskDriver.java   |  14 +
 .../alfresco/filesys/avm/AVMNetworkFile.java  |   2 -
 .../filesys/repo/ContentNetworkFile.java      |   2 -
 .../compare/DatePropertyValueComparator.java  |  20 +-
 .../impl/FixAuthoritiesCrcValuesPatch.java    |   2 +-
 .../patch/impl/FixNameCrcValuesPatch.java     | 150 ++--
 .../impl/GenericMimetypeRenamePatch.java      | 200 ++++++
 .../patch/impl/MigrateVersionStorePatch.java  |  55 +-
 .../org/alfresco/repo/avm/AVMCrawlTestP.java  |   6 +-
 .../repo/avm/AVMDiffPerformanceTest.java      |  16 +-
 .../repo/avm/AVMServiceIndexTest.java         |  31 +-
 .../repo/avm/AVMServiceLocalTest.java         |  32 +-
 .../alfresco/repo/avm/AVMServicePerfTest.java |  12 +-
 .../org/alfresco/repo/avm/AVMServiceTest.java |  58 +-
 .../org/alfresco/repo/avm/AVMStressTestP.java |   6 +-
 .../org/alfresco/repo/avm/AVMTestSuite.java   |  19 +-
 .../org/alfresco/repo/avm/PurgeTestP.java     |   2 +-
 .../repo/avm/SimultaneousLoadTest.java        |   6 +-
 .../AbstractReadOnlyContentStoreTest.java     |   3 -
 .../repo/content/ContentServiceImpl.java      |  28 +-
 .../content/RoutingContentServiceTest.java    |  99 ++-
 .../repo/content/RoutingContentStoreTest.java |   6 +-
 .../TenantRoutingFileContentStore.java        |  31 +-
 .../content/cleanup/ContentStoreCleaner.java  |  35 +-
 .../cleanup/EagerContentStoreCleaner.java     |  29 +-
 .../content/filestore/FileContentStore.java   |  62 +-
 .../filestore/FileContentStoreTest.java       |   6 +-
 .../NoRandomAccessFileContentStoreTest.java   |   6 +-
 .../ReadOnlyFileContentStoreTest.java         |   6 +-
 .../AbstractMappingMetadataExtracter.java     |  18 +-
 .../metadata/MailMetadataExtracter.java       |   2 +-
 .../metadata/RFC822MetadataExtracter.java     |  69 +-
 .../RFC822MetadataExtracter.properties        |   8 +-
 .../ReplicatingContentStoreTest.java          |   2 +-
 .../AbstractContentDataDAOImpl.java           |  68 +-
 .../contentdata/ContentDataDAOTest.java       |   4 +-
 .../contentdata/ContentUrlUpdateEntity.java   |  78 +++
 .../ibatis/ContentDataDAOImpl.java            |  29 +-
 .../domain/hibernate/AclDaoComponentImpl.java |  27 +
 .../hibernate/DMAccessControlListDAO.java     |   4 +-
 .../hibernate/NodeAccessControlListDAO.java   |   7 +-
 .../OldADMPermissionsDaoComponentImpl.java    |   9 +
 .../mimetype/AbstractMimetypeDAOImpl.java     |  31 +
 .../repo/domain/mimetype/MimetypeDAO.java     |  11 +
 .../repo/domain/mimetype/MimetypeDAOTest.java |  23 +
 .../repo/domain/mimetype/MimetypeEntity.java  |  12 +
 .../mimetype/ibatis/MimetypeDAOImpl.java      |  16 +
 .../alfresco/repo/domain/patch/PatchDAO.java  |   9 +
 .../domain/patch/ibatis/PatchDAOImpl.java     |   9 +
 .../domain/propval/PropertyValueDAOTest.java  |   2 +-
 .../processor/node/TypeFormProcessor.java     |   2 +-
 .../repo/imap/AlfrescoImapFolder.java         |  33 +-
 .../org/alfresco/repo/imap/ImapService.java   |  40 +-
 .../alfresco/repo/imap/ImapServiceImpl.java   | 645 ++++++++++++------
 .../repo/imap/ImapServiceImplTest.java        | 136 ++--
 .../org/alfresco/repo/jscript/People.java     |   2 +
 .../SafeApplicationEventMulticaster.java      |  94 +++
 .../repo/management/SafeEventPublisher.java   |  87 ---
 .../FileFolderPerformanceTester.java          |  67 +-
 .../filefolder/FileFolderServiceImpl.java     | 167 +++--
 .../repo/module/ModuleComponentHelper.java    |   2 +-
 .../HibernateNodeDaoServiceImpl.java          | 122 +++-
 .../alfresco/repo/search/SearchTestSuite.java |  70 ++
 .../search/impl/lucene/ADMLuceneTest.java     |   4 +-
 .../repo/search/impl/parsers/CMISLexer.java   |   2 +-
 .../repo/search/impl/parsers/CMISParser.java  |  30 +-
 .../repo/search/impl/parsers/CMIS_FTS.g       |  33 +-
 .../repo/search/impl/parsers/CMIS_FTS.tokens  |  59 +-
 .../search/impl/parsers/CMIS_FTSLexer.java    | 256 ++++---
 .../search/impl/parsers/CMIS_FTSParser.java   | 211 +++---
 .../repo/search/impl/parsers/FTSLexer.java    |   2 +-
 .../repo/search/impl/parsers/FTSParser.java   |  24 +-
 .../search/impl/parsers/cmis_fts_test.gunit   |   6 +-
 .../repo/security/SecurityTestSuite.java      |  79 +++
 .../authentication/AuthenticationTest.java    |   8 +-
 .../authority/AuthorityServiceTest.java       |   9 +-
 .../authority/SimpleAuthorityServiceTest.java |   6 +-
 .../LockOwnerDynamicAuthorityTest.java        |   9 +-
 .../impl/AbstractPermissionTest.java          |  42 +-
 .../permissions/impl/AclDaoComponent.java     |   7 +
 .../permissions/impl/AclDaoComponentTest.java |   2 +-
 .../impl/PermissionServiceTest.java           | 306 ++++++---
 .../impl/PermissionsDaoComponent.java         |   4 -
 .../ACLEntryAfterInvocationProvider.java      |   9 +-
 .../repo/security/person/PersonTest.java      |  92 ++-
 .../ChainingUserRegistrySynchronizer.java     | 204 +++---
 .../RepoPrimaryManifestProcessorImpl.java     |  13 +-
 .../RepoTransferReceiverImplTest.java         | 148 ++++
 .../repo/version/MigrationCleanupJob.java     |  78 ++-
 .../repo/version/VersionMigrator.java         | 516 +++++++-------
 .../repo/version/VersionMigratorTest.java     |   2 +-
 .../repo/workflow/jbpm/AlfrescoTimer.java     |  11 +-
 .../cmr/dictionary/DictionaryService.java     |   6 +-
 .../service/cmr/model/FileFolderService.java  |  53 +-
 .../service/cmr/model/FileFolderUtil.java     | 140 ++++
 .../service/cmr/model/SubFolderFilter.java    |  21 +
 .../service/cmr/model/package-info.java       |  34 +
 .../service/cmr/repository/ContentData.java   |  27 -
 .../cmr/repository/ContentService.java        |   7 +
 .../tenant/mt-contentstore-context.xml        |   3 -
 125 files changed, 4282 insertions(+), 1911 deletions(-)
 delete mode 100644 config/alfresco/extension/index-recovery-context.xml.sample
 create mode 100644 config/alfresco/extension/use-old-dm-alcs-context.xml.sample
 create mode 100644 source/java/org/alfresco/cmis/search/CMISFTSQueryParser.java
 create mode 100644 source/java/org/alfresco/repo/admin/patch/impl/GenericMimetypeRenamePatch.java
 create mode 100644 source/java/org/alfresco/repo/domain/contentdata/ContentUrlUpdateEntity.java
 create mode 100644 source/java/org/alfresco/repo/management/SafeApplicationEventMulticaster.java
 delete mode 100644 source/java/org/alfresco/repo/management/SafeEventPublisher.java
 create mode 100644 source/java/org/alfresco/repo/search/SearchTestSuite.java
 create mode 100644 source/java/org/alfresco/repo/security/SecurityTestSuite.java
 create mode 100644 source/java/org/alfresco/service/cmr/model/FileFolderUtil.java
 create mode 100644 source/java/org/alfresco/service/cmr/model/SubFolderFilter.java
 create mode 100644 source/java/org/alfresco/service/cmr/model/package-info.java

diff --git a/config/alfresco/audit-services-context.xml b/config/alfresco/audit-services-context.xml
index 866c5b4fa3..7246062665 100644
--- a/config/alfresco/audit-services-context.xml
+++ b/config/alfresco/audit-services-context.xml
@@ -59,9 +59,6 @@
         <constructor-arg>
             <value>${dir.auditcontentstore}</value>
         </constructor-arg>
-        <property name="applicationEventPublisher">
-            <ref bean="applicationEventPublisher"/>
-        </property>
     </bean>
     
     <!-- The audit model -->
diff --git a/config/alfresco/cache-context.xml b/config/alfresco/cache-context.xml
index f08686bbce..5b489335a5 100644
--- a/config/alfresco/cache-context.xml
+++ b/config/alfresco/cache-context.xml
@@ -208,7 +208,7 @@
    </bean>
    
    <!-- ===================================== -->
-   <!-- ID lookup for Encoding entities       -->
+   <!-- ID lookup for ContentData entities       -->
    <!-- ===================================== -->
 
    <!-- The cross-transaction shared cache for ContentData -->
@@ -239,7 +239,7 @@
          <value>org.alfresco.cache.contentDataTransactionalCache</value>
       </property>
       <property name="maxCacheSize">
-         <value>1000</value>
+         <value>10000</value>
       </property>
    </bean>
    
diff --git a/config/alfresco/content-services-context.xml b/config/alfresco/content-services-context.xml
index 8d87603842..6b14146146 100644
--- a/config/alfresco/content-services-context.xml
+++ b/config/alfresco/content-services-context.xml
@@ -2,14 +2,11 @@
 <!DOCTYPE beans PUBLIC '-//SPRING//DTD BEAN//EN' 'http://www.springframework.org/dtd/spring-beans.dtd'>
  
 <beans>
-
+   
    <bean id="fileContentStore" class="org.alfresco.repo.content.filestore.FileContentStore">
       <constructor-arg>
          <value>${dir.contentstore}</value>
       </constructor-arg>
-      <property name="applicationEventPublisher">
-         <ref bean="applicationEventPublisher" />
-      </property>
    </bean>
    
    <!-- deleted content will get pushed into this store, where it can be cleaned up at will -->
@@ -17,9 +14,6 @@
       <constructor-arg>
          <value>${dir.contentstore.deleted}</value>
       </constructor-arg>
-      <property name="applicationEventPublisher">
-         <ref bean="applicationEventPublisher" />
-      </property>
    </bean>
    <!-- bean to move deleted content into the the backup store -->
    <bean id="deletedContentBackupListener" class="org.alfresco.repo.content.cleanup.DeletedContentBackupCleanerListener" >
@@ -84,9 +78,6 @@
    
    <!-- Abstract bean definition defining base definition for content service -->
    <bean id="baseContentService" class="org.alfresco.repo.content.ContentServiceImpl" abstract="true" init-method="init">
-      <property name="applicationEventPublisher">
-          <ref bean="applicationEventPublisher"/>
-      </property>
       <property name="retryingTransactionHelper">
           <ref bean="retryingTransactionHelper"/>
       </property>
@@ -222,6 +213,7 @@
       <property name="supportedDateFormats">
          <list>
             <value>EEE, d MMM yyyy HH:mm:ss Z</value>
+            <value>EEE, d MMM yy HH:mm:ss Z</value>
          </list>
       </property>
    </bean>
@@ -391,8 +383,17 @@
 
    <bean id="transformer.HtmlParser"
          class="org.alfresco.repo.content.transform.HtmlParserContentTransformer"
-         parent="baseContentTransformer" />
-         
+         parent="baseContentTransformer" >
+      <property name="explicitTransformations">
+         <list>
+            <bean class="org.alfresco.repo.content.transform.ExplictTransformationDetails" >
+                <property name="sourceMimetype"><value>text/html</value></property>
+                <property name="targetMimetype"><value>text/plain</value></property>
+            </bean>
+         </list>
+      </property> 		 
+   </bean>
+   
    <bean id="transformer.MediaWikiParser"
          class="org.alfresco.repo.content.transform.MediaWikiContentTransformer"
          parent="baseContentTransformer">
diff --git a/config/alfresco/core-services-context.xml b/config/alfresco/core-services-context.xml
index 23fdf8fe13..6d932ebd1a 100644
--- a/config/alfresco/core-services-context.xml
+++ b/config/alfresco/core-services-context.xml
@@ -969,8 +969,17 @@
         <property name="transactionService">
             <ref bean="transactionService"/>
         </property>
+        <property name="qnameDAO">
+            <ref bean="qnameDAO"/>
+        </property>
+        <property name="ruleService">
+            <ref bean="ruleService" />
+        </property>
+        <property name="loggingInterval">
+            <value>500</value>
+        </property>
     </bean>
-
+    
     <bean id="versionableAspect" class="org.alfresco.repo.version.VersionableAspect" init-method="init">
         <property name="policyComponent">
             <ref bean="policyComponent" />
@@ -1428,7 +1437,6 @@
       </property>
    </bean>
     
-    <!-- Bean that can be used for publishing events, even when the app is starting up -->
-    <bean id="applicationEventPublisher" class="org.alfresco.repo.management.SafeEventPublisher"/>
-
+    <!-- Replacement for Spring's multicaster, that queues up events until the application is started -->
+    <bean id="applicationEventMulticaster" class="org.alfresco.repo.management.SafeApplicationEventMulticaster"/>
 </beans>
diff --git a/config/alfresco/dbscripts/upgrade/3.2/org.hibernate.dialect.MySQLInnoDBDialect/remove-AVM-issuer.sql b/config/alfresco/dbscripts/upgrade/3.2/org.hibernate.dialect.MySQLInnoDBDialect/remove-AVM-issuer.sql
index 09c498e425..bdbd0354da 100644
--- a/config/alfresco/dbscripts/upgrade/3.2/org.hibernate.dialect.MySQLInnoDBDialect/remove-AVM-issuer.sql
+++ b/config/alfresco/dbscripts/upgrade/3.2/org.hibernate.dialect.MySQLInnoDBDialect/remove-AVM-issuer.sql
@@ -13,7 +13,7 @@
 -- Enable auto-increment --
 -- -----------------------------
 
-insert into avm_nodes
+insert into avm_nodes (id, class_type, vers, version_id, guid, creator, owner, lastModifier, createDate, modDate, accessDate, is_root, store_new_id, acl_id, deletedType, layer_id, indirection, indirection_version, primary_indirection, opacity, content_url, mime_type, encoding, length)
 select 
 (select max(id)+1 from avm_nodes),
 class_type, vers, version_id, guid, creator, owner, lastModifier, createDate, modDate, accessDate, is_root, store_new_id, acl_id, deletedType, layer_id, indirection, indirection_version, primary_indirection, opacity, content_url, mime_type, encoding, length
diff --git a/config/alfresco/dbscripts/upgrade/3.2/org.hibernate.dialect.PostgreSQLDialect/remove-AVM-issuer.sql b/config/alfresco/dbscripts/upgrade/3.2/org.hibernate.dialect.PostgreSQLDialect/remove-AVM-issuer.sql
index dacd1fb965..d290de5864 100644
--- a/config/alfresco/dbscripts/upgrade/3.2/org.hibernate.dialect.PostgreSQLDialect/remove-AVM-issuer.sql
+++ b/config/alfresco/dbscripts/upgrade/3.2/org.hibernate.dialect.PostgreSQLDialect/remove-AVM-issuer.sql
@@ -13,7 +13,7 @@
 
 SELECT SETVAL('hibernate_sequence', GREATEST((MAX(id)+1), NEXTVAL('hibernate_sequence'))) FROM avm_nodes;
 
-insert into avm_nodes
+insert into avm_nodes (id, class_type, vers, version_id, guid, creator, owner, lastModifier, createDate, modDate, accessDate, is_root, store_new_id, acl_id, deletedType, layer_id, indirection, indirection_version, primary_indirection, opacity, content_url, mime_type, encoding, length)
 select 
 (select max(id)+1 from avm_nodes),
 class_type, vers, version_id, guid, creator, owner, lastModifier, createDate, modDate, accessDate, is_root, store_new_id, acl_id, deletedType, layer_id, indirection, indirection_version, primary_indirection, opacity, content_url, mime_type, encoding, length
diff --git a/config/alfresco/extension/index-recovery-context.xml.sample b/config/alfresco/extension/index-recovery-context.xml.sample
deleted file mode 100644
index 1a9088af32..0000000000
--- a/config/alfresco/extension/index-recovery-context.xml.sample
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE beans PUBLIC '-//SPRING//DTD BEAN//EN' 'http://www.springframework.org/dtd/spring-beans.dtd'>
-
-<beans>
-
-    <!-- Forces the reindexing of content where full text extraction has previously failed -->
-    <bean id="missingFullTextReindexTrigger" class="org.alfresco.util.CronTriggerBean">
-        <property name="jobDetail">
-            <bean class="org.springframework.scheduling.quartz.JobDetailBean">
-                <property name="jobClass">
-                    <value>org.alfresco.repo.node.index.IndexRecoveryJob</value>
-                </property>
-                <property name="jobDataAsMap">
-                    <map>
-                        <entry key="indexRecoveryComponent">
-                            <ref bean="missingFullTextReindexComponent" />
-                        </entry>
-                        <entry key="clusterName">
-                            <value>${alfresco.cluster.name}</value>
-                        </entry>
-                    </map>
-                </property>
-            </bean>
-        </property>
-        <property name="scheduler">
-            <ref bean="schedulerFactory" />
-        </property>
-        <property name="cronExpression">
-            <value>0 0 21 * * ?</value>
-        </property>
-    </bean>
-
-</beans>
diff --git a/config/alfresco/extension/mt/mt-contentstore-context.xml.sample b/config/alfresco/extension/mt/mt-contentstore-context.xml.sample
index a67ea46342..6fc64c92ca 100644
--- a/config/alfresco/extension/mt/mt-contentstore-context.xml.sample
+++ b/config/alfresco/extension/mt/mt-contentstore-context.xml.sample
@@ -25,9 +25,6 @@
    <!--                                   -->
    
    <bean id="tenantFileContentStore" class="org.alfresco.repo.content.TenantRoutingFileContentStore" init-method="init">
-      <property name="applicationEventPublisher">
-         <ref bean="applicationEventPublisher" />
-      </property>
       <property name="defaultRootDir">
          <value>${dir.contentstore}</value>
       </property>
diff --git a/config/alfresco/extension/use-old-dm-alcs-context.xml.sample b/config/alfresco/extension/use-old-dm-alcs-context.xml.sample
new file mode 100644
index 0000000000..3d0e802b3f
--- /dev/null
+++ b/config/alfresco/extension/use-old-dm-alcs-context.xml.sample
@@ -0,0 +1,53 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE beans PUBLIC '-//SPRING//DTD BEAN//EN' 'http://www.springframework.org/dtd/spring-beans.dtd'>
+
+<beans>
+
+   <bean id="dmPermissionsDaoComponent" class="org.alfresco.repo.domain.hibernate.OldADMPermissionsDaoComponentImpl" >
+      <property name="aclDaoComponent">
+         <ref bean="aclDaoComponent" />
+      </property>
+      <property name="protocolToACLDAO">
+         <map>
+            <entry key="workspace"><ref bean="nodeACLDAO"></ref></entry>
+            <entry key="avm"><ref bean="avmACLDAO"/></entry>
+         </map>
+      </property>
+      <property name="defaultACLDAO">
+          <ref bean="nodeACLDAO"/>
+       </property>
+   </bean>
+   
+    <bean id="nodeACLDAO" class="org.alfresco.repo.domain.hibernate.NodeAccessControlListDAO">
+        <property name="sessionFactory">
+         <ref bean="sessionFactory" />
+        </property>
+        <property name="nodeDaoService">
+            <ref bean="nodeDaoService" />
+        </property>
+    </bean>
+    
+    <bean id="patch.updateDmPermissions" class="java.util.ArrayList" />
+    
+       <bean id="aclDaoComponentImpl" class="org.alfresco.repo.domain.hibernate.AclDaoComponentImpl">
+      <property name="sessionFactory">
+         <ref bean="sessionFactory" />
+      </property>
+      <property name="qnameDAO">
+         <ref bean="qnameDAO" />
+      </property>
+      <property name="patchDAO">
+         <ref bean="patchDAO" />
+      </property>
+      <property name="avmNodeDAO">
+         <ref bean="newAvmNodeDAO" />
+      </property>
+	  <property name="aclCache">
+         <ref bean="aclCache" />
+      </property>
+      <property name="useOldPermissions">
+         <value>true</value>
+      </property>
+   </bean>
+    
+</beans>
\ No newline at end of file
diff --git a/config/alfresco/hibernate-context.xml b/config/alfresco/hibernate-context.xml
index 5f3e8bcac6..1293fe8ac1 100644
--- a/config/alfresco/hibernate-context.xml
+++ b/config/alfresco/hibernate-context.xml
@@ -277,6 +277,9 @@
 	  <property name="aclCache">
          <ref bean="aclCache" />
       </property>
+      <property name="useOldPermissions">
+         <value>false</value>
+      </property>
    </bean>
    
     <bean id="nodeACLDAO" class="org.alfresco.repo.domain.hibernate.DMAccessControlListDAO">
diff --git a/config/alfresco/ibatis/org.hibernate.dialect.Dialect/content-common-SqlMap.xml b/config/alfresco/ibatis/org.hibernate.dialect.Dialect/content-common-SqlMap.xml
index b7a5bd041d..14d84b508b 100644
--- a/config/alfresco/ibatis/org.hibernate.dialect.Dialect/content-common-SqlMap.xml
+++ b/config/alfresco/ibatis/org.hibernate.dialect.Dialect/content-common-SqlMap.xml
@@ -13,6 +13,7 @@
     <typeAlias alias="Mimetype" type="org.alfresco.repo.domain.mimetype.MimetypeEntity"/>
     <typeAlias alias="Encoding" type="org.alfresco.repo.domain.encoding.EncodingEntity"/>
     <typeAlias alias="ContentUrl" type="org.alfresco.repo.domain.contentdata.ContentUrlEntity"/>
+    <typeAlias alias="ContentUrlUpdate" type="org.alfresco.repo.domain.contentdata.ContentUrlUpdateEntity"/>
     <typeAlias alias="ContentData" type="org.alfresco.repo.domain.contentdata.ContentDataEntity"/>
     <typeAlias alias="ContentClean" type="org.alfresco.repo.domain.contentclean.ContentCleanEntity"/>
     <typeAlias alias="Ids" type="org.alfresco.ibatis.IdsEntity"/>
@@ -185,25 +186,42 @@
     </select>
     
     <!-- Get content URL entities that were orphaned before a give time -->
-    <select id="select_ContentUrlByOrphanTime" parameterClass="ContentUrl" resultMap="result_ContentUrl">
+    <select id="select_ContentUrlsOrphaned" parameterClass="ContentUrl" resultMap="result_ContentUrl">
         <![CDATA[
         select
             cu.*
         from
             alf_content_url cu
+            left outer join alf_content_data cd on (cd.content_url_id = cu.id)
         where
+            cd.id is null and
             cu.orphan_time <= #orphanTime# and cu.orphan_time is not null
         ]]>
     </select>
     
+    <!-- Update a specific mimetype -->
+    <update id="update_Mimetype" parameterClass="Mimetype">
+        update
+            alf_mimetype
+        set
+            mimetype_str = #mimetype#
+        where
+            id = #id#
+        <isGreaterThan property="version" compareValue="1">
+            and version = (#version#-1)
+        </isGreaterThan>
+    </update>
+
     <!-- Mark a content URL entity as orphaned -->
-    <update id="update_ContentUrlOrphanTime" parameterClass="ContentUrl">
+    <update id="update_ContentUrlOrphanTime" parameterClass="ContentUrlUpdate">
         update
             alf_content_url
         set
             orphan_time = #orphanTime#
         where
-            id = #id#
+            id = #id# and
+            <isNull property="oldOrphanTime">orphan_time is null</isNull>
+            <isNotNull property="oldOrphanTime">orphan_time = oldOrphanTime</isNotNull>
     </update>
 
     <!-- Delete ContentUrl entity -->
@@ -218,17 +236,6 @@
         </iterate>
     </delete>
 
-    <!-- Delete ContentUrl entities orphaned before a given time -->
-    <delete id="delete_ContentUrlByOrphanTime" parameterClass="ContentUrl">
-        <![CDATA[
-        delete
-        from
-            alf_content_url
-        where
-            orphan_time <= #orphanTime# and orphan_time is not null
-        ]]>
-    </delete>
-
     <!-- Get the ContentData entity by ID -->
     <select id="select_ContentDataById" parameterMap="parameter_IdMap" resultMap="result_ContentData">
         select
diff --git a/config/alfresco/ibatis/org.hibernate.dialect.Dialect/patch-common-SqlMap.xml b/config/alfresco/ibatis/org.hibernate.dialect.Dialect/patch-common-SqlMap.xml
index 7833154f97..333d7e7218 100644
--- a/config/alfresco/ibatis/org.hibernate.dialect.Dialect/patch-common-SqlMap.xml
+++ b/config/alfresco/ibatis/org.hibernate.dialect.Dialect/patch-common-SqlMap.xml
@@ -36,6 +36,11 @@
         <parameter property="localeId" jdbcType="BIGINT" javaType="java.lang.Long"/>
     </parameterMap>
     
+    <parameterMap class="map" id="parameter_contentMimetype">
+        <parameter property="newMimetypeId" jdbcType="BIGINT" javaType="java.lang.Long"/>
+        <parameter property="oldMimetypeId" jdbcType="BIGINT" javaType="java.lang.Long"/>
+    </parameterMap>
+    
     <!--                -->
     <!-- Selects        -->
     <!--                -->
@@ -102,5 +107,14 @@
             and list_index = ?
             and locale_id = ?
     </update>
+    
+    <update id="update_contentMimetypeId" parameterMap="parameter_contentMimetype">
+        update
+            alf_content_data
+        set
+            content_mimetype_id = ?
+        where
+            content_mimetype_id = ?
+    </update>
 
 </sqlMap>
\ No newline at end of file
diff --git a/config/alfresco/index-recovery-context.xml b/config/alfresco/index-recovery-context.xml
index a90af3d333..c4053ddfc8 100644
--- a/config/alfresco/index-recovery-context.xml
+++ b/config/alfresco/index-recovery-context.xml
@@ -194,12 +194,40 @@
         nitf: Not Indexed Transformation Failed
         nicm: Not Indexed Content Missing
         nint: Not Indexed No Transformation
-      Use a CronTriggerBean and Quartz scheduler to trigger as required
    -->
    <bean
          id="missingFullTextReindexComponent"
          class="org.alfresco.repo.node.index.MissingContentReindexComponent"
          parent="indexRecoveryComponentBase">
    </bean>
-
+   
+   
+   <!-- This JobDetail and its associated Trigger bean will in practice not be run due to the cron
+        expression used. In order to activate the missing content reindexing, the cron expression
+        can be changed in the properties file or via JMX (Enterprise-only) -->
+    <bean id="missingFullTextReindexTrigger" class="org.alfresco.util.CronTriggerBean">
+        <property name="jobDetail">
+            <bean class="org.springframework.scheduling.quartz.JobDetailBean">
+                <property name="jobClass">
+                    <value>org.alfresco.repo.node.index.IndexRecoveryJob</value>
+                </property>
+                <property name="jobDataAsMap">
+                    <map>
+                        <entry key="indexRecoveryComponent">
+                            <ref bean="missingFullTextReindexComponent" />
+                        </entry>
+                        <entry key="clusterName">
+                            <value>${alfresco.cluster.name}</value>
+                        </entry>
+                    </map>
+                </property>
+            </bean>
+        </property>
+        <property name="scheduler">
+            <ref bean="schedulerFactory" />
+        </property>
+        <property name="cronExpression">
+            <value>${index.reindexMissingContent.cronExpression}</value>
+        </property>
+    </bean>
 </beans>
\ No newline at end of file
diff --git a/config/alfresco/messages/jbpm-engine-messages.properties b/config/alfresco/messages/jbpm-engine-messages.properties
index 3c12f1c686..86bea96a75 100644
--- a/config/alfresco/messages/jbpm-engine-messages.properties
+++ b/config/alfresco/messages/jbpm-engine-messages.properties
@@ -1,45 +1,45 @@
 Jbpm.engine.mandatory.properties.missing=Mandatory task properties have not been provided!
 jbpm.engine.deploy.workflow.error=Failed to deploy workflow definition.
 jbpm.engine.is.workflow.deployed.error=Failed to determine if workflow definition  is already deployed. 
-jbpm.engine.undeploy.workflow.error=Failed to undeploy workflow definition '{0}'.
+jbpm.engine.undeploy.workflow.error=Failed to undeploy workflow definition {0}.
 jbpm.engine.get.workflow.definition.error=Failed to retrieve workflow definitions.
-jbpm.engine.get.workflow.definition.by.id.error=Failed to retrieve workflow definition for id '{0}'.
-jbpm.engine.get.workflow.definition.by.name.error=Failed to retrieve workflow definition for name '{0}'.
-jbpm.engine.get.all.workflow.definitions.by.name.error=Failed to retrieve all definitions for workflow '{0}'.
-jbpm.engine.get.workflow.definition.image.error=Failed to retrieve workflow definition image for '{0}'.
-jbpm.engine.get.task.definitions.error=Failed to retrieve workflow task definitions for workflow definition '{0}'.
-jbpm.engine.get.process.definition.error=Workflow definition '{0}' does not exist.
-jbpm.enginestart.workflow.error=Failed to start workflow '{0}'.
-jbpm.engine.get.active.workflows.error=Failed to retrieve workflow instances for definition '{0}'.
-jbpm.engine.get.workflow.instance.by.id.error=Failed to retrieve workflow instance with Id '{0}'.
-jbpm.engine.get.process.instance.error=Workflow instance does not exist for Id '{0}'.
-jbpm.engine.get.workflow.paths.error=Failed to retrieve workflow paths for workflow instance '{0}'.
-jbpm.engine.get.path.properties.error=Failed to retrieve properties of path '{0}'.
-jbpm.engine.cancel.workflow.error=Failed to cancel workflow instance ' {0}'.
-jbpm.engine.delete.workflow.error=Failed to delete workflow instance ' {0}'.
-jbpm.engine.signal.transition.error=Failed to signal transition '{0}' from workflow path '{1}'..
-jbpm.engine.invalid.event=Event '{0}' is not a valid event, this event name is reserved.
-jbpm.engine.fire.event.error=Failed to fire event '{0}' on workflow path {1}.
-jbpm.engine.get.tasks.for.path.error=Failed to retrieve tasks assigned to Workflow path '{0}'.
-jbpm.engine.get.timers.error=Could not retrieve any timers for workflow '{0}'.
-jbpm.engine.find.completed.task.instances.error=Failed to retrieve completed task instances list for actor '{0}'.
-jbpm.engine.get.assigned.tasks.error=Failed to retrieve tasks assigned to authority '{0}' in state '{1}'.
-jbpm.engine.get.pooled.tasks.error=Failed to retrieve pooled tasks for authorities '{0}'.
-jbpm.engine.query.tasks.error=Failed to query tasks. Query: '{0}'.
-jbpm.engine.get.task.instance.error=Task instance '{0}' does not exist.
-jbpm.engine.update.task.error=Failed to update workflow task '{0}'.
-jbpm.engine.end.task.invalid.transition=Transition '{0}' is invalid for Workflow task {1}.
-jbpm.engine.end.task.error=Failed to signal transition '{0}' from workflow task '{1}'.
+jbpm.engine.get.workflow.definition.by.id.error=Failed to retrieve workflow definition for id {0}.
+jbpm.engine.get.workflow.definition.by.name.error=Failed to retrieve workflow definition for name {0}.
+jbpm.engine.get.all.workflow.definitions.by.name.error=Failed to retrieve all definitions for workflow {0}.
+jbpm.engine.get.workflow.definition.image.error=Failed to retrieve workflow definition image for {0}.
+jbpm.engine.get.task.definitions.error=Failed to retrieve workflow task definitions for workflow definition {0}.
+jbpm.engine.get.process.definition.error=Workflow definition {0} does not exist.
+jbpm.enginestart.workflow.error=Failed to start workflow {0}.
+jbpm.engine.get.active.workflows.error=Failed to retrieve workflow instances for definition {0}.
+jbpm.engine.get.workflow.instance.by.id.error=Failed to retrieve workflow instance with Id {0}.
+jbpm.engine.get.process.instance.error=Workflow instance does not exist for Id {0}.
+jbpm.engine.get.workflow.paths.error=Failed to retrieve workflow paths for workflow instance {0}.
+jbpm.engine.get.path.properties.error=Failed to retrieve properties of path {0}.
+jbpm.engine.cancel.workflow.error=Failed to cancel workflow instance  {0}.
+jbpm.engine.delete.workflow.error=Failed to delete workflow instance  {0}.
+jbpm.engine.signal.transition.error=Failed to signal transition {0} from workflow path {1}..
+jbpm.engine.invalid.event=Event {0} is not a valid event, this event name is reserved.
+jbpm.engine.fire.event.error=Failed to fire event {0} on workflow path {1}.
+jbpm.engine.get.tasks.for.path.error=Failed to retrieve tasks assigned to Workflow path {0}.
+jbpm.engine.get.timers.error=Could not retrieve any timers for workflow {0}.
+jbpm.engine.find.completed.task.instances.error=Failed to retrieve completed task instances list for actor {0}.
+jbpm.engine.get.assigned.tasks.error=Failed to retrieve tasks assigned to authority {0} in state {1}.
+jbpm.engine.get.pooled.tasks.error=Failed to retrieve pooled tasks for authorities {0}.
+jbpm.engine.query.tasks.error=Failed to query tasks. Query: {0}.
+jbpm.engine.get.task.instance.error=Task instance {0} does not exist.
+jbpm.engine.update.task.error=Failed to update workflow task {0}.
+jbpm.engine.end.task.invalid.transition=Transition {0} is invalid for Workflow task {1}.
+jbpm.engine.end.task.error=Failed to signal transition {0} from workflow task {1}.
 jbpm.engine.get.task.by.id.error=Failed to retrieve task {0}.
 jbpm.engine.compile.process.definition.zip.error=Failed to parse process definition from jBPM zip archive stream.
 jbpm.engine.compile.process.definition.xml.error=Failed to parse process definition from jBPM xml stream.
-jbpm.engine.compile.process.definition.unsupported.error=Failed to parse process definition - unsupported mime type '{0}'
-jbpm.engine.get.task.definition.error=Failed to find type definition '{0}'.
-jbpm.engine.get.jbpm.id.error=Format of id '{0}' is invalid.
-jbpm.engine.get.workflow.token.invalid=Invalid workflow path '{0}'.
-jbpm.engine.get.workflow.token.is.null=Workflow path '{0}' does not exist.
-jbpm.engine.set.task.properties.invalid.value=The value '{0}' is invalid for the task property '{1}'.
-jbpm.engine.package.already.associated.error=Cannot associate workflow package '{0}' with workflow instance '{1}' as it's already associated with workflow instance '{2}".
-jbpm.engine.convert.value.error=Unable to convert jBPM value '{0}' to Alfresco Value since it is not Serializable.
-jbpm.engine.get.company.home.invalid=Invalid company home path '{0}'.
-jbpm.engine.get.company.home.multiple=Invalid company home path '{0}'. Expected 1 match but found {1} matches.
\ No newline at end of file
+jbpm.engine.compile.process.definition.unsupported.error=Failed to parse process definition - unsupported mime type {0}
+jbpm.engine.get.task.definition.error=Failed to find type definition {0}.
+jbpm.engine.get.jbpm.id.error=Format of id {0} is invalid.
+jbpm.engine.get.workflow.token.invalid=Invalid workflow path {0}.
+jbpm.engine.get.workflow.token.is.null=Workflow path {0} does not exist.
+jbpm.engine.set.task.properties.invalid.value=The value {0} is invalid for the task property {1}.
+jbpm.engine.package.already.associated.error=Cannot associate workflow package {0} with workflow instance {1} as its already associated with workflow instance {2}".
+jbpm.engine.convert.value.error=Unable to convert jBPM value {0} to Alfresco Value since it is not Serializable.
+jbpm.engine.get.company.home.invalid=Invalid company home path {0}.
+jbpm.engine.get.company.home.multiple=Invalid company home path {0}. Expected 1 match but found {1} matches.
\ No newline at end of file
diff --git a/config/alfresco/messages/patch-service.properties b/config/alfresco/messages/patch-service.properties
index 6a64416ae0..bcdf7f4660 100644
--- a/config/alfresco/messages/patch-service.properties
+++ b/config/alfresco/messages/patch-service.properties
@@ -22,6 +22,12 @@ patch.general.property_not_set=Patch property ''{0}'' has not been set on this p
 
 patch.QNamePatch.result=Successfully updated the ''{0}'' QName to ''{1}''.
 
+patch.genericMimetypeUpdate.start=Updating mimetypes.
+patch.genericMimetypeUpdate.updated=\n\tUpdated {0} content references with mimetype ''{1}'' to use ''{2}''.
+patch.genericMimetypeUpdate.indexed=\n\tIndexed {0} nodes in store ''{1}''.
+patch.genericMimetypeUpdate.done=\n\tFinished updating mimetypes.
+patch.genericMimetypeUpdate.doneReindex=\n\tFinished updating mimetypes.  Selective reindexing was disabled; a reindex is required to search for the new mimetype(s).
+
 # Individual patch messages
 
 patch.noOpPatch.description=A placeholder patch; usually marks a superceded patch.
@@ -243,8 +249,9 @@ patch.createSiteStore.result=Created the AVM site data store.
 patch.sitePermissionRefactorPatch.description=Create permission groups for sites.
 patch.sitePermissionRefactorPatch.result=Groups have been created for all sites and user's allocated accordingly.
 
-patch.migrateVersionStore.description=Migrate from lightWeightVersionStore to version2Store
-patch.migrateVersionStore.result=Migrated version store. Created {0} version histories
+patch.migrateVersionStore.description=Version Store migration (from lightWeightVersionStore to version2Store)
+patch.migrateVersionStore.incomplete=Version Store migration incomplete.
+patch.migrateVersionStore.done=Version Store migration completed.
 
 patch.inviteEmailTemplate.description=Adds invite email template to invite space
 
@@ -334,3 +341,4 @@ patch.fixAuthoritiesCrcValues.result=Fixed CRC32 values for UTF-8 encoding for {
 patch.fixAuthoritiesCrcValues.fixed=Updated CRC32 values for authority ID {0}, authority ''{1}'': {2} -> {3}.
 patch.fixAuthoritiesCrcValues.unableToChange=Failed to update the CRC32 value for authority ID {0}: \n   Authority: {1} \n   authority CRC old: {2} \n   authority CRC new: {3} \n   Error: {4}   
 
+patch.updateMimetypes1.description=Fix mimetypes for Excel and Powerpoint.
diff --git a/config/alfresco/messages/version-service.properties b/config/alfresco/messages/version-service.properties
index d253d676a1..26f8bd441b 100644
--- a/config/alfresco/messages/version-service.properties
+++ b/config/alfresco/messages/version-service.properties
@@ -9,11 +9,11 @@ version_service.err_revert_mismatch=The version provided to revert to does not c
 
 
 version_service.migration.patch.noop=Nothing to do (no version histories found in old version store)
-version_service.migration.patch.complete=Completed migration of {0} (out of {1}) old version histories (to new version store) in {2} secs
-version_service.migration.patch.warn.skip1=Skipped migration of {0} old version histories (migrate failed)
+
+version_service.migration.patch.complete=Completed migration of {0} (out of {1}) of old version histories (to new version store) in {2} secs
+version_service.migration.patch.warn.skip1=Skipped migration of {0} (out of {1}) batches of old version histories (migrate incomplete) in {2} secs
 version_service.migration.patch.warn.skip2=Skipped migration of {0} old version histories (already migrated)
 
-version_service.migration.delete.progress=\t\tBackground deletion of migrated version histories (from old version store) {0}% complete, estimated complete at {1}
-version_service.migration.delete.complete=Completed background deletion of {0} migrated version histories (from old version store) in {1} secs
-version_service.migration.delete.warn.skip1=Skipped background deletion of {0} old version histories (delete failed)
-version_service.migration.delete.warn.skip2=Skipped background deletion of {0} old version histories (not migrated)
\ No newline at end of file
+version_service.migration.delete.complete=Completed background deletion of {0} (out of {1}) migrated version histories (from old version store) in {2} secs
+version_service.migration.delete.warn.skip1=Skipped background deletion of {0} (out of {1}) batches old version histories (delete incomplete) in {2} secs
+version_service.migration.delete.warn.skip2=Skipped background deletion of {0} old version histories (not migrated)
diff --git a/config/alfresco/patch/patch-services-context.xml b/config/alfresco/patch/patch-services-context.xml
index 8a7e918900..9498a9ec58 100644
--- a/config/alfresco/patch/patch-services-context.xml
+++ b/config/alfresco/patch/patch-services-context.xml
@@ -1357,7 +1357,7 @@
         </property>
     </bean>
     
-    <bean id="patch.migrateVersionStore" class="org.alfresco.repo.admin.patch.impl.MigrateVersionStorePatch" parent="basePatch" >
+    <bean id="patch.migrateVersionStore" class="org.alfresco.repo.admin.patch.impl.MigrateVersionStorePatch" parent="basePatch">
         <property name="id"><value>patch.migrateVersionStore</value></property>
         <property name="description"><value>patch.migrateVersionStore.description</value></property>
         <property name="fixesFromSchema"><value>0</value></property>
@@ -1365,16 +1365,22 @@
         <property name="targetSchema"><value>130</value></property>
         <!-- helper beans/properties -->
         <property name="versionMigrator">
-            <ref bean="versionMigrator" />
+            <ref bean="versionMigrator"/>
         </property>
         <property name="tenantService">
-            <ref bean="tenantService" />
+            <ref bean="tenantService"/>
         </property>
         <property name="importerBootstrap">
-            <ref bean="version2Bootstrap" />
+            <ref bean="version2Bootstrap"/>
+        </property>
+        <property name="threadCount">
+            <value>${version.store.migrateVersionStore.threadCount}</value>
+        </property>
+        <property name="batchSize">
+            <value>${version.store.migrateVersionStore.batchSize}</value>
         </property>
     </bean>
-            
+    
     <bean id="patch.inviteEmailTemplate" class="org.alfresco.repo.admin.patch.impl.GenericBootstrapPatch" parent="basePatch" >
         <property name="id"><value>patch.inviteEmailTemplate</value></property>
         <property name="description"><value>patch.inviteEmailTemplate.description</value></property>
@@ -1993,6 +1999,9 @@
         <property name="ruleService">
             <ref bean="ruleService" />
         </property>
+        <property name="dialect">
+            <ref bean="dialect" />
+        </property>
     </bean>
     
     <bean id="patch.redeployNominatedInvitationProcessWithPropsForShare" class="org.alfresco.repo.admin.patch.impl.GenericWorkflowPatch" parent="basePatch" >
@@ -2189,4 +2198,39 @@
         </property>
     </bean>
     
+    <bean id="patch.updateMimetypes1" class="org.alfresco.repo.admin.patch.impl.GenericMimetypeRenamePatch" parent="basePatch" >
+        <property name="id"><value>patch.updateMimetypes1</value></property>
+        <property name="description"><value>patch.updateMimetypes1.description</value></property>
+        <property name="fixesFromSchema"><value>0</value></property>
+        <property name="fixesToSchema"><value>4101</value></property>
+        <property name="targetSchema"><value>4102</value></property>
+        <property name="applyToTenants"><value>false</value></property>
+        <property name="dependsOn">
+            <list>
+                <ref bean="patch.db-V3.2-ContentTables2"/>
+            </list>
+        </property>
+        <property name="mimetypeDAO">
+            <ref bean="mimetypeDAO"/>
+        </property>
+        <property name="patchDAO">
+            <ref bean="patchDAO"/>
+        </property>
+        <property name="nodeService">
+            <ref bean="nodeService" />
+        </property>
+        <property name="indexerAndSearcher">
+            <ref bean="indexerAndSearcherFactory"/>
+        </property>
+        <property name="mimetypeMappings">
+            <map>
+                <entry key="application/vnd.excel" value="application/vnd.ms-excel"></entry>
+                <entry key="application/vnd.powerpoint" value="application/vnd.ms-powerpoint"></entry>
+            </map>
+        </property>
+        <property name="reindex">
+            <value>true</value>
+        </property>
+    </bean>
+    
 </beans>
\ No newline at end of file
diff --git a/config/alfresco/public-services-security-context.xml b/config/alfresco/public-services-security-context.xml
index 7469ebe4ed..26ae0c5e69 100644
--- a/config/alfresco/public-services-security-context.xml
+++ b/config/alfresco/public-services-security-context.xml
@@ -402,6 +402,7 @@
                org.alfresco.service.cmr.model.FileFolderService.list=ACL_NODE.0.sys:base.ReadChildren,AFTER_ACL_NODE.sys:base.ReadProperties
                org.alfresco.service.cmr.model.FileFolderService.listFiles=ACL_NODE.0.sys:base.ReadChildren,AFTER_ACL_NODE.sys:base.ReadProperties
                org.alfresco.service.cmr.model.FileFolderService.listFolders=ACL_NODE.0.sys:base.ReadChildren,AFTER_ACL_NODE.sys:base.ReadProperties
+               org.alfresco.service.cmr.model.FileFolderService.listDeepFolders=ACL_NODE.0.sys:base.ReadChildren,AFTER_ACL_NODE.sys:base.ReadProperties
                org.alfresco.service.cmr.model.FileFolderService.search=ACL_NODE.0.sys:base.ReadChildren,AFTER_ACL_NODE.sys:base.Read
                org.alfresco.service.cmr.model.FileFolderService.searchSimple=ACL_NODE.0.sys:base.ReadChildren,AFTER_ACL_NODE.sys:base.Read
                org.alfresco.service.cmr.model.FileFolderService.rename=ACL_ALLOW,AFTER_ACL_NODE.sys:base.WriteProperties
@@ -409,7 +410,6 @@
                org.alfresco.service.cmr.model.FileFolderService.copy=ACL_NODE.0.sys:base.ReadProperties,ACL_NODE.1.sys:base.CreateChildren
                org.alfresco.service.cmr.model.FileFolderService.create=ACL_NODE.0.sys:base.CreateChildren
                org.alfresco.service.cmr.model.FileFolderService.delete=ACL_NODE.0.sys:base.DeleteNode
-               org.alfresco.service.cmr.model.FileFolderService.makeFolders=ACL_METHOD.ROLE_ADMINISTRATOR
                org.alfresco.service.cmr.model.FileFolderService.getNamePath=ACL_NODE.1.sys:base.ReadProperties
                org.alfresco.service.cmr.model.FileFolderService.resolveNamePath=ACL_ALLOW,AFTER_ACL_NODE.sys:base.ReadProperties
                org.alfresco.service.cmr.model.FileFolderService.getFileInfo=ACL_NODE.0.sys:base.ReadProperties
diff --git a/config/alfresco/repository.properties b/config/alfresco/repository.properties
index 34937f4733..e7a65fbe9a 100644
--- a/config/alfresco/repository.properties
+++ b/config/alfresco/repository.properties
@@ -57,6 +57,12 @@ index.tracking.disableInTransactionIndexing=false
 # Use -1 to disable purging.  This can be switched on at any stage.
 index.tracking.minRecordPurgeAgeDays=30
 
+# Reindexing of missing content is by default 'never' carried out.
+# The cron expression below can be changed to control the timing of this reindexing.
+# Users of Enterprise Alfresco can configure this cron expression via JMX without a server restart.
+# Note that if alfresco.cluster.name is not set, then reindexing will not occur.
+index.reindexMissingContent.cronExpression=* * * * * ? 2099
+
 # Change the failure behaviour of the configuration checker
 system.bootstrap.config_check.strict=true
 
@@ -317,6 +323,14 @@ spaces.outbound_transfer_records.childname=app:outbound_transfer_records
 # ADM VersionStore Configuration
 version.store.deprecated.lightWeightVersionStore=workspace://lightWeightVersionStore
 version.store.version2Store=workspace://version2Store
+
+version.store.migrateVersionStore.threadCount=3
+version.store.migrateVersionStore.batchSize=1
+
+version.store.migrateCleanupJob.threadCount=3
+version.store.migrateCleanupJob.batchSize=1
+
+
 # WARNING: For non-production testing only !!! Do not change (to avoid version store issues, including possible mismatch). Should be false since lightWeightVersionStore is deprecated.
 version.store.onlyUseDeprecatedV1=false
 
diff --git a/config/alfresco/scheduled-jobs-context.xml b/config/alfresco/scheduled-jobs-context.xml
index 0477f672c5..c21bcee57f 100644
--- a/config/alfresco/scheduled-jobs-context.xml
+++ b/config/alfresco/scheduled-jobs-context.xml
@@ -420,10 +420,19 @@
                <property name="jobDataAsMap">
                    <map>
                         <entry key="versionMigrator">
-                            <ref bean="versionMigrator" />
+                            <ref bean="versionMigrator"/>
                         </entry>
                         <entry key="tenantAdminService">
-                            <ref bean="tenantAdminService" />
+                            <ref bean="tenantAdminService"/>
+                        </entry>
+                        <entry key="onlyUseDeprecatedV1">
+                            <value>${version.store.onlyUseDeprecatedV1}</value>
+                        </entry>
+                        <entry key="batchSize">
+                            <value>${version.store.migrateCleanupJob.batchSize}</value>
+                        </entry>
+                        <entry key="threadCount">
+                            <value>${version.store.migrateCleanupJob.threadCount}</value>
                         </entry>
                    </map>
                </property>
diff --git a/config/alfresco/version.properties b/config/alfresco/version.properties
index 4062b96186..c203e65e85 100644
--- a/config/alfresco/version.properties
+++ b/config/alfresco/version.properties
@@ -19,4 +19,4 @@ version.build=@build-number@
 
 # Schema number
 
-version.schema=4101
+version.schema=4102
diff --git a/source/java/org/alfresco/cmis/search/CMISFTSQueryParser.java b/source/java/org/alfresco/cmis/search/CMISFTSQueryParser.java
new file mode 100644
index 0000000000..f3b673e673
--- /dev/null
+++ b/source/java/org/alfresco/cmis/search/CMISFTSQueryParser.java
@@ -0,0 +1,414 @@
+/*
+ * Copyright (C) 2005-2010 Alfresco Software Limited.
+ *
+ * This file is part of Alfresco
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.alfresco.cmis.search;
+
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.alfresco.repo.search.impl.lucene.AnalysisMode;
+import org.alfresco.repo.search.impl.parsers.CMIS_FTSLexer;
+import org.alfresco.repo.search.impl.parsers.CMIS_FTSParser;
+import org.alfresco.repo.search.impl.parsers.FTSQueryException;
+import org.alfresco.repo.search.impl.querymodel.Argument;
+import org.alfresco.repo.search.impl.querymodel.Column;
+import org.alfresco.repo.search.impl.querymodel.Constraint;
+import org.alfresco.repo.search.impl.querymodel.Function;
+import org.alfresco.repo.search.impl.querymodel.FunctionEvaluationContext;
+import org.alfresco.repo.search.impl.querymodel.LiteralArgument;
+import org.alfresco.repo.search.impl.querymodel.QueryModelFactory;
+import org.alfresco.repo.search.impl.querymodel.Selector;
+import org.alfresco.repo.search.impl.querymodel.Constraint.Occur;
+import org.alfresco.repo.search.impl.querymodel.QueryOptions.Connective;
+import org.alfresco.repo.search.impl.querymodel.impl.functions.FTSPhrase;
+import org.alfresco.repo.search.impl.querymodel.impl.functions.FTSTerm;
+import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
+import org.antlr.runtime.ANTLRStringStream;
+import org.antlr.runtime.CharStream;
+import org.antlr.runtime.CommonTokenStream;
+import org.antlr.runtime.RecognitionException;
+import org.antlr.runtime.Token;
+import org.antlr.runtime.tree.CommonTree;
+import org.antlr.runtime.tree.Tree;
+
+public class CMISFTSQueryParser
+{
+    static public Constraint buildFTS(String ftsExpression, QueryModelFactory factory, FunctionEvaluationContext functionEvaluationContext, Selector selector,
+            Map<String, Column> columnMap, String defaultField)
+    {
+        // TODO: Decode sql escape for '' should do in CMIS layer
+
+        // parse templates to trees ...
+
+        CMIS_FTSParser parser = null;
+        try
+        {
+            CharStream cs = new ANTLRStringStream(ftsExpression);
+            CMIS_FTSLexer lexer = new CMIS_FTSLexer(cs);
+            CommonTokenStream tokens = new CommonTokenStream(lexer);
+            parser = new CMIS_FTSParser(tokens);
+            CommonTree ftsNode = (CommonTree) parser.cmisFtsQuery().getTree();
+            return buildFTSConnective(ftsNode, factory, functionEvaluationContext, selector, columnMap, defaultField);
+        }
+        catch (RecognitionException e)
+        {
+            if (parser != null)
+            {
+                String[] tokenNames = parser.getTokenNames();
+                String hdr = parser.getErrorHeader(e);
+                String msg = parser.getErrorMessage(e, tokenNames);
+                throw new FTSQueryException(hdr + "\n" + msg, e);
+            }
+            return null;
+        }
+
+    }
+
+    static private Constraint buildFTSConnective(CommonTree node, QueryModelFactory factory, FunctionEvaluationContext functionEvaluationContext,
+            Selector selector, Map<String, Column> columnMap, String defaultField)
+    {
+        Connective connective;
+        switch (node.getType())
+        {
+        case CMIS_FTSParser.DISJUNCTION:
+            connective = Connective.OR;
+            break;
+        case CMIS_FTSParser.CONJUNCTION:
+            connective = Connective.AND;
+            break;
+        default:
+            throw new FTSQueryException("Invalid connective ..." + node.getText());
+        }
+
+        List<Constraint> constraints = new ArrayList<Constraint>(node.getChildCount());
+        CommonTree testNode;
+        for (int i = 0; i < node.getChildCount(); i++)
+        {
+            CommonTree subNode = (CommonTree) node.getChild(i);
+            Constraint constraint;
+            switch (subNode.getType())
+            {
+            case CMIS_FTSParser.DISJUNCTION:
+            case CMIS_FTSParser.CONJUNCTION:
+                constraint = buildFTSConnective(subNode, factory, functionEvaluationContext, selector, columnMap, defaultField);
+                break;
+            case CMIS_FTSParser.DEFAULT:
+                testNode = (CommonTree) subNode.getChild(0);
+                constraint = buildFTSTest(testNode, factory, functionEvaluationContext, selector, columnMap, defaultField);
+                constraint.setOccur(Occur.DEFAULT);
+                break;
+            case CMIS_FTSParser.EXCLUDE:
+                testNode = (CommonTree) subNode.getChild(0);
+                constraint = buildFTSTest(testNode, factory, functionEvaluationContext, selector, columnMap, defaultField);
+                constraint.setOccur(Occur.EXCLUDE);
+                break;
+
+            default:
+                throw new FTSQueryException("Unsupported FTS option " + subNode.getText());
+            }
+            constraints.add(constraint);
+        }
+        if (constraints.size() == 1)
+        {
+            return constraints.get(0);
+        }
+        else
+        {
+            if (connective == Connective.OR)
+            {
+                return factory.createDisjunction(constraints);
+            }
+            else
+            {
+                return factory.createConjunction(constraints);
+            }
+        }
+    }
+
+    static private Constraint buildFTSTest(CommonTree argNode, QueryModelFactory factory, FunctionEvaluationContext functionEvaluationContext,
+            Selector selector, Map<String, Column> columnMap, String defaultField)
+    {
+        CommonTree testNode = argNode;
+        switch (testNode.getType())
+        {
+        case CMIS_FTSParser.DISJUNCTION:
+        case CMIS_FTSParser.CONJUNCTION:
+            return buildFTSConnective(testNode, factory, functionEvaluationContext, selector, columnMap, defaultField);
+        case CMIS_FTSParser.TERM:
+            return buildTerm(testNode, factory, functionEvaluationContext, selector, columnMap);
+        case CMIS_FTSParser.PHRASE:
+            return buildPhrase(testNode, factory, functionEvaluationContext, selector, columnMap);
+        default:
+            throw new FTSQueryException("Unsupported FTS option " + testNode.getText());
+        }
+    }
+
+    static private Constraint buildPhrase(CommonTree testNode, QueryModelFactory factory,
+            FunctionEvaluationContext functionEvaluationContext, Selector selector, Map<String, Column> columnMap)
+    {
+        String functionName = FTSPhrase.NAME;
+        Function function = factory.getFunction(functionName);
+        Map<String, Argument> functionArguments = new LinkedHashMap<String, Argument>();
+        LiteralArgument larg = factory.createLiteralArgument(FTSPhrase.ARG_PHRASE, DataTypeDefinition.TEXT, getText(testNode.getChild(0)));
+        functionArguments.put(larg.getName(), larg);
+        return factory.createFunctionalConstraint(function, functionArguments);
+    }
+
+    static private Constraint buildTerm(CommonTree testNode, QueryModelFactory factory, FunctionEvaluationContext functionEvaluationContext,
+            Selector selector, Map<String, Column> columnMap)
+    {
+        String functionName = FTSTerm.NAME;
+        Function function = factory.getFunction(functionName);
+        Map<String, Argument> functionArguments = new LinkedHashMap<String, Argument>();
+        LiteralArgument larg = factory.createLiteralArgument(FTSTerm.ARG_TERM, DataTypeDefinition.TEXT, getText(testNode.getChild(0)));
+        functionArguments.put(larg.getName(), larg);
+        larg = factory.createLiteralArgument(FTSTerm.ARG_TOKENISATION_MODE, DataTypeDefinition.ANY, AnalysisMode.DEFAULT);
+        functionArguments.put(larg.getName(), larg);
+        return factory.createFunctionalConstraint(function, functionArguments);
+    }
+
+ 
+    static class DisjunctionToken implements Token
+    {
+
+        public int getChannel()
+        {
+            return 0;
+        }
+
+        public int getCharPositionInLine()
+        {
+            return 0;
+        }
+
+        public CharStream getInputStream()
+        {
+            return null;
+        }
+
+        public int getLine()
+        {
+            return 0;
+        }
+
+        public String getText()
+        {
+            return null;
+        }
+
+        public int getTokenIndex()
+        {
+            return 0;
+        }
+
+        public int getType()
+        {
+            return CMIS_FTSParser.DISJUNCTION;
+        }
+
+        public void setChannel(int arg0)
+        {
+            
+
+        }
+
+        public void setCharPositionInLine(int arg0)
+        {
+          
+
+        }
+
+        public void setInputStream(CharStream arg0)
+        {
+        
+        }
+
+        public void setLine(int arg0)
+        {
+         
+
+        }
+
+        public void setText(String arg0)
+        {
+           
+
+        }
+
+        public void setTokenIndex(int arg0)
+        {
+          
+        }
+
+        public void setType(int arg0)
+        {
+           
+        }
+
+    }
+
+    static class DefaultToken implements Token
+    {
+
+        public int getChannel()
+        {
+           
+            return 0;
+        }
+
+        public int getCharPositionInLine()
+        {
+            return 0;
+        }
+
+        public CharStream getInputStream()
+        {
+            return null;
+        }
+
+        public int getLine()
+        {
+            return 0;
+        }
+
+        public String getText()
+        {
+            return null;
+        }
+
+        public int getTokenIndex()
+        {
+            return 0;
+        }
+
+        public int getType()
+        {
+            return CMIS_FTSParser.DEFAULT;
+        }
+
+        public void setChannel(int arg0)
+        {
+           
+        }
+
+        public void setCharPositionInLine(int arg0)
+        {
+           
+        }
+
+        public void setInputStream(CharStream arg0)
+        {
+           
+        }
+
+        public void setLine(int arg0)
+        {
+            
+        }
+
+        public void setText(String arg0)
+        {
+           
+        }
+
+        public void setTokenIndex(int arg0)
+        {
+            
+        }
+
+        public void setType(int arg0)
+        {
+           
+        }
+
+    }
+
+    static private String getText(Tree node)
+    {
+        String text = node.getText();
+        int index;
+        switch (node.getType())
+        {
+        case CMIS_FTSParser.FTSWORD:
+            index = text.indexOf('\\');
+            if (index == -1)
+            {
+                return text;
+            }
+            else
+            {
+                return unescape(text);
+            }
+        case CMIS_FTSParser.FTSPHRASE:
+            String phrase = text.substring(1, text.length() - 1);
+            index = phrase.indexOf('\\');
+            if (index == -1)
+            {
+                return phrase;
+            }
+            else
+            {
+                return unescape(phrase);
+            }
+        default:
+            return text;
+        }
+    }
+
+    static private String unescape(String string)
+    {
+        StringBuilder builder = new StringBuilder(string.length());
+        boolean lastWasEscape = false;
+
+        for (int i = 0; i < string.length(); i++)
+        {
+            char c = string.charAt(i);
+            if (lastWasEscape)
+            {
+                if (c == 'u')
+                {
+                    throw new UnsupportedOperationException(string);
+                }
+                else
+                {
+                    builder.append(c);
+                }
+                lastWasEscape = false;
+            }
+            else
+            {
+                if (c == '\\')
+                {
+                    lastWasEscape = true;
+                }
+                else
+                {
+                    builder.append(c);
+                }
+            }
+        }
+        if (lastWasEscape)
+        {
+            throw new FTSQueryException("Escape character at end of string " + string);
+        }
+
+        return builder.toString();
+    }
+}
diff --git a/source/java/org/alfresco/cmis/search/CMISQueryParser.java b/source/java/org/alfresco/cmis/search/CMISQueryParser.java
index 45eb9716af..2f2c49a5c3 100644
--- a/source/java/org/alfresco/cmis/search/CMISQueryParser.java
+++ b/source/java/org/alfresco/cmis/search/CMISQueryParser.java
@@ -447,7 +447,15 @@ public class CMISQueryParser
                     mode = FTSParser.Mode.DEFAULT_DISJUNCTION;
                 }
             }
-            Constraint ftsConstraint = FTSQueryParser.buildFTS(ftsExpression, factory, functionEvaluationContext, selector, columnMap, mode, defaultFieldConnective, null, options.getDefaultFieldName());
+            Constraint ftsConstraint;
+            if (options.getQueryMode() == CMISQueryMode.CMS_STRICT)
+            {
+                ftsConstraint = CMISFTSQueryParser.buildFTS(ftsExpression, factory, functionEvaluationContext, selector, columnMap, options.getDefaultFieldName());
+            }
+            else
+            {
+                ftsConstraint = FTSQueryParser.buildFTS(ftsExpression, factory, functionEvaluationContext, selector, columnMap, mode, defaultFieldConnective, null, options.getDefaultFieldName());
+            }
             ftsConstraint.setBoost(1000.0f);
             hasContains = true;
             return ftsConstraint;
diff --git a/source/java/org/alfresco/cmis/search/QueryTest.java b/source/java/org/alfresco/cmis/search/QueryTest.java
index 05538eeece..2358def643 100644
--- a/source/java/org/alfresco/cmis/search/QueryTest.java
+++ b/source/java/org/alfresco/cmis/search/QueryTest.java
@@ -2486,14 +2486,14 @@ public class QueryTest extends BaseCMISTest
         testOrderBy("SELECT  F.cmis:objectId Meep FROM cmis:folder F ORDER BY Meep ASC", folder_count, false, Order.ASCENDING, CMISQueryMode.CMS_STRICT, "cmis:objectId");
         testOrderBy("SELECT  F.cmis:objectId Meep FROM cmis:folder F ORDER BY Meep DESC", folder_count, false, Order.DESCENDING, CMISQueryMode.CMS_STRICT, "Meep");
 
-        testOrderBy("SELECT SCORE() AS MEEP, cmis:objectId FROM cmis:document where CONTAINS('*') ORDER BY MEEP", file_count, false, Order.ASCENDING, CMISQueryMode.CMS_STRICT,
+        testOrderBy("SELECT SCORE() AS MEEP, cmis:objectId FROM cmis:document where CONTAINS('*') ORDER BY MEEP", file_count, false, Order.ASCENDING, CMISQueryMode.CMS_WITH_ALFRESCO_EXTENSIONS,
                 "MEEP");
-        testOrderBy("SELECT SCORE(), cmis:objectId FROM cmis:document where CONTAINS('*') ORDER BY SEARCH_SCORE", file_count, false, Order.ASCENDING, CMISQueryMode.CMS_STRICT,
+        testOrderBy("SELECT SCORE(), cmis:objectId FROM cmis:document where CONTAINS('*') ORDER BY SEARCH_SCORE", file_count, false, Order.ASCENDING, CMISQueryMode.CMS_WITH_ALFRESCO_EXTENSIONS,
                 "SEARCH_SCORE");
-        testOrderBy("SELECT SCORE() AS MEEP, cmis:objectId FROM cmis:document where CONTAINS('*') ORDER BY MEEP ASC", file_count, false, Order.ASCENDING, CMISQueryMode.CMS_STRICT,
+        testOrderBy("SELECT SCORE() AS MEEP, cmis:objectId FROM cmis:document where CONTAINS('*') ORDER BY MEEP ASC", file_count, false, Order.ASCENDING, CMISQueryMode.CMS_WITH_ALFRESCO_EXTENSIONS,
                 "MEEP");
         testOrderBy("SELECT SCORE() AS MEEP, cmis:objectId FROM cmis:document where CONTAINS('*') ORDER BY MEEP DESC", file_count, false, Order.DESCENDING,
-                CMISQueryMode.CMS_STRICT, "MEEP");
+                CMISQueryMode.CMS_WITH_ALFRESCO_EXTENSIONS, "MEEP");
 
         testOrderBy("SELECT SCORE() AS MEEP, cmis:objectId FROM cmis:folder where CONTAINS('cmis:name:*') ORDER BY MEEP", folder_count, false, Order.ASCENDING,
                 CMISQueryMode.CMS_WITH_ALFRESCO_EXTENSIONS, "MEEP");
@@ -2927,7 +2927,7 @@ public class QueryTest extends BaseCMISTest
         testQuery("SELECT D.*, O.cmis:name FROM CMIS:DOCUMENT AS D JOIN CM:OWNABLE AS O ON D.cmis:objectId = O.cmis:objectId", 1, false, "cmis:objectId", new String(), true,
                 CMISQueryMode.CMS_WITH_ALFRESCO_EXTENSIONS);
         testQuery("SELECT * FROM cmis:document order by cmis:parentId", 10, false, "cmis:objectId", new String(), true, CMISQueryMode.CMS_STRICT);
-        testQuery("SELECT * FROM cmis:document where CONTAINS('cmis:parentId:*')", 10, false, "cmis:objectId", new String(), true, CMISQueryMode.CMS_STRICT);
+        testQuery("SELECT * FROM cmis:document where CONTAINS('cmis:parentId:*')", 10, false, "cmis:objectId", new String(), true, CMISQueryMode.CMS_WITH_ALFRESCO_EXTENSIONS);
     }
 
     public void testExists() throws Exception
@@ -3354,6 +3354,7 @@ public class QueryTest extends BaseCMISTest
 
     public void testFTSConnectives() throws Exception
     {
+        testQuery("SELECT * FROM cmis:document where contains('\\'one\\' OR \\'zebra\\'')", 9, false, "cmis:objectId", new String(), false, CMISQueryMode.CMS_STRICT);
         testQuery("SELECT * FROM cmis:document where contains('\\'one\\' or \\'zebra\\'')", 9, false, "cmis:objectId", new String(), false, CMISQueryMode.CMS_STRICT);
         testQuery("SELECT * FROM cmis:document where contains('\\'one\\' \\'zebra\\'')", 1, false, "cmis:objectId", new String(), false, CMISQueryMode.CMS_STRICT);
         testQuery("SELECT * FROM cmis:document where contains('\\'one\\' and \\'zebra\\'')", 1, false, "cmis:objectId", new String(), false,
@@ -5119,7 +5120,6 @@ public class QueryTest extends BaseCMISTest
 
         // escaping
         testExtendedQuery("SELECT * FROM cmis:folder WHERE CONTAINS('cmis:name:\\'Folder 9\\\\\\'\\'')", 1, false, "cmis:name", new String(), false);
-        testQuery("SELECT * FROM cmis:folder WHERE CONTAINS('cmis:name:\\'Folder 9\\\\\\'\\'')", 1, false, "cmis:name", new String(), true);
 
         // precedence
         testQuery("SELECT * FROM cmis:document WHERE CONTAINS('quick OR brown one')", 1, false, "cmis:name", new String(), false);
@@ -5127,9 +5127,7 @@ public class QueryTest extends BaseCMISTest
         testExtendedQuery("SELECT * FROM cmis:document WHERE CONTAINS('quick OR (brown AND one)')", 1, false, "cmis:name", new String(), false);
         testExtendedQuery("SELECT * FROM cmis:document WHERE CONTAINS('(quick OR brown) AND one')", 0, false, "cmis:name", new String(), false);
         testQuery("SELECT * FROM cmis:document WHERE CONTAINS('quick OR brown OR one')", 2, false, "cmis:name", new String(), false);
-        testQuery("SELECT * FROM cmis:document WHERE CONTAINS('quick OR brown AND one')", 1, false, "cmis:name", new String(), true);
-        testQuery("SELECT * FROM cmis:document WHERE CONTAINS('quick OR (brown AND one)')", 1, false, "cmis:name", new String(), true);
-        testQuery("SELECT * FROM cmis:document WHERE CONTAINS('(quick OR brown) AND one')", 0, false, "cmis:name", new String(), true);
+        testQuery("SELECT * FROM cmis:document WHERE CONTAINS('quick OR brown one')", 1, false, "cmis:name", new String(), false);
     }
 
     public void testOrderableProperties()
diff --git a/source/java/org/alfresco/email/server/handler/AbstractEmailMessageHandler.java b/source/java/org/alfresco/email/server/handler/AbstractEmailMessageHandler.java
index 50dff60e6e..603038ddfd 100644
--- a/source/java/org/alfresco/email/server/handler/AbstractEmailMessageHandler.java
+++ b/source/java/org/alfresco/email/server/handler/AbstractEmailMessageHandler.java
@@ -317,6 +317,8 @@ public abstract class AbstractEmailMessageHandler implements EmailMessageHandler
      */
     protected NodeRef addAttachment(NodeService nodeService, NodeRef folder, NodeRef mainContentNode, String fileName)
     {
+        fileName = getAppropriateNodeName(folder, fileName, ContentModel.ASSOC_CONTAINS);
+        
         if (log.isDebugEnabled())
         {
             log.debug("Adding attachment node (name=" + fileName + ").");
@@ -336,6 +338,35 @@ public abstract class AbstractEmailMessageHandler implements EmailMessageHandler
         return attachmentNode;
     }
     
+    /**
+     * Return unique content name in passed folder based on provided name
+     * 
+     * @param parent parent folder
+     * @param name name of node
+     * @param assocType assocType between parent and child  
+     * @return Original name or name in format {name}({number})
+     */
+    private String getAppropriateNodeName(NodeRef parent, String name, QName assocType)
+    {
+        if (nodeService.getChildByName(parent, assocType, name) != null)
+        {
+            name = name + "(1)";
+            while (nodeService.getChildByName(parent, assocType, name) != null)
+            {
+
+                int index = name.lastIndexOf("(");
+                if ((index > 0) && name.charAt(name.length() - 1) == ')')
+                {
+                    String posibleNumber = name.substring(index + 1, name.length() - 1);
+                    long num = Long.parseLong(posibleNumber) + 1;
+                    name = name.substring(0, index) + "(" + num + ")";
+                }
+
+            }
+        }
+        return name;
+    }
+    
     /**
      * Extracts the attachments from the given message and adds them to the space.  All attachments
      * are linked back to the original node that they are attached to.
diff --git a/source/java/org/alfresco/filesys/avm/AVMDiskDriver.java b/source/java/org/alfresco/filesys/avm/AVMDiskDriver.java
index 1b3738c629..7bab2b1943 100644
--- a/source/java/org/alfresco/filesys/avm/AVMDiskDriver.java
+++ b/source/java/org/alfresco/filesys/avm/AVMDiskDriver.java
@@ -114,6 +114,15 @@ public class AVMDiskDriver extends AlfrescoDiskDriver implements DiskInterface
     
     private static final String ROLE_CONTENT_MANAGER = "ContentManager";
     
+    // File status values used in the file state cache
+    
+    public static final int FileUnknown     = FileStatus.Unknown;
+    public static final int FileNotExist    = FileStatus.NotExist;
+    public static final int FileExists      = FileStatus.FileExists;
+    public static final int DirectoryExists = FileStatus.DirectoryExists;
+    
+    public static final int CustomFileStatus= FileStatus.MaxStatus + 1;
+    
     // Services and helpers
 
     private AVMService m_avmService;
@@ -2376,6 +2385,7 @@ public class AVMDiskDriver extends AlfrescoDiskDriver implements DiskInterface
                     
                     fstate = avmCtx.getStateCache().findFileState( FileName.DOS_SEPERATOR_STR, true);
                     fstate.setExpiryTime( FileState.NoTimeout);
+                    fstate.setFileStatus( DirectoryExists);
                     
                     // Get a list of the available AVM stores
                     
@@ -2609,6 +2619,7 @@ public class AVMDiskDriver extends AlfrescoDiskDriver implements DiskInterface
                     // Create a file state for the store path
                     
                     fstate = avmCtx.getStateCache().findFileState( str.toString(), true);
+                    fstate.setFileStatus( DirectoryExists);
                     
                     // Add a pseudo file for the head version
                     
@@ -2650,6 +2661,7 @@ public class AVMDiskDriver extends AlfrescoDiskDriver implements DiskInterface
                     // Create a file state for the store head folder path
                     
                     fstate = avmCtx.getStateCache().findFileState( str.toString(), true);
+                    fstate.setFileStatus( DirectoryExists);
                     
                     // Add a pseudo file for the data pseudo folder
                     
@@ -2688,6 +2700,7 @@ public class AVMDiskDriver extends AlfrescoDiskDriver implements DiskInterface
                     
                     relPath = str.toString();
                     fstate = avmCtx.getStateCache().findFileState( relPath, true);
+                    fstate.setFileStatus( DirectoryExists);
                     
                     // Add pseudo folders if the list is empty
                     
@@ -2764,6 +2777,7 @@ public class AVMDiskDriver extends AlfrescoDiskDriver implements DiskInterface
                     // Create a file state for the version folder path
                     
                     fstate = avmCtx.getStateCache().findFileState( str.toString(), true);
+                    fstate.setFileStatus( DirectoryExists);
                     
                     // Add a pseudo file for the data pseudo folder
                     
diff --git a/source/java/org/alfresco/filesys/avm/AVMNetworkFile.java b/source/java/org/alfresco/filesys/avm/AVMNetworkFile.java
index 288437c76f..655eede6fd 100644
--- a/source/java/org/alfresco/filesys/avm/AVMNetworkFile.java
+++ b/source/java/org/alfresco/filesys/avm/AVMNetworkFile.java
@@ -385,7 +385,6 @@ public class AVMNetworkFile extends AlfrescoNetworkFile {
             // retry the transaction
 
             final ContentData contentData = m_content.getContentData();
-            contentData.reference();
 
             try
             {
@@ -404,7 +403,6 @@ public class AVMNetworkFile extends AlfrescoNetworkFile {
                 public void afterCommit()
                 {
                     m_content = null;
-                    contentData.deReference();
                 }
             });
         }
diff --git a/source/java/org/alfresco/filesys/repo/ContentNetworkFile.java b/source/java/org/alfresco/filesys/repo/ContentNetworkFile.java
index 735182829a..c150d2963a 100644
--- a/source/java/org/alfresco/filesys/repo/ContentNetworkFile.java
+++ b/source/java/org/alfresco/filesys/repo/ContentNetworkFile.java
@@ -429,7 +429,6 @@ public class ContentNetworkFile extends NodeRefNetworkFile
             // retry the transaction
 
             final ContentData contentData = content.getContentData();
-            contentData.reference();
 
             // Update node properties, but only if the binary has changed (ETHREEOH-1861)
             
@@ -459,7 +458,6 @@ public class ContentNetworkFile extends NodeRefNetworkFile
                 public void afterCommit()
                 {
                     content = null;
-                    contentData.deReference();
                     preUpdateContentURL = null;
                 }
             });
diff --git a/source/java/org/alfresco/repo/action/evaluator/compare/DatePropertyValueComparator.java b/source/java/org/alfresco/repo/action/evaluator/compare/DatePropertyValueComparator.java
index 250246d0e4..d306b53212 100644
--- a/source/java/org/alfresco/repo/action/evaluator/compare/DatePropertyValueComparator.java
+++ b/source/java/org/alfresco/repo/action/evaluator/compare/DatePropertyValueComparator.java
@@ -21,9 +21,11 @@ package org.alfresco.repo.action.evaluator.compare;
 import java.io.Serializable;
 import java.util.Date;
 
+import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.repo.action.evaluator.ComparePropertyValueEvaluator;
 import org.alfresco.service.cmr.action.ActionServiceException;
 import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
+import org.alfresco.util.ISO8601DateFormat;
 
 /**
  * Date property value comparator
@@ -50,8 +52,8 @@ public class DatePropertyValueComparator implements PropertyValueComparator
             operation = ComparePropertyValueOperation.EQUALS;
         }
         
-        Date propertyDate = (Date)propertyValue;
-        Date compareDate = (Date)compareValue;
+        Date propertyDate = getDate(propertyValue);
+        Date compareDate = getDate(compareValue);
         
         switch (operation)
         {
@@ -92,7 +94,19 @@ public class DatePropertyValueComparator implements PropertyValueComparator
         return result;
     }
 
-    /**
+    private Date getDate(Serializable value) {
+        if(value instanceof Date)
+        {
+        	return (Date) value;
+        } 
+        else if(value instanceof String)
+        {
+        	return ISO8601DateFormat.parse((String) value);
+        } 
+    	throw new AlfrescoRuntimeException("Parameter 'compareValue' must be of type java.util.Date!");
+	}
+
+	/**
      * @see org.alfresco.repo.action.evaluator.compare.PropertyValueComparator#registerComparator(org.alfresco.repo.action.evaluator.ComparePropertyValueEvaluator)
      */
     public void registerComparator(ComparePropertyValueEvaluator evaluator)
diff --git a/source/java/org/alfresco/repo/admin/patch/impl/FixAuthoritiesCrcValuesPatch.java b/source/java/org/alfresco/repo/admin/patch/impl/FixAuthoritiesCrcValuesPatch.java
index dcddfe4f32..c025366855 100644
--- a/source/java/org/alfresco/repo/admin/patch/impl/FixAuthoritiesCrcValuesPatch.java
+++ b/source/java/org/alfresco/repo/admin/patch/impl/FixAuthoritiesCrcValuesPatch.java
@@ -200,7 +200,7 @@ public class FixAuthoritiesCrcValuesPatch extends AbstractPatch
                         return;
                     }
                     // Get the old CRCs
-                    long oldCrc = authority.getCrc();
+                    Long oldCrc = authority.getCrc();
                     String authorityName = authority.getAuthority();
                     
                     // Update the CRCs
diff --git a/source/java/org/alfresco/repo/admin/patch/impl/FixNameCrcValuesPatch.java b/source/java/org/alfresco/repo/admin/patch/impl/FixNameCrcValuesPatch.java
index 4c70dee1e8..a3b35358ba 100644
--- a/source/java/org/alfresco/repo/admin/patch/impl/FixNameCrcValuesPatch.java
+++ b/source/java/org/alfresco/repo/admin/patch/impl/FixNameCrcValuesPatch.java
@@ -25,9 +25,10 @@ import java.io.UnsupportedEncodingException;
 import java.nio.ByteBuffer;
 import java.nio.channels.FileChannel;
 import java.sql.Savepoint;
-import java.util.ArrayList;
+import java.util.AbstractCollection;
+import java.util.Collection;
 import java.util.Date;
-import java.util.List;
+import java.util.Iterator;
 import java.util.zip.CRC32;
 
 import org.alfresco.model.ContentModel;
@@ -53,8 +54,9 @@ import org.hibernate.ScrollMode;
 import org.hibernate.ScrollableResults;
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
+import org.hibernate.dialect.Dialect;
+import org.hibernate.dialect.MySQLDialect;
 import org.hibernate.type.LongType;
-import org.hibernate.type.StringType;
 import org.springframework.extensions.surf.util.I18NUtil;
 import org.springframework.orm.hibernate3.HibernateCallback;
 import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
@@ -77,6 +79,7 @@ public class FixNameCrcValuesPatch extends AbstractPatch
     private QNameDAO qnameDAO;
     private ControlDAO controlDAO;
     private RuleService ruleService;
+    private Dialect dialect;
     
     private static Log progress_logger = LogFactory.getLog(PatchExecuter.class);
     
@@ -120,6 +123,11 @@ public class FixNameCrcValuesPatch extends AbstractPatch
     {
         this.ruleService = ruleService;
     }
+    
+    public void setDialect(Dialect dialect)
+    {
+        this.dialect = dialect;
+    }
 
     @Override
     protected void checkProperties()
@@ -193,7 +201,7 @@ public class FixNameCrcValuesPatch extends AbstractPatch
             BatchProcessor<Long> batchProcessor = new BatchProcessor<Long>(
                     "FixNameCrcValuesPatch",
                     transactionService.getRetryingTransactionHelper(),
-                    findMismatchedCrcs(),
+                    getChildAssocIdCollection(),
                     2, 20,
                     applicationEventPublisher,
                     logger, 1000);
@@ -287,93 +295,99 @@ public class FixNameCrcValuesPatch extends AbstractPatch
             return msg;
         }
         
-        private List<Long> findMismatchedCrcs() throws Exception
+        private Collection<Long> getChildAssocIdCollection() throws Exception
         {
-            final Long qnameId = qnameDAO.getOrCreateQName(ContentModel.PROP_NAME).getFirst();
-            
-            final List<Long> childAssocIds = new ArrayList<Long>(1000);
-            HibernateCallback callback = new HibernateCallback()
+            HibernateCallback<ScrollableResults> callback = new HibernateCallback<ScrollableResults>()
             {
-                public Object doInHibernate(Session session)
+                public ScrollableResults doInHibernate(Session session)
                 {
                     SQLQuery query = session
                             .createSQLQuery(
-                                    " SELECT " +
-                                    "    ca.id AS child_assoc_id," +
-                                    "    ca.child_node_name_crc AS child_assoc_crc," +
-                                    "    np.string_value AS node_name," +
-                                    "    n.uuid as node_uuid," +
-                                    "    ca.qname_crc AS qname_crc," +
-                                    "    ca.qname_ns_id AS qname_ns_id," +
-                                    "    ca.qname_localname AS qname_localname" +
-                                    " FROM" +
-                                    "    alf_child_assoc ca" +
-                                    "    JOIN alf_node n ON (ca.child_node_id = n.id)" +
-                                    "    LEFT OUTER JOIN alf_node_properties np on (np.node_id = n.id AND np.qname_id = :qnameId)" +
-                                    "");
-                    query.setLong("qnameId", qnameId);
+                                    "SELECT ca.id AS child_assoc_id FROM alf_child_assoc ca");
+
+                    // For MySQL databases we must set this unusual fetch size to force result set paging. See
+                    // http://dev.mysql.com/doc/refman/5.0/en/connector-j-reference-implementation-notes.html
+                    if (dialect instanceof MySQLDialect)
+                    {
+                        query.setFetchSize(Integer.MIN_VALUE);
+                    }
                     query.addScalar("child_assoc_id", new LongType());
-                    query.addScalar("child_assoc_crc", new LongType());
-                    query.addScalar("node_name", new StringType());
-                    query.addScalar("node_uuid", new StringType());
-                    query.addScalar("qname_crc", new LongType());
-                    query.addScalar("qname_ns_id", new LongType());
-                    query.addScalar("qname_localname", new StringType());
                     return query.scroll(ScrollMode.FORWARD_ONLY);
                 }
             };
-            ScrollableResults rs = null;
+            final ScrollableResults rs;
             try
             {
-                rs = (ScrollableResults) getHibernateTemplate().execute(callback);
-                while (rs.next())
+                final int sizeEstimate = getHibernateTemplate().execute(new HibernateCallback<Integer>()
                 {
-                    // Compute child name crc
-                    Long assocId = (Long) rs.get(0);
-                    Long dbChildCrc = (Long) rs.get(1);
-                    String name = (String) rs.get(2);
-                    String uuid = (String) rs.get(3);
-                    long utf8ChildCrc;
-                    if (name != null)
+                    public Integer doInHibernate(Session session)
                     {
-                        utf8ChildCrc = getCrc(name);
+                        SQLQuery query = session.createSQLQuery("SELECT COUNT(*) FROM alf_child_assoc");
+                        return ((Number) query.uniqueResult()).intValue();
                     }
-                    else
+                });
+                
+                rs = getHibernateTemplate().execute(callback);                
+                return new AbstractCollection<Long>()
+                {
+                    @Override
+                    public Iterator<Long> iterator()
                     {
-                        utf8ChildCrc = getCrc(uuid);
+                        return new Iterator<Long>(){
+
+                            private Long next = fetchNext();
+
+                            private Long fetchNext()
+                            {
+                                Long next;
+                                if (rs.next())
+                                {
+                                    next = rs.getLong(0);
+                                }
+                                else
+                                {
+                                    next = null;
+                                    rs.close();
+                                }
+                                return next;
+                            }
+
+                            public boolean hasNext()
+                            {
+                                return next != null;
+                            }
+
+                            public Long next()
+                            {
+                                if (!hasNext())
+                                {
+                                    throw new IllegalStateException();
+                                }
+                                Long oldNext = next;
+                                next = fetchNext();
+                                return oldNext;
+                            }
+
+                            public void remove()
+                            {
+                                throw new UnsupportedOperationException();
+                            }};
                     }
 
-                    // Compute qname crc
-                    Long dbQNameCrc = (Long) rs.get(4);
-                    Long namespaceId = (Long) rs.get(5);
-                    String namespace = qnameDAO.getNamespace(namespaceId).getSecond();
-                    String localName = (String) rs.get(6);
-                    QName qname = QName.createQName(namespace, localName);
-                    long utf8QNameCrc = ChildAssocImpl.getCrc(qname);
-
-                    // Check
-                    if (dbChildCrc != null && utf8ChildCrc == dbChildCrc.longValue() && dbQNameCrc != null && utf8QNameCrc == dbQNameCrc.longValue())
+                    @Override
+                    public int size()
                     {
-                        // It is a match, so ignore
-                        continue;
+                        return sizeEstimate;
                     }
-                    childAssocIds.add(assocId);
-                }
+                    
+                };
             }
             catch (Throwable e)
             {
-                logger.error("Failed to query for child name CRCs", e);
-                writeLine("Failed to query for child name CRCs: " + e.getMessage());
-                throw new PatchException("Failed to query for child name CRCs", e);
+                logger.error("Failed to query for child association IDs", e);
+                writeLine("Failed to query for child association IDs: " + e.getMessage());
+                throw new PatchException("Failed to query for child association IDs", e);
             }
-            finally
-            {
-                if (rs != null)
-                {
-                    try { rs.close(); } catch (Throwable e) { writeLine("Failed to close resultset: " + e.getMessage()); }
-                }
-            }
-            return childAssocIds;
         }
         
         /**
diff --git a/source/java/org/alfresco/repo/admin/patch/impl/GenericMimetypeRenamePatch.java b/source/java/org/alfresco/repo/admin/patch/impl/GenericMimetypeRenamePatch.java
new file mode 100644
index 0000000000..fdbb162e1e
--- /dev/null
+++ b/source/java/org/alfresco/repo/admin/patch/impl/GenericMimetypeRenamePatch.java
@@ -0,0 +1,200 @@
+/*
+ * Copyright (C) 2005-2010 Alfresco Software Limited.
+ *
+ * This file is part of Alfresco
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.alfresco.repo.admin.patch.impl;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.alfresco.error.AlfrescoRuntimeException;
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.admin.patch.AbstractPatch;
+import org.alfresco.repo.domain.mimetype.MimetypeDAO;
+import org.alfresco.repo.domain.patch.PatchDAO;
+import org.alfresco.repo.search.Indexer;
+import org.alfresco.repo.search.IndexerAndSearcher;
+import org.alfresco.repo.search.impl.lucene.LuceneQueryParser;
+import org.alfresco.service.cmr.repository.StoreRef;
+import org.alfresco.service.cmr.search.ResultSet;
+import org.alfresco.service.cmr.search.ResultSetRow;
+import org.alfresco.service.cmr.search.SearchParameters;
+import org.alfresco.service.cmr.search.SearchService;
+import org.alfresco.util.Pair;
+import org.springframework.extensions.surf.util.I18NUtil;
+
+/**
+ * A patch to update the value of a Mimetype.
+ * <p>
+ * This patch will only work fully if the content URL data has been fully normalized.
+ * It supports renaming to existing, currently-used mimetypes as well as to
+ * mimetypes that have not been used before.
+ * 
+ * @author Derek Hulley
+ * @since 3.3 SP1
+ */
+public class GenericMimetypeRenamePatch extends AbstractPatch
+{
+    private static final String MSG_START = "patch.genericMimetypeUpdate.start";
+    private static final String MSG_UPDATED = "patch.genericMimetypeUpdate.updated";
+    private static final String MSG_INDEXED = "patch.genericMimetypeUpdate.indexed";
+    private static final String MSG_DONE = "patch.genericMimetypeUpdate.done";
+    private static final String MSG_DONE_REINDEX = "patch.genericMimetypeUpdate.doneReindex";
+
+    /* Helper DAOs */
+    private IndexerAndSearcher indexerAndSearcher;
+    private MimetypeDAO mimetypeDAO;
+    private PatchDAO patchDAO;
+    
+    /** Mimetype mappings */
+    private Map<String, String> mimetypeMappings;
+    private boolean reindex;
+    
+    public void setIndexerAndSearcher(IndexerAndSearcher indexerAndSearcher)
+    {
+        this.indexerAndSearcher = indexerAndSearcher;
+    }
+
+    public void setMimetypeDAO(MimetypeDAO mimetypeDAO)
+    {
+        this.mimetypeDAO = mimetypeDAO;
+    }
+
+    public void setPatchDAO(PatchDAO patchDAO)
+    {
+        this.patchDAO = patchDAO;
+    }
+
+    public void setMimetypeMappings(Map<String, String> mimetypeMappings)
+    {
+        this.mimetypeMappings = mimetypeMappings;
+    }
+
+    public void setReindex(boolean reindex)
+    {
+        this.reindex = reindex;
+    }
+
+    protected void checkProperties()
+    {
+        super.checkProperties();
+        checkPropertyNotNull(indexerAndSearcher, "indexerAndSearcher");
+        checkPropertyNotNull(mimetypeDAO, "mimetypeDAO");
+        checkPropertyNotNull(patchDAO, "patchDAO");
+        checkPropertyNotNull(mimetypeMappings, "mimetypeMappings");
+    }
+
+    @Override
+    protected String applyInternal() throws Exception
+    {
+        // First get all the available stores that we might want to reindex
+        List<StoreRef> storeRefsList = nodeService.getStores();
+        Set<StoreRef> storeRefs = new HashSet<StoreRef>();
+        for (StoreRef storeRef : storeRefsList)
+        {
+            // We want workspace://SpacesStore or related MT stores
+            if (storeRef.getIdentifier().endsWith("SpacesStore"))
+            {
+                storeRefs.add(storeRef);
+            }
+        }
+        
+        StringBuilder result = new StringBuilder(I18NUtil.getMessage(MSG_START));
+        for (Map.Entry<String, String> element : mimetypeMappings.entrySet())
+        {
+            String oldMimetype = element.getKey();
+            String newMimetype = element.getValue();
+            
+            // First check if the mimetype is used at all
+            Pair<Long, String> oldMimetypePair = mimetypeDAO.getMimetype(oldMimetype);
+            if (oldMimetypePair == null)
+            {
+                // Not used
+                continue;
+            }
+            
+            // Check if the new mimetype exists
+            Pair<Long, String> newMimetypePair = mimetypeDAO.getMimetype(newMimetype);
+            int updateCount = 0;
+            if (newMimetypePair == null)
+            {
+                // Easy, just rename the old one
+                updateCount = mimetypeDAO.updateMimetype(oldMimetype, newMimetype);
+            }
+            else
+            {
+                // We need to move all the old references to the new ones
+                Long oldMimetypeId = oldMimetypePair.getFirst();
+                Long newMimetypeId = mimetypeDAO.getOrCreateMimetype(newMimetype).getFirst();
+                updateCount = patchDAO.updateContentMimetypeIds(oldMimetypeId, newMimetypeId);
+            }
+            result.append(I18NUtil.getMessage(MSG_UPDATED, updateCount, oldMimetype, newMimetype));
+            if (reindex)
+            {
+                // Update Lucene
+                int reindexCount = 0;
+                for (StoreRef storeRef : storeRefs)
+                {
+                    reindexCount += reindex(oldMimetype, storeRef);
+                    result.append(I18NUtil.getMessage(MSG_INDEXED, reindexCount, storeRef));
+                }
+            }
+        }
+        // Done
+        if (reindex)
+        {
+            result.append(I18NUtil.getMessage(MSG_DONE));
+        }
+        else
+        {
+            result.append(I18NUtil.getMessage(MSG_DONE_REINDEX));
+        }
+
+        return result.toString();
+    }
+    
+    private int reindex(String oldMimetype, StoreRef store)
+    {
+        SearchParameters sp = new SearchParameters();
+        sp.setLanguage(SearchService.LANGUAGE_LUCENE);
+        sp.setQuery("@" + LuceneQueryParser.escape(ContentModel.PROP_CONTENT.toString()) +
+                ".mimetype:\"" + oldMimetype + "\"");
+        sp.addStore(store);
+        Indexer indexer = indexerAndSearcher.getIndexer(store);
+        ResultSet rs = null;
+        int count = 0;
+        try
+        {
+            rs = searchService.query(sp);
+            count = rs.length();
+            for (ResultSetRow row : rs)
+            {
+                indexer.updateNode(row.getNodeRef());
+            }
+        }
+        finally
+        {
+            if (rs != null)
+            {
+                rs.close();
+            }
+        }
+        return count;
+    }
+}
diff --git a/source/java/org/alfresco/repo/admin/patch/impl/MigrateVersionStorePatch.java b/source/java/org/alfresco/repo/admin/patch/impl/MigrateVersionStorePatch.java
index 8c9b1dcdc9..b581b7098f 100644
--- a/source/java/org/alfresco/repo/admin/patch/impl/MigrateVersionStorePatch.java
+++ b/source/java/org/alfresco/repo/admin/patch/impl/MigrateVersionStorePatch.java
@@ -19,7 +19,6 @@
 package org.alfresco.repo.admin.patch.impl;
 
 import org.alfresco.error.AlfrescoRuntimeException;
-import org.springframework.extensions.surf.util.I18NUtil;
 import org.alfresco.repo.admin.patch.AbstractPatch;
 import org.alfresco.repo.importer.ImporterBootstrap;
 import org.alfresco.repo.security.authentication.AuthenticationUtil;
@@ -28,6 +27,7 @@ import org.alfresco.repo.version.VersionMigrator;
 import org.alfresco.service.cmr.repository.StoreRef;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.springframework.extensions.surf.util.I18NUtil;
 
 /**
  * Migrate version store from workspace://lightWeightVersionStore to workspace://version2Store
@@ -36,13 +36,16 @@ public class MigrateVersionStorePatch extends AbstractPatch
 {
     private static Log logger = LogFactory.getLog(MigrateVersionStorePatch.class);
     
-    private static final String MSG_SUCCESS = "patch.migrateVersionStore.result";
+    private static final String MSG_DONE = "patch.migrateVersionStore.done";
+    private static final String MSG_INCOMPLETE = "patch.migrateVersionStore.incomplete";
     
     private VersionMigrator versionMigrator;
     private TenantService tenantService;
     private ImporterBootstrap version2ImporterBootstrap;
     
     private int batchSize = 1;
+    private int threadCount = 2;
+    
     private boolean deleteImmediately = false;
     
     public void setVersionMigrator(VersionMigrator versionMigrator)
@@ -65,6 +68,11 @@ public class MigrateVersionStorePatch extends AbstractPatch
         this.batchSize = batchSize;
     }
     
+    public void setThreadCount(int threadCount)
+    {
+        this.threadCount = threadCount;
+    }
+    
     public void setDeleteImmediately(boolean deleteImmediately)
     {
         this.deleteImmediately = deleteImmediately;
@@ -79,28 +87,45 @@ public class MigrateVersionStorePatch extends AbstractPatch
             throw new AlfrescoRuntimeException(errorMessage);
         }
         
+        if (threadCount < 1)
+        {
+            String errorMessage = "threadCount ("+threadCount+") cannot be less than 1";
+            logger.error(errorMessage);
+            throw new AlfrescoRuntimeException(errorMessage);
+        }
+        
         super.init();
     }
     
     @Override
     protected String applyInternal() throws Exception
     {
-    	if (tenantService.isEnabled() && tenantService.isTenantUser())
-    	{
-    		// bootstrap new version store
+        if (tenantService.isEnabled() && tenantService.isTenantUser())
+        {
+            // bootstrap new version store
             StoreRef bootstrapStoreRef = version2ImporterBootstrap.getStoreRef();
-            bootstrapStoreRef = tenantService.getName(AuthenticationUtil.getRunAsUser(),  bootstrapStoreRef);
+            bootstrapStoreRef = tenantService.getName(AuthenticationUtil.getRunAsUser(), bootstrapStoreRef);
             version2ImporterBootstrap.setStoreUrl(bootstrapStoreRef.toString());
-        
+            
             version2ImporterBootstrap.bootstrap();
-    	}
-    	
-        int vhCount = versionMigrator.migrateVersions(batchSize, deleteImmediately);
-
-        // build the result message
-        String msg = I18NUtil.getMessage(MSG_SUCCESS, vhCount);
+        }
         
-        // done
-        return msg;
+        if (AuthenticationUtil.getRunAsUser() == null)
+        {
+            logger.info("Set system user");
+            AuthenticationUtil.setRunAsUser(AuthenticationUtil.getSystemUserName());
+        }
+        
+        boolean completed = versionMigrator.migrateVersions(batchSize, threadCount, deleteImmediately);
+        
+        // return the result message
+        if (completed)
+        {
+            return I18NUtil.getMessage(MSG_DONE);
+        }
+        else
+        {
+            return I18NUtil.getMessage(MSG_INCOMPLETE);
+        }
     }
 }
diff --git a/source/java/org/alfresco/repo/avm/AVMCrawlTestP.java b/source/java/org/alfresco/repo/avm/AVMCrawlTestP.java
index 442f724ffb..95718e4d1e 100644
--- a/source/java/org/alfresco/repo/avm/AVMCrawlTestP.java
+++ b/source/java/org/alfresco/repo/avm/AVMCrawlTestP.java
@@ -34,18 +34,20 @@ import org.alfresco.repo.security.authentication.AuthenticationUtil;
  */
 public class AVMCrawlTestP extends AVMServiceTestBase
 {
-    public void testCrawlA()
+    /*
+    public void xtestCrawlA()
     {
         testCrawl(1,
                   "source/java/org/alfresco/repo/avm/actions", // relative from .../repository
                   1,
                   30000); // 30 secs
     }
+    */
     
     public void testCrawlB()
     {
         testCrawl(2,
-                  "source/java/org/alfresco/repo/avm", // relative from .../repository
+                  "source/java/org/alfresco/repo/avm/actions", // relative from .../repository
                   2,
                   30000); // 30 secs
     }
diff --git a/source/java/org/alfresco/repo/avm/AVMDiffPerformanceTest.java b/source/java/org/alfresco/repo/avm/AVMDiffPerformanceTest.java
index 2a7a4faeca..a483ce644b 100644
--- a/source/java/org/alfresco/repo/avm/AVMDiffPerformanceTest.java
+++ b/source/java/org/alfresco/repo/avm/AVMDiffPerformanceTest.java
@@ -31,20 +31,22 @@ public class AVMDiffPerformanceTest extends AVMServiceTestBase
         super.testSetup();
     }
     
-    public void xtest_1000() throws Exception
+    public void test_1000() throws Exception
     {
         runTest(1000);
     }
     
-    public void ytest_10000() throws Exception
-    {
-        runTest(10000);
-    }
-    
-    public void test_2000() throws Exception
+    public void xtest_2000() throws Exception
     {
         runTest(2000);
     }
+    
+    /*
+    public void xtest_10000() throws Exception
+    {
+        runTest(10000);
+    }
+    */
 
     private void runTest(final int cnt) throws Exception
     {
diff --git a/source/java/org/alfresco/repo/avm/AVMServiceIndexTest.java b/source/java/org/alfresco/repo/avm/AVMServiceIndexTest.java
index 5891375538..95cc2ec762 100644
--- a/source/java/org/alfresco/repo/avm/AVMServiceIndexTest.java
+++ b/source/java/org/alfresco/repo/avm/AVMServiceIndexTest.java
@@ -26,13 +26,42 @@ import org.alfresco.repo.search.impl.lucene.AVMLuceneIndexer;
 import org.alfresco.service.cmr.repository.StoreRef;
 import org.alfresco.service.cmr.search.ResultSet;
 import org.alfresco.service.cmr.search.SearchService;
+import org.alfresco.util.TriggerBean;
 
 /**
  * Test AVMService indexing
  */
 public class AVMServiceIndexTest extends AVMServiceTestBase
 {
-    private final static long SLEEP = 180000;
+    /*
+    private final static long SLEEP = 180000; // 3 mins (default, where startDelay & repeatInterval are both 1 min)
+    private final static long START_DELAY_MSECS = 1000 * 60;
+    private final static long REPEAT_INTERVAL_MSECS = 1000 * 60;
+    */
+    
+    private final static long SLEEP = 10000;
+    private final static long START_DELAY_MSECS = 2000;
+    private final static long REPEAT_INTERVAL_MSECS = 2000;
+    
+    @Override
+    protected void setUp() throws Exception
+    {
+        super.setUp();
+        
+        //
+        // override default schedule to speed up this unit test (by reducing the sleep time)
+        //
+        
+        TriggerBean ftsIndexerTrigger = (TriggerBean)fContext.getBean("ftsIndexerTrigger");
+        
+        ftsIndexerTrigger.destroy(); // unschedule
+        
+        ftsIndexerTrigger.setStartDelay(START_DELAY_MSECS);
+        ftsIndexerTrigger.setRepeatInterval(REPEAT_INTERVAL_MSECS);
+        
+        ftsIndexerTrigger.afterPropertiesSet(); // re-schedule
+    }
+    
     /**
      * Test async indexing.
      *
diff --git a/source/java/org/alfresco/repo/avm/AVMServiceLocalTest.java b/source/java/org/alfresco/repo/avm/AVMServiceLocalTest.java
index 2d65096610..710827b1ac 100644
--- a/source/java/org/alfresco/repo/avm/AVMServiceLocalTest.java
+++ b/source/java/org/alfresco/repo/avm/AVMServiceLocalTest.java
@@ -76,7 +76,7 @@ public class AVMServiceLocalTest extends TestCase
     protected ApplicationContext fContext;
 
     protected NameMatcher excluder;
-    
+   
     
     protected void setUp() throws Exception
     {
@@ -880,38 +880,56 @@ public class AVMServiceLocalTest extends TestCase
      */
     public void testBulkUpdateLD() throws Exception
     {
+        //String LOAD_DIR = "config/alfresco/bootstrap";
+        String LOAD_DIR = "source/java/org/alfresco/repo/avm/actions";
+        
+        String[] split = LOAD_DIR.split("/");
+        String DIR = split[split.length-1];
+        
         try
         {
             RemoteBulkLoader loader = new RemoteBulkLoader();
             loader.setAvmRemoteService(fService);
 
             fService.createLayeredDirectory("main:/", "layer:/", "layer");
-            loader.recursiveLoad("config/alfresco/bootstrap", "layer:/layer");
+            
+            loader.recursiveLoad(LOAD_DIR, "layer:/layer");
+            
+            
+            
             List<AVMDifference> diffs = fSyncService.compare(-1, "layer:/layer", -1, "main:/", null);
             assertEquals(1, diffs.size());
-            assertEquals("[layer:/layer/bootstrap[-1] > main:/bootstrap[-1]]", diffs.toString());
+            assertEquals("[layer:/layer/"+DIR+"[-1] > main:/"+DIR+"[-1]]", diffs.toString());
+            
             fService.createSnapshot("layer", null, null);
             fSyncService.update(diffs, null, false, false, false, false, null, null);
             fService.createSnapshot("main", null, null);
+            
             diffs = fSyncService.compare(-1, "layer:/layer", -1, "main:/", null);
             assertEquals(0, diffs.size());
+            
             fSyncService.flatten("layer:/layer", "main:/");
             recursiveList("layer");
             recursiveList("main");
             fService.createStore("layer2");
             fService.createLayeredDirectory("layer:/layer", "layer2:/", "layer");
-            loader.recursiveLoad("config/alfresco/bootstrap", "layer2:/layer/bootstrap");
+            
+            loader.recursiveLoad(LOAD_DIR, "layer2:/layer/"+DIR);
+            
             fService.createSnapshot("layer2", null, null);
             diffs = fSyncService.compare(-1, "layer2:/layer", -1, "layer:/layer", null);
             assertEquals(1, diffs.size());
-            assertEquals("[layer2:/layer/bootstrap/bootstrap[-1] > layer:/layer/bootstrap/bootstrap[-1]]", diffs.toString());
+            assertEquals("[layer2:/layer/"+DIR+"/"+DIR+"[-1] > layer:/layer/"+DIR+"/"+DIR+"[-1]]", diffs.toString());
+            
             fSyncService.update(diffs, null, false, false, false, false, null, null);
             diffs = fSyncService.compare(-1, "layer2:/layer", -1, "layer:/layer", null);
             assertEquals(0, diffs.size());
+            
             fSyncService.flatten("layer2:/layer", "layer:/layer");
             diffs = fSyncService.compare(-1, "layer:/layer", -1, "main:/", null);
             assertEquals(1, diffs.size());
-            assertEquals("[layer:/layer/bootstrap/bootstrap[-1] > main:/bootstrap/bootstrap[-1]]", diffs.toString());          
+            assertEquals("[layer:/layer/"+DIR+"/"+DIR+"[-1] > main:/"+DIR+"/"+DIR+"[-1]]", diffs.toString());
+            
             recursiveList("layer2");
             recursiveList("layer");
             recursiveList("main");
@@ -923,7 +941,7 @@ public class AVMServiceLocalTest extends TestCase
         }
         finally
         {
-            fService.purgeStore("layer2");
+            if (fService.getStore("layer2") != null) { fService.purgeStore("layer2"); }
         }
     }
     
diff --git a/source/java/org/alfresco/repo/avm/AVMServicePerfTest.java b/source/java/org/alfresco/repo/avm/AVMServicePerfTest.java
index 35e16b8f6b..9a59204ef4 100644
--- a/source/java/org/alfresco/repo/avm/AVMServicePerfTest.java
+++ b/source/java/org/alfresco/repo/avm/AVMServicePerfTest.java
@@ -36,30 +36,32 @@ public class AVMServicePerfTest extends AVMServiceTestBase
         add(100, 10);
     }
     
-    public void testAdd100x10b() throws Throwable
+    /*
+    public void xtestAdd100x10b() throws Throwable
     {
         add(100, 10);
     }
     
-    public void testAdd100x10c() throws Throwable
+    public void xtestAdd100x10c() throws Throwable
     {
         add(100, 10);
     }
     
-    public void testAdd100x10d() throws Throwable
+    public void xtestAdd100x10d() throws Throwable
     {
         add(100, 10);
     }
     
-    public void testAdd500x2e() throws Throwable
+    public void xtestAdd500x2e() throws Throwable
     {
         add(500, 2);
     }
     
-    public void testAdd500x4g() throws Throwable
+    public void xtestAdd500x4g() throws Throwable
     {
         add(500, 4);
     }
+    */
     
     /**
      * Test adding 100 files to each of 10 directories.
diff --git a/source/java/org/alfresco/repo/avm/AVMServiceTest.java b/source/java/org/alfresco/repo/avm/AVMServiceTest.java
index 343f8e6377..f4c81e96aa 100644
--- a/source/java/org/alfresco/repo/avm/AVMServiceTest.java
+++ b/source/java/org/alfresco/repo/avm/AVMServiceTest.java
@@ -29,7 +29,6 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -51,8 +50,6 @@ import org.alfresco.repo.avm.actions.SimpleAVMSubmitAction;
 import org.alfresco.repo.avm.util.BulkLoader;
 import org.alfresco.repo.content.MimetypeMap;
 import org.alfresco.repo.domain.PropertyValue;
-import org.alfresco.repo.domain.hibernate.SessionSizeResourceManager;
-import org.alfresco.repo.search.impl.lucene.ADMLuceneSearcherImpl;
 import org.alfresco.repo.search.impl.lucene.LuceneQueryParser;
 import org.alfresco.repo.security.authentication.AuthenticationUtil;
 import org.alfresco.repo.transaction.RetryingTransactionHelper;
@@ -71,7 +68,6 @@ import org.alfresco.service.cmr.avmsync.AVMDifference;
 import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
 import org.alfresco.service.cmr.model.FileFolderService;
 import org.alfresco.service.cmr.remote.RepoRemote;
-import org.alfresco.service.cmr.repository.ChildAssociationRef;
 import org.alfresco.service.cmr.repository.ContentData;
 import org.alfresco.service.cmr.repository.ContentWriter;
 import org.alfresco.service.cmr.repository.CrossRepositoryCopyService;
@@ -767,15 +763,35 @@ public class AVMServiceTest extends AVMServiceTestBase
             ArrayList<Long> times = new ArrayList<Long>();
             BulkLoader loader = new BulkLoader();
             loader.setAvmService(fService);
-            loader.recursiveLoad("source/java/org/alfresco/repo/avm", "main:/");
-            times.add(System.currentTimeMillis());
+            
+            assertEquals(1, fService.getStoreVersions("main").size());
+            
+            loader.recursiveLoad("source/java/org/alfresco/repo/avm/actions", "main:/");
+            
+            long time = System.currentTimeMillis();
+            times.add(time);
+            while(! (System.currentTimeMillis() > time)) { }
+            
             assertEquals(1, fService.createSnapshot("main", null, null).get("main").intValue());
-            loader.recursiveLoad("source/java/org/alfresco/repo/action", "main:/");
-            times.add(System.currentTimeMillis());
+            
+            loader.recursiveLoad("source/java/org/alfresco/repo/avm/ibatis", "main:/");
+            
+            time = System.currentTimeMillis();
+            times.add(time);
+            while(! (System.currentTimeMillis() > time)) { }
+            
             assertEquals(2, fService.createSnapshot("main", null, null).get("main").intValue());
-            loader.recursiveLoad("source/java/org/alfresco/repo/audit", "main:/");
-            times.add(System.currentTimeMillis());
+            
+            loader.recursiveLoad("source/java/org/alfresco/repo/avm/locking", "main:/");
+            
+            time = System.currentTimeMillis();
+            times.add(time);
+            while(! (System.currentTimeMillis() > time)) { }
+            
             assertEquals(3, fService.createSnapshot("main", null, null).get("main").intValue());
+            
+            assertEquals(4, fService.getStoreVersions("main").size());
+            
             assertEquals(1, fService.getStoreVersions("main", null, new Date(times.get(0))).size());
             assertEquals(3, fService.getStoreVersions("main", new Date(times.get(0)), null).size());
             assertEquals(2, fService.getStoreVersions("main", new Date(times.get(1)), new Date(System.currentTimeMillis())).size());
@@ -2919,26 +2935,40 @@ public class AVMServiceTest extends AVMServiceTestBase
      */
     public void testVersionUpdate() throws Exception
     {
+        //String LOAD_DIR1 = "config/alfresco/bootstrap";
+        //String LOAD_DIR2 = "config/alfresco/extension";
+        
+        String LOAD_DIR1 = "source/java/org/alfresco/repo/avm/actions";
+        String LOAD_DIR2 = "source/java/org/alfresco/repo/avm/ibatis";
+        
+        String[] split1 = LOAD_DIR1.split("/");
+        String DIR1 = split1[split1.length-1];
+        
+        String[] split2 = LOAD_DIR2.split("/");
+        String DIR2 = split2[split2.length-1];
+        
+        
         try
         {
             BulkLoader loader = new BulkLoader();
             loader.setAvmService(fService);
             fService.createStore("source");
             fService.createStore("dest");
-            loader.recursiveLoad("config/alfresco/bootstrap", "source:/");
+            
+            loader.recursiveLoad(LOAD_DIR1, "source:/");
             int version1 = fService.createSnapshot("source", null, null).get("source");
-            loader.recursiveLoad("config/alfresco/extension", "source:/");
+            loader.recursiveLoad(LOAD_DIR2, "source:/");
             int version2 = fService.createSnapshot("source", null, null).get("source");
             List<AVMDifference> diffs = fSyncService.compare(version1, "source:/", -1, "dest:/", null);
             fService.createSnapshot("dest", null, null);
             assertEquals(1, diffs.size());
-            assertEquals("[source:/bootstrap[1] > dest:/bootstrap[-1]]", diffs.toString());
+            assertEquals("[source:/"+DIR1+"[1] > dest:/"+DIR1+"[-1]]", diffs.toString());
             fSyncService.update(diffs, null, false, false, false, false, null, null);
             diffs = fSyncService.compare(version1, "source:/", -1, "dest:/", null);
             assertEquals(0, diffs.size());
             diffs = fSyncService.compare(version2, "source:/", -1, "dest:/", null);
             assertEquals(1, diffs.size());
-            assertEquals("[source:/extension[2] > dest:/extension[-1]]", diffs.toString());
+            assertEquals("[source:/"+DIR2+"[2] > dest:/"+DIR2+"[-1]]", diffs.toString());
             fSyncService.update(diffs, null, false, false, false, false, null, null);
             fService.createSnapshot("dest", null, null);
             diffs = fSyncService.compare(version2, "source:/", -1, "dest:/", null);
diff --git a/source/java/org/alfresco/repo/avm/AVMStressTestP.java b/source/java/org/alfresco/repo/avm/AVMStressTestP.java
index e944eeb11a..ae9004a151 100644
--- a/source/java/org/alfresco/repo/avm/AVMStressTestP.java
+++ b/source/java/org/alfresco/repo/avm/AVMStressTestP.java
@@ -29,7 +29,8 @@ import org.alfresco.repo.avm.util.BulkLoader;
  */
 public class AVMStressTestP extends AVMServiceTestBase
 {
-    public void testStressA() throws Throwable
+    /*
+    public void xtestStressA() throws Throwable
     {
         testNThreads(   1,  // nThreads
                         "source/java/org/alfresco/repo/avm/actions", // relative dir to load from (.../repository)
@@ -45,11 +46,12 @@ public class AVMStressTestP extends AVMServiceTestBase
                         0,  // snapshot
                         100); // # ops (for each thread)
     }
+    */
     
     public void testStressB() throws Throwable
     {
         testNThreads(   2,  // nThreads
-                        "source/java/org/alfresco/repo/avm", // relative dir to load from (.../repository)
+                        "source/java/org/alfresco/repo/avm/actions", // relative dir to load from (.../repository)
                         1,  // nCopies
                         10,  // create file
                         2,  // create dir
diff --git a/source/java/org/alfresco/repo/avm/AVMTestSuite.java b/source/java/org/alfresco/repo/avm/AVMTestSuite.java
index f65caee7bf..a4d8c3f0be 100644
--- a/source/java/org/alfresco/repo/avm/AVMTestSuite.java
+++ b/source/java/org/alfresco/repo/avm/AVMTestSuite.java
@@ -24,12 +24,24 @@ import junit.framework.TestSuite;
 import org.alfresco.repo.avm.locking.AVMLockingServiceTest;
 import org.alfresco.repo.avm.util.VersionPathTest;
 import org.alfresco.util.ApplicationContextHelper;
+import org.springframework.context.ApplicationContext;
 
 /**
  * AVM test suite
+ * 
+ * @author brittp, janv
  */
 public class AVMTestSuite extends TestSuite
 {
+    public static ApplicationContext getContext() 
+    {
+        ApplicationContextHelper.setUseLazyLoading(false);
+        ApplicationContextHelper.setNoAutoStart(true);
+        return ApplicationContextHelper.getApplicationContext(
+             new String[] { "classpath:alfresco/minimal-context.xml" }
+        );
+    }
+    
     /**
      * Creates the test suite
      *
@@ -37,10 +49,11 @@ public class AVMTestSuite extends TestSuite
      */
     public static Test suite()
     {
+        // Setup the context
+        getContext();
+        
         TestSuite suite = new TestSuite();
         
-        // Ensure that the default context is available
-        ApplicationContextHelper.getApplicationContext();
         
         // Add the tests to be run
         
@@ -68,7 +81,7 @@ public class AVMTestSuite extends TestSuite
         
         suite.addTestSuite(VersionPathTest.class);
         suite.addTestSuite(WCMInheritPermissionsTest.class);
-
+        
         // This should go last, as its uses a different
         //  context to the other tests
         suite.addTestSuite(AVMServiceRemoteSystemTest.class);
diff --git a/source/java/org/alfresco/repo/avm/PurgeTestP.java b/source/java/org/alfresco/repo/avm/PurgeTestP.java
index be3fc9a202..15317440e4 100644
--- a/source/java/org/alfresco/repo/avm/PurgeTestP.java
+++ b/source/java/org/alfresco/repo/avm/PurgeTestP.java
@@ -142,7 +142,7 @@ public class PurgeTestP extends AVMServiceTestBase
     {
         fReaper.activate();
         
-        final int maxCycles = 50;
+        final int maxCycles = 100;
         
         int cycles = 0;
         while (fReaper.isActive() && (cycles <= maxCycles))
diff --git a/source/java/org/alfresco/repo/avm/SimultaneousLoadTest.java b/source/java/org/alfresco/repo/avm/SimultaneousLoadTest.java
index 9f0514c1aa..663eb6753e 100644
--- a/source/java/org/alfresco/repo/avm/SimultaneousLoadTest.java
+++ b/source/java/org/alfresco/repo/avm/SimultaneousLoadTest.java
@@ -26,10 +26,12 @@ import org.alfresco.repo.avm.util.BulkLoader;
  */
 public class SimultaneousLoadTest extends AVMServiceTestBase
 {
-    public void testSimulLoadA() throws Throwable
+    /*
+    public void xtestSimulLoadA() throws Throwable
     {
         testSimultaneousLoad(1,1);
     }
+    */
     
     public void testSimulLoadB() throws Throwable
     {
@@ -53,7 +55,7 @@ public class SimultaneousLoadTest extends AVMServiceTestBase
             for (int i = 0; i < n; i++)
             {
                 //Loader loader = new Loader("/Users/britt/stuff/" + i, "main:/d" + i, m);
-                Loader loader = new Loader("source/java/org/alfresco/repo/avm", "main:/d" + i, m);
+                Loader loader = new Loader("source/java/org/alfresco/repo/avm/actions", "main:/d" + i, m);
                 
                 threads[i] = new Thread(loader);
                 threads[i].start();
diff --git a/source/java/org/alfresco/repo/content/AbstractReadOnlyContentStoreTest.java b/source/java/org/alfresco/repo/content/AbstractReadOnlyContentStoreTest.java
index c9d4c2aade..cfd0a0e629 100644
--- a/source/java/org/alfresco/repo/content/AbstractReadOnlyContentStoreTest.java
+++ b/source/java/org/alfresco/repo/content/AbstractReadOnlyContentStoreTest.java
@@ -35,7 +35,6 @@ import org.alfresco.util.ApplicationContextHelper;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationEventPublisher;
 
 /**
  * Abstract base class that provides a set of tests for implementations
@@ -53,7 +52,6 @@ public abstract class AbstractReadOnlyContentStoreTest extends TestCase
     
     private static Log logger = LogFactory.getLog(AbstractReadOnlyContentStoreTest.class);
     
-    protected ApplicationEventPublisher applicationEventPublisher;
     protected TransactionService transactionService;
     private UserTransaction txn;
     
@@ -68,7 +66,6 @@ public abstract class AbstractReadOnlyContentStoreTest extends TestCase
     @Override
     public void setUp() throws Exception
     {
-        applicationEventPublisher = (ApplicationEventPublisher) ctx.getBean("applicationEventPublisher");
         transactionService = (TransactionService) ctx.getBean("TransactionService");
         txn = transactionService.getUserTransaction();
         txn.begin();
diff --git a/source/java/org/alfresco/repo/content/ContentServiceImpl.java b/source/java/org/alfresco/repo/content/ContentServiceImpl.java
index 0c43136de3..5885dc500b 100644
--- a/source/java/org/alfresco/repo/content/ContentServiceImpl.java
+++ b/source/java/org/alfresco/repo/content/ContentServiceImpl.java
@@ -25,7 +25,6 @@ import java.util.Map;
 import java.util.Set;
 
 import org.alfresco.error.AlfrescoRuntimeException;
-import org.springframework.extensions.surf.util.I18NUtil;
 import org.alfresco.model.ContentModel;
 import org.alfresco.repo.avm.AVMNodeConverter;
 import org.alfresco.repo.content.ContentServicePolicies.OnContentPropertyUpdatePolicy;
@@ -57,14 +56,16 @@ import org.alfresco.service.cmr.repository.NodeService;
 import org.alfresco.service.cmr.repository.StoreRef;
 import org.alfresco.service.cmr.repository.TransformationOptions;
 import org.alfresco.service.cmr.usage.ContentQuotaException;
-import org.alfresco.service.namespace.NamespaceService;
 import org.alfresco.service.namespace.QName;
 import org.alfresco.util.EqualsHelper;
 import org.alfresco.util.Pair;
 import org.alfresco.util.TempFileProvider;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.springframework.context.ApplicationEventPublisher;
+import org.springframework.beans.BeansException;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.extensions.surf.util.I18NUtil;
 
 /**
  * Service implementation acting as a level of indirection between the client
@@ -77,7 +78,7 @@ import org.springframework.context.ApplicationEventPublisher;
  * @author Derek Hulley
  * @since 3.2
  */
-public class ContentServiceImpl implements ContentService
+public class ContentServiceImpl implements ContentService, ApplicationContextAware
 {
     private static Log logger = LogFactory.getLog(ContentServiceImpl.class);
     
@@ -85,7 +86,7 @@ public class ContentServiceImpl implements ContentService
     private NodeService nodeService;
     private AVMService avmService;
     private RetryingTransactionHelper transactionHelper;
-    private ApplicationEventPublisher applicationEventPublisher;
+    private ApplicationContext applicationContext;
     
     /** a registry of all available content transformers */
     private ContentTransformerRegistry transformerRegistry;
@@ -153,16 +154,14 @@ public class ContentServiceImpl implements ContentService
     {
         this.imageMagickContentTransformer = imageMagickContentTransformer;
     }
-        
-    /**
-     * Sets the application event publisher.
-     * 
-     * @param applicationEventPublisher
-     *            the new application event publisher
+    
+    
+    /* (non-Javadoc)
+     * @see org.springframework.context.ApplicationContextAware#setApplicationContext(org.springframework.context.ApplicationContext)
      */
-    public void setApplicationEventPublisher(ApplicationEventPublisher applicationEventPublisher)
+    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException
     {
-        this.applicationEventPublisher = applicationEventPublisher;
+        this.applicationContext = applicationContext;
     }
 
     /**
@@ -171,8 +170,7 @@ public class ContentServiceImpl implements ContentService
     public void init()
     {
         // Set up a temporary store
-        this.tempStore = new FileContentStore(this.applicationEventPublisher, TempFileProvider.getTempDir()
-                .getAbsolutePath());
+        this.tempStore = new FileContentStore(this.applicationContext, TempFileProvider.getTempDir().getAbsolutePath());
 
         // Bind on update properties behaviour
         this.policyComponent.bindClassBehaviour(
diff --git a/source/java/org/alfresco/repo/content/RoutingContentServiceTest.java b/source/java/org/alfresco/repo/content/RoutingContentServiceTest.java
index 52912dda65..f8ec7de94b 100644
--- a/source/java/org/alfresco/repo/content/RoutingContentServiceTest.java
+++ b/source/java/org/alfresco/repo/content/RoutingContentServiceTest.java
@@ -86,8 +86,8 @@ public class RoutingContentServiceTest extends TestCase
     @Override
     public void setUp() throws Exception
     {
-        transactionService = (TransactionService) ctx.getBean("transactionComponent");
-        nodeService = (NodeService) ctx.getBean("dbNodeService");
+        transactionService = (TransactionService) ctx.getBean("TransactionService");
+        nodeService = (NodeService) ctx.getBean("NodeService");
         contentService = (ContentService) ctx.getBean(ServiceRegistry.CONTENT_SERVICE.getLocalName());
         this.policyComponent = (PolicyComponent) ctx.getBean("policyComponent");
         this.authenticationComponent = (AuthenticationComponent) ctx.getBean("authenticationComponent");
@@ -705,6 +705,7 @@ public class RoutingContentServiceTest extends TestCase
             return isDone;
         }
         
+        @SuppressWarnings("unused")
         public Throwable getError()
         {
             return error;
@@ -827,4 +828,98 @@ public class RoutingContentServiceTest extends TestCase
         txn.commit();
         txn = null;
     }
+    
+    /**
+     * Ensure that content URLs outside of a transaction are not touched on rollback.
+     */
+    public void testRollbackCleanup_ALF2890() throws Exception
+    {
+        ContentWriter updatingWriter = contentService.getWriter(contentNodeRef, ContentModel.PROP_CONTENT, true);
+        updatingWriter.putContent("STEP 1");
+
+        txn.commit();
+        txn = null;
+        
+        ContentReader readerStep1 = contentService.getReader(contentNodeRef, ContentModel.PROP_CONTENT);
+        assertEquals("Incorrect content", "STEP 1", readerStep1.getContentString());
+        
+        ContentWriter simpleWriter = contentService.getWriter(contentNodeRef, ContentModel.PROP_CONTENT, false);
+        simpleWriter.putContent("STEP 2");
+        readerStep1 = contentService.getReader(contentNodeRef, ContentModel.PROP_CONTENT);
+        assertEquals("Incorrect content", "STEP 1", readerStep1.getContentString());
+        
+        // Update the content
+        nodeService.setProperty(contentNodeRef, ContentModel.PROP_CONTENT, simpleWriter.getContentData());
+        ContentReader readerStep2 = contentService.getReader(contentNodeRef, ContentModel.PROP_CONTENT);
+        assertEquals("Incorrect content", "STEP 2", readerStep2.getContentString());
+        
+        simpleWriter = contentService.getWriter(contentNodeRef, ContentModel.PROP_CONTENT, false);
+        simpleWriter.putContent("STEP 3");
+        ContentReader readerStep3 = simpleWriter.getReader();
+        assertEquals("Incorrect content", "STEP 3", readerStep3.getContentString());
+        readerStep2 = contentService.getReader(contentNodeRef, ContentModel.PROP_CONTENT);
+        assertEquals("Incorrect content", "STEP 2", readerStep2.getContentString());
+        
+        // Now get a ex-transaction writer but set the content property in a failing transaction
+        // Notice that we have already written "STEP 3" to an underlying binary
+        final ContentData simpleWriterData = simpleWriter.getContentData();
+        RetryingTransactionCallback<Void> failToSetPropCallback = new RetryingTransactionCallback<Void>()
+        {
+            public Void execute() throws Throwable
+            {
+                nodeService.setProperty(contentNodeRef, ContentModel.PROP_CONTENT, simpleWriterData);
+                throw new RuntimeException("aaa");
+            }
+        };
+        try
+        {
+            transactionService.getRetryingTransactionHelper().doInTransaction(failToSetPropCallback);
+        }
+        catch (RuntimeException e)
+        {
+            if (!e.getMessage().equals("aaa"))
+            {
+                throw e;
+            }
+            // Expected
+        }
+        // The writer data should not have been cleaned up
+        readerStep3 = simpleWriter.getReader();
+        assertTrue("Content was cleaned up when it originated outside of the transaction", readerStep3.exists());
+        assertEquals("Incorrect content", "STEP 3", readerStep3.getContentString());
+        // The node's content must be unchanged
+        readerStep2 = contentService.getReader(contentNodeRef, ContentModel.PROP_CONTENT);
+        assertEquals("Incorrect content", "STEP 2", readerStep2.getContentString());
+
+        // Test that rollback cleanup works for writers fetched in the same transaction
+        final ContentReader[] readers = new ContentReader[1];
+        RetryingTransactionCallback<Void> rollbackCallback = new RetryingTransactionCallback<Void>()
+        {
+            public Void execute() throws Throwable
+            {
+                ContentWriter writer = contentService.getWriter(contentNodeRef, ContentModel.PROP_CONTENT, true);
+                writer.putContent("UNLUCKY CONTENT");
+                ContentReader reader = contentService.getReader(contentNodeRef, ContentModel.PROP_CONTENT);
+                assertEquals("Incorrect content", "UNLUCKY CONTENT", reader.getContentString());
+                assertEquals("Incorrect content", "UNLUCKY CONTENT", writer.getReader().getContentString());
+                readers[0] = reader;
+                
+                throw new RuntimeException("aaa");
+            }
+        };
+        try
+        {
+            transactionService.getRetryingTransactionHelper().doInTransaction(rollbackCallback);
+        }
+        catch (RuntimeException e)
+        {
+            if (!e.getMessage().equals("aaa"))
+            {
+                throw e;
+            }
+            // Expected
+        }
+        // Make sure that the content has been cleaned up
+        assertFalse("Content was not cleaned up after having been created in-transaction", readers[0].exists());
+    }
 }
diff --git a/source/java/org/alfresco/repo/content/RoutingContentStoreTest.java b/source/java/org/alfresco/repo/content/RoutingContentStoreTest.java
index b72e7cf183..d8fe7d5eb3 100644
--- a/source/java/org/alfresco/repo/content/RoutingContentStoreTest.java
+++ b/source/java/org/alfresco/repo/content/RoutingContentStoreTest.java
@@ -59,13 +59,13 @@ public class RoutingContentStoreTest extends AbstractWritableContentStoreTest
         File tempDir = TempFileProvider.getTempDir();
         // Create a subdirectory for A
         File storeADir = new File(tempDir, "A");
-        storeA = new FileContentStore(applicationEventPublisher, storeADir);
+        storeA = new FileContentStore(ctx, storeADir);
         // Create a subdirectory for B
         File storeBDir = new File(tempDir, "B");
-        storeB = new FileContentStore(applicationEventPublisher, storeBDir);
+        storeB = new FileContentStore(ctx, storeBDir);
         // Create a subdirectory for C
         File storeCDir = new File(tempDir, "C");
-        storeC = new DumbReadOnlyFileStore(new FileContentStore(applicationEventPublisher, storeCDir));
+        storeC = new DumbReadOnlyFileStore(new FileContentStore(ctx, storeCDir));
         // No subdirectory for D
         storeD = new SupportsNoUrlFormatStore();
         // Create the routing store
diff --git a/source/java/org/alfresco/repo/content/TenantRoutingFileContentStore.java b/source/java/org/alfresco/repo/content/TenantRoutingFileContentStore.java
index 630e3931c5..2a591554e5 100644
--- a/source/java/org/alfresco/repo/content/TenantRoutingFileContentStore.java
+++ b/source/java/org/alfresco/repo/content/TenantRoutingFileContentStore.java
@@ -30,21 +30,23 @@ import org.alfresco.repo.security.authentication.AuthenticationUtil;
 import org.alfresco.repo.tenant.Tenant;
 import org.alfresco.repo.tenant.TenantDeployer;
 import org.alfresco.repo.tenant.TenantService;
-import org.springframework.context.ApplicationEventPublisher;
+import org.springframework.beans.BeansException;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
 
 /**
  * Content Store that supports tenant routing, if multi-tenancy is enabled.
  * 
  * Note: Need to initialise before the dictionary service, in the case that models are dynamically loaded for the tenant.
  */
-public class TenantRoutingFileContentStore extends AbstractRoutingContentStore implements TenantDeployer
+public class TenantRoutingFileContentStore extends AbstractRoutingContentStore implements TenantDeployer, ApplicationContextAware
 {
     // cache of tenant file stores
     Map<String, FileContentStore> tenantFileStores = new ConcurrentHashMap<String, FileContentStore>();
     
     private String defaultRootDirectory;
     private TenantService tenantService;
-    private ApplicationEventPublisher applicationEventPublisher;
+    private ApplicationContext applicationContext;
     
     
     public void setDefaultRootDir(String defaultRootDirectory)
@@ -56,18 +58,17 @@ public class TenantRoutingFileContentStore extends AbstractRoutingContentStore i
     {
         this.tenantService = tenantService;
     }
-        
-    /**
-     * Sets the application event publisher.
-     * 
-     * @param applicationEventPublisher
-     *            the new application event publisher
-     */
-    public void setApplicationEventPublisher(ApplicationEventPublisher applicationEventPublisher)
-    {
-        this.applicationEventPublisher = applicationEventPublisher;
-    }
 
+    /*
+     * (non-Javadoc)
+     * @see org.springframework.context.ApplicationContextAware#setApplicationContext(org.springframework.context.
+     * ApplicationContext)
+     */
+    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException
+    {
+        this.applicationContext = applicationContext;
+    }
+    
     @Override
     protected ContentStore selectWriteStore(ContentContext ctx)
     {
@@ -130,7 +131,7 @@ public class TenantRoutingFileContentStore extends AbstractRoutingContentStore i
             tenantDomain = tenant.getTenantDomain();
         }
         
-        putTenantFileStore(tenantDomain, new FileContentStore(this.applicationEventPublisher, new File(rootDir)));
+        putTenantFileStore(tenantDomain, new FileContentStore(this.applicationContext, new File(rootDir)));
     }
     
     public void destroy()
diff --git a/source/java/org/alfresco/repo/content/cleanup/ContentStoreCleaner.java b/source/java/org/alfresco/repo/content/cleanup/ContentStoreCleaner.java
index 6aa22d39de..9b93414481 100644
--- a/source/java/org/alfresco/repo/content/cleanup/ContentStoreCleaner.java
+++ b/source/java/org/alfresco/repo/content/cleanup/ContentStoreCleaner.java
@@ -19,7 +19,9 @@
 package org.alfresco.repo.content.cleanup;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.repo.domain.avm.AVMNodeDAO;
@@ -33,12 +35,12 @@ import org.alfresco.service.cmr.repository.ContentService;
 import org.alfresco.service.namespace.NamespaceService;
 import org.alfresco.service.namespace.QName;
 import org.alfresco.service.transaction.TransactionService;
+import org.alfresco.util.Pair;
+import org.alfresco.util.PropertyCheck;
 import org.alfresco.util.VmShutdownListener;
 import org.alfresco.util.VmShutdownListener.VmShutdownException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.alfresco.util.Pair;
-import org.alfresco.util.PropertyCheck;
 
 /**
  * This component is responsible cleaning up orphaned content.
@@ -328,26 +330,35 @@ public class ContentStoreCleaner
     
     private int cleanBatch(final int batchSize)
     {
-        final List<Long> idsToDelete = new ArrayList<Long>(batchSize);
+        // Get a bunch of cleanable URLs
+        final Map<Long, String> urlsById = new HashMap<Long, String>(batchSize * 2);
         ContentUrlHandler contentUrlHandler = new ContentUrlHandler()
         {
             public void handle(Long id, String contentUrl, Long orphanTime)
             {
-                // Pass the content URL to the eager cleaner for post-commit handling
-                eagerContentStoreCleaner.registerOrphanedContentUrl(contentUrl, true);
-                idsToDelete.add(id);
+                urlsById.put(id, contentUrl);
             }
         };
         final long maxOrphanTime = System.currentTimeMillis() - (protectDays * 24 * 3600 * 1000);
         contentDataDAO.getContentUrlsOrphaned(contentUrlHandler, maxOrphanTime, batchSize);
-        // All the URLs have been passed off for eventual deletion.
-        // Just delete the DB data
-        int size = idsToDelete.size();
-        if (size > 0)
+        
+        // Shortcut, if necessary
+        if (urlsById.size() == 0)
         {
-            contentDataDAO.deleteContentUrls(idsToDelete);
+            return 0;
+        }
+        // We have the IDs of the URLs to delete.  Let's do it!
+        List<Long> idsToDelete = new ArrayList<Long>(urlsById.keySet());
+        contentDataDAO.deleteContentUrls(idsToDelete);
+        
+        // No problems, so far (ALF-1998: contentStoreCleanerJob leads to foreign key exception)
+        // Schedule the URLs for deletion in the post-commit phase
+        for (String contentUrlToDelete : urlsById.values())
+        {
+            // NOTE: We are forcing eager cleanup so ignore the return value.
+            eagerContentStoreCleaner.registerOrphanedContentUrl(contentUrlToDelete, true);
         }
         // Done
-        return size;
+        return urlsById.size();
     }
 }
diff --git a/source/java/org/alfresco/repo/content/cleanup/EagerContentStoreCleaner.java b/source/java/org/alfresco/repo/content/cleanup/EagerContentStoreCleaner.java
index 07e03394a0..45a93bd6cd 100644
--- a/source/java/org/alfresco/repo/content/cleanup/EagerContentStoreCleaner.java
+++ b/source/java/org/alfresco/repo/content/cleanup/EagerContentStoreCleaner.java
@@ -140,28 +140,47 @@ public class EagerContentStoreCleaner extends TransactionListenerAdapter
 
     /**
      * Queues orphaned content for post-transaction removal
+     * <p/>
+     * <b>NB: </b>Any content registered <u>will</u> be deleted if the current transaction
+     *            commits and if 'eager' cleanup is turned on.
+     * 
+     * @return  Returns <tt>true</tt> if the content was scheduled for post-transaction deletion.
+     *          If the return value is <tt>true</tt> then the calling code <b>must</b> delete
+     *          the row entry for the content URL provided <b>BEFORE THE TRANSACTION COMMITS!</b>
      */
-    public void registerOrphanedContentUrl(String contentUrl)
+    public boolean registerOrphanedContentUrl(String contentUrl)
     {
-        registerOrphanedContentUrl(contentUrl, false);
+        return registerOrphanedContentUrl(contentUrl, false);
     }
 
     /**
      * Queues orphaned content for post-transaction removal
+     * <p/>
+     * <b>NB: </b>Any content registered <u>will</u> be deleted if the current transaction
+     *            commits and if 'eager' cleanup is turned on.
      * 
      * @param force         <tt>true</tt> for force the post-commit URL deletion
      *                      regardless of the setting {@link #setEagerOrphanCleanup(boolean)}.
+     * @return  Returns <tt>true</tt> if the content was scheduled for post-transaction deletion.
+     *          If the return value is <tt>true</tt> then the calling code <b>must</b> delete
+     *          the row entry for the content URL provided <b>BEFORE THE TRANSACTION COMMITS!</b>
      */
-    public void registerOrphanedContentUrl(String contentUrl, boolean force)
+    public boolean registerOrphanedContentUrl(String contentUrl, boolean force)
     {
         if (!eagerOrphanCleanup && !force)
         {
-            return;
+            return false;
         }
         Set<String> urlsToDelete = TransactionalResourceHelper.getSet(KEY_POST_COMMIT_DELETION_URLS);
         urlsToDelete.add(contentUrl);
         // Register to listen for transaction commit
         AlfrescoTransactionSupport.bindListener(this);
+        // Done
+        if (logger.isDebugEnabled())
+        {
+            logger.debug("Scheduled content for post-commit eager cleanup: " + contentUrl);
+        }
+        return true;
     }
 
     /**
@@ -218,7 +237,7 @@ public class EagerContentStoreCleaner extends TransactionListenerAdapter
                 {
                     logger.debug("   " + (urlsToDelete.size() - 10) + " more ...");
                 }
-                else
+                else if (count < 10)
                 {
                     logger.debug("   Deleting content URL: " + contentUrl);
                 }
diff --git a/source/java/org/alfresco/repo/content/filestore/FileContentStore.java b/source/java/org/alfresco/repo/content/filestore/FileContentStore.java
index ce08fb9157..a639b59bb9 100644
--- a/source/java/org/alfresco/repo/content/filestore/FileContentStore.java
+++ b/source/java/org/alfresco/repo/content/filestore/FileContentStore.java
@@ -38,8 +38,12 @@ import org.alfresco.util.GUID;
 import org.alfresco.util.Pair;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.springframework.context.ApplicationEventPublisher;
-import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.beans.BeansException;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.context.ApplicationEvent;
+import org.springframework.context.ApplicationListener;
+import org.springframework.context.event.ContextRefreshedEvent;
 
 /**
  * Provides a store of node content directly to the file system.  The writers
@@ -50,7 +54,7 @@ import org.springframework.context.ConfigurableApplicationContext;
  * 
  * @author Derek Hulley
  */
-public class FileContentStore extends AbstractContentStore
+public class FileContentStore extends AbstractContentStore implements ApplicationContextAware, ApplicationListener
 {
     /**
      * <b>store</b> is the new prefix for file content URLs
@@ -64,7 +68,7 @@ public class FileContentStore extends AbstractContentStore
     private String rootAbsolutePath;
     private boolean allowRandomAccess;
     private boolean readOnly;
-    private ApplicationEventPublisher applicationEventPublisher;
+    private ApplicationContext applicationContext;
 
     /**
      * Private: for Spring-constructed instances only.
@@ -102,32 +106,32 @@ public class FileContentStore extends AbstractContentStore
     /**
      * Public constructor for programmatic use.
      * 
-     * @param applicationEventPublisher
-     *            the application event publisher
+     * @param context
+     *            application context through which events can be published
      * @param rootDirectoryStr
      *            the root under which files will be stored. The directory will be created if it does not exist.
      * @see FileContentStore#FileContentStore(File)
      */
-    public FileContentStore(ApplicationEventPublisher applicationEventPublisher, String rootDirectoryStr)
+    public FileContentStore(ApplicationContext context, String rootDirectoryStr)
     {
         this(rootDirectoryStr);
-        setApplicationEventPublisher(applicationEventPublisher);
-        publishEvent();
+        setApplicationContext(context);
+        publishEvent(context);
     }
 
     /**
      * Public constructor for programmatic use.
      * 
-     * @param applicationEventPublisher
-     *            the application event publisher
+     * @param context
+     *            application context through which events can be published
      * @param rootDirectory
      *            the root under which files will be stored. The directory will be created if it does not exist.
      */
-    public FileContentStore(ApplicationEventPublisher applicationEventPublisher, File rootDirectory)
+    public FileContentStore(ApplicationContext context, File rootDirectory)
     {
         this(rootDirectory);        
-        setApplicationEventPublisher(applicationEventPublisher);
-        publishEvent();
+        setApplicationContext(context);
+        publishEvent(context);
     }
     
     
@@ -142,16 +146,13 @@ public class FileContentStore extends AbstractContentStore
         return sb.toString();
     }
 
-
-    /**
-     * Sets the application event publisher.
-     * 
-     * @param applicationEventPublisher
-     *            the new application event publisher
+    
+    /* (non-Javadoc)
+     * @see org.springframework.context.ApplicationContextAware#setApplicationContext(org.springframework.context.ApplicationContext)
      */
-    public void setApplicationEventPublisher(ApplicationEventPublisher applicationEventPublisher)
+    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException
     {
-        this.applicationEventPublisher = applicationEventPublisher;
+        this.applicationContext = applicationContext;
     }
 
     /**
@@ -630,9 +631,22 @@ public class FileContentStore extends AbstractContentStore
     /**
      * Publishes an event to the application context that will notify any interested parties of the existence of this
      * content store.
+     * 
+     * @param context
+     *            the application context
      */
-    private void publishEvent()
+    private void publishEvent(ApplicationContext context)
     {
-        this.applicationEventPublisher.publishEvent(new ContentStoreCreatedEvent(this));
+        context.publishEvent(new ContentStoreCreatedEvent(this));
+    }
+
+    public void onApplicationEvent(ApplicationEvent event)
+    {
+        // Once the context has been refreshed, we tell other interested beans about the existence of this content store
+        // (e.g. for monitoring purposes)
+        if (event instanceof ContextRefreshedEvent && event.getSource() == this.applicationContext)
+        {
+            publishEvent(((ContextRefreshedEvent) event).getApplicationContext());
+        }
     }
 }
diff --git a/source/java/org/alfresco/repo/content/filestore/FileContentStoreTest.java b/source/java/org/alfresco/repo/content/filestore/FileContentStoreTest.java
index f9e417fa50..51751e1016 100644
--- a/source/java/org/alfresco/repo/content/filestore/FileContentStoreTest.java
+++ b/source/java/org/alfresco/repo/content/filestore/FileContentStoreTest.java
@@ -46,8 +46,10 @@ public class FileContentStoreTest extends AbstractWritableContentStoreTest
         
         // create a store that uses a subdirectory of the temp directory
         File tempDir = TempFileProvider.getTempDir();
-        store = new FileContentStore(applicationEventPublisher, tempDir.getAbsolutePath() + File.separatorChar
-                + getName());
+        store = new FileContentStore(ctx,
+                tempDir.getAbsolutePath() +
+                File.separatorChar +
+                getName());
     }
 
     @Override
diff --git a/source/java/org/alfresco/repo/content/filestore/NoRandomAccessFileContentStoreTest.java b/source/java/org/alfresco/repo/content/filestore/NoRandomAccessFileContentStoreTest.java
index bc50461747..8bd1299021 100644
--- a/source/java/org/alfresco/repo/content/filestore/NoRandomAccessFileContentStoreTest.java
+++ b/source/java/org/alfresco/repo/content/filestore/NoRandomAccessFileContentStoreTest.java
@@ -43,8 +43,10 @@ public class NoRandomAccessFileContentStoreTest extends AbstractWritableContentS
         
         // create a store that uses a subdirectory of the temp directory
         File tempDir = TempFileProvider.getTempDir();
-        store = new FileContentStore(applicationEventPublisher, tempDir.getAbsolutePath() + File.separatorChar
-                + getName());
+        store = new FileContentStore(ctx,
+                tempDir.getAbsolutePath() +
+                File.separatorChar +
+                getName());
         // disallow random access
         store.setAllowRandomAccess(false);
     }
diff --git a/source/java/org/alfresco/repo/content/filestore/ReadOnlyFileContentStoreTest.java b/source/java/org/alfresco/repo/content/filestore/ReadOnlyFileContentStoreTest.java
index 52ba97414d..3fb41c95fd 100644
--- a/source/java/org/alfresco/repo/content/filestore/ReadOnlyFileContentStoreTest.java
+++ b/source/java/org/alfresco/repo/content/filestore/ReadOnlyFileContentStoreTest.java
@@ -44,8 +44,10 @@ public class ReadOnlyFileContentStoreTest extends AbstractReadOnlyContentStoreTe
         
         // create a store that uses a subdirectory of the temp directory
         File tempDir = TempFileProvider.getTempDir();
-        store = new FileContentStore(applicationEventPublisher, tempDir.getAbsolutePath() + File.separatorChar
-                + getName());
+        store = new FileContentStore(ctx,
+                tempDir.getAbsolutePath() +
+                File.separatorChar +
+                getName());
         // disallow random access
         store.setReadOnly(true);
     }
diff --git a/source/java/org/alfresco/repo/content/metadata/AbstractMappingMetadataExtracter.java b/source/java/org/alfresco/repo/content/metadata/AbstractMappingMetadataExtracter.java
index 5cc9d49982..e1bbb74e7e 100644
--- a/source/java/org/alfresco/repo/content/metadata/AbstractMappingMetadataExtracter.java
+++ b/source/java/org/alfresco/repo/content/metadata/AbstractMappingMetadataExtracter.java
@@ -31,6 +31,7 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
@@ -105,7 +106,7 @@ abstract public class AbstractMappingMetadataExtracter implements MetadataExtrac
     private Set<String> supportedMimetypes;
     private OverwritePolicy overwritePolicy;
     private boolean failOnTypeConversion;
-    private Set<DateFormat> supportedDateFormats;
+    private Set<DateFormat> supportedDateFormats = new HashSet<DateFormat>(0);
     private Map<String, Set<QName>> mapping;
     private boolean inheritDefaultMapping;
 
@@ -134,7 +135,6 @@ abstract public class AbstractMappingMetadataExtracter implements MetadataExtrac
         // Set defaults
         overwritePolicy = OverwritePolicy.PRAGMATIC;
         failOnTypeConversion = true;
-        supportedDateFormats = new HashSet<DateFormat>(0);
         mapping = null;                     // The default will be fetched
         inheritDefaultMapping = false;      // Any overrides are complete 
         initialized = false;
@@ -260,8 +260,22 @@ abstract public class AbstractMappingMetadataExtracter implements MetadataExtrac
         {
             try
             {
+                /**
+                 * Regional date format
+                 */
                 DateFormat df = new SimpleDateFormat(dateFormatStr);
                 this.supportedDateFormats.add(df);
+                
+                /**
+                 * Date format can be locale specific - make sure English format always works
+                 */ 
+                /* 
+                 * TODO MER 25 May 2010 - Added this as a quick fix for IMAP date parsing which is always 
+                 * English regardless of Locale.  Some more thought and/or code is required to configure 
+                 * the relationship between properties, format and locale.
+                 */
+                DateFormat englishFormat = new SimpleDateFormat(dateFormatStr, Locale.US);
+                this.supportedDateFormats.add(englishFormat);
             }
             catch (Throwable e)
             {
diff --git a/source/java/org/alfresco/repo/content/metadata/MailMetadataExtracter.java b/source/java/org/alfresco/repo/content/metadata/MailMetadataExtracter.java
index 3253469767..00d07c8341 100644
--- a/source/java/org/alfresco/repo/content/metadata/MailMetadataExtracter.java
+++ b/source/java/org/alfresco/repo/content/metadata/MailMetadataExtracter.java
@@ -30,7 +30,7 @@ import org.alfresco.service.cmr.repository.ContentReader;
 import org.apache.poi.hsmf.MAPIMessage;
 
 /**
- * Outlook format email meta-data extractor extracting the following values:
+ * Outlook MAPI format email meta-data extractor extracting the following values:
  * <pre>
  *   <b>sentDate:</b>               --      cm:sentdate
  *   <b>originator:</b>             --      cm:originator,    cm:author
diff --git a/source/java/org/alfresco/repo/content/metadata/RFC822MetadataExtracter.java b/source/java/org/alfresco/repo/content/metadata/RFC822MetadataExtracter.java
index 499784359f..40041cde31 100644
--- a/source/java/org/alfresco/repo/content/metadata/RFC822MetadataExtracter.java
+++ b/source/java/org/alfresco/repo/content/metadata/RFC822MetadataExtracter.java
@@ -23,6 +23,7 @@ import java.io.InputStream;
 import java.io.Serializable;
 import java.io.UnsupportedEncodingException;
 import java.util.Arrays;
+import java.util.Date;
 import java.util.Enumeration;
 import java.util.HashSet;
 import java.util.Map;
@@ -40,20 +41,20 @@ import org.alfresco.service.namespace.QName;
 
 /**
  * Metadata extractor for RFC822 mime emails.
+ * 
+ * Default configuration:   (see RFC822MetadataExtractor.properties)
+ * 
  * <pre>
  *   <b>messageFrom:</b>              --      imap:messageFrom, cm:originator
  *   <b>messageTo:</b>                --      imap:messageTo
  *   <b>messageCc:</b>                --      imap:messageCc
  *   <b>messageSubject:</b>           --      imap:messageSubject, cm:title, cm:description, cm:subjectline
  *   <b>messageSent:</b>              --      imap:dateSent, cm:sentdate
+ *   <b>messageReceived:</b>          --      imap:dateReceived
  *   <b>All <code>{@link Header#getName() header names}:</b>
  *      <b>Thread-Index:</b>          --      imap:threadIndex
  *      <b>Message-ID:</b>            --      imap:messageId
- *      <b>date:</b>                  --      imap:dateReceived
- * 
- * TIKA Note - to and cc are missing, and date stuff isn't
- *  great. Thread index is missing, and arbitrary headers
- *  don't seem to be supported
+ * </pre>
  * 
  * @author Derek Hulley
  * @since 3.2
@@ -66,6 +67,7 @@ public class RFC822MetadataExtracter extends AbstractMappingMetadataExtracter
     protected static final String KEY_MESSAGE_CC = "messageCc";
     protected static final String KEY_MESSAGE_SUBJECT = "messageSubject";
     protected static final String KEY_MESSAGE_SENT = "messageSent";
+    protected static final String KEY_MESSAGE_RECEIVED = "messageReceived";
 
     public static String[] SUPPORTED_MIMETYPES = new String[] { MimetypeMap.MIMETYPE_RFC822 };
 
@@ -87,12 +89,50 @@ public class RFC822MetadataExtracter extends AbstractMappingMetadataExtracter
 
             if (mimeMessage != null)
             {
-                //Extract values that doesn't match to headers and need to be encoded.
+                /**
+                 * Extract RFC822 values that doesn't match to headers and need to be encoded.
+                 * Or those special fields that require some code to extract data 
+                 */
                 putRawValue(KEY_MESSAGE_FROM, InternetAddress.toString(mimeMessage.getFrom()), rawProperties);
                 putRawValue(KEY_MESSAGE_TO, InternetAddress.toString(mimeMessage.getRecipients(RecipientType.TO)), rawProperties);
                 putRawValue(KEY_MESSAGE_CC, InternetAddress.toString(mimeMessage.getRecipients(RecipientType.CC)), rawProperties);
                 putRawValue(KEY_MESSAGE_SENT, mimeMessage.getSentDate(), rawProperties); 
-
+                
+                /**
+                 * Received field from RFC 822
+                 * 
+                 * "Received"    ":"        ; one per relay
+                 *   ["from" domain]        ; sending host
+                 *   ["by"   domain]        ; receiving host
+                 *   ["via"  atom]          ; physical path
+                 *  ("with" atom)           ; link/mail protocol
+                 *   ["id"   msg-id]        ; receiver msg id
+                 *   ["for"  addr-spec]     ; initial form
+                 * ";"    date-time         ; time received
+                 */
+                Date rxDate = mimeMessage.getReceivedDate();
+              
+                if(rxDate != null)
+                {
+                    // The email implementation extracted the received date for us.
+                    putRawValue(KEY_MESSAGE_RECEIVED, rxDate, rawProperties); 
+                }
+                else
+                {
+                    // the email implementation did not parse the received date for us.
+                    String[] rx = mimeMessage.getHeader("received");
+                    if(rx != null && rx.length > 0)
+                    {
+                        String lastReceived = rx[0];    
+                        int x = lastReceived.indexOf(';');
+                        if(x > 0)
+                        {
+                            String dateStr = lastReceived.substring(x + 1).trim();
+                            putRawValue(KEY_MESSAGE_RECEIVED, dateStr, rawProperties); 
+                        }
+                    }
+                }
+                
                 String[] subj = mimeMessage.getHeader("Subject");
                 if (subj != null && subj.length > 0)
                 {
@@ -108,7 +148,9 @@ public class RFC822MetadataExtracter extends AbstractMappingMetadataExtracter
                     putRawValue(KEY_MESSAGE_SUBJECT, decodedSubject, rawProperties);
                 }
                 
-                //Extract values from headers
+                /*
+                 * Extract values from all header fields, including extension fields "X-"
+                 */
                 Set<String> keys = getMapping().keySet();
                 Enumeration<Header> headers = mimeMessage.getAllHeaders();
                 while (headers.hasMoreElements())
@@ -148,15 +190,4 @@ public class RFC822MetadataExtracter extends AbstractMappingMetadataExtracter
     {
          return super.getMapping();
     }
-    
-//    /**
-//     * Back door for RM
-//     * @return
-//     */
-//    public void setMapping(Map<String, Set<QName>> mapping)
-//    {
-//        super.setMapping(mapping);
-//    }
-
-
 }
diff --git a/source/java/org/alfresco/repo/content/metadata/RFC822MetadataExtracter.properties b/source/java/org/alfresco/repo/content/metadata/RFC822MetadataExtracter.properties
index 4291afc3e5..2981f49d42 100644
--- a/source/java/org/alfresco/repo/content/metadata/RFC822MetadataExtracter.properties
+++ b/source/java/org/alfresco/repo/content/metadata/RFC822MetadataExtracter.properties
@@ -8,15 +8,15 @@ namespace.prefix.cm=http://www.alfresco.org/model/content/1.0
 
 # Mappings
 
-#Default values that doesn't match to Header
+#Default values that doesn't match exactly to Header
 messageFrom=imap:messageFrom, cm:originator
 messageTo=imap:messageTo
 messageCc=imap:messageCc
 messageSubject=imap:messageSubject, cm:title, cm:description, cm:subjectline
 messageSent=imap:dateSent, cm:sentdate
+messageReceived=imap:dateReceived
 
-
-#Add here any values you want to extract. Use Header name for key.
+#Add here any values you want to extract. 
+# Use Header name for key.   LHS is a list of the destination properties.
 Thread-Index=imap:threadIndex
 Message-ID=imap:messageId
-Date=imap:dateReceived
diff --git a/source/java/org/alfresco/repo/content/replication/ReplicatingContentStoreTest.java b/source/java/org/alfresco/repo/content/replication/ReplicatingContentStoreTest.java
index b972d2ecf5..05fef49628 100644
--- a/source/java/org/alfresco/repo/content/replication/ReplicatingContentStoreTest.java
+++ b/source/java/org/alfresco/repo/content/replication/ReplicatingContentStoreTest.java
@@ -64,7 +64,7 @@ public class ReplicatingContentStoreTest extends AbstractWritableContentStoreTes
         File tempDir = TempFileProvider.getTempDir();
         // create a primary file store
         String storeDir = tempDir.getAbsolutePath() + File.separatorChar + GUID.generate();
-        primaryStore = new FileContentStore(applicationEventPublisher, storeDir);
+        primaryStore = new FileContentStore(ctx, storeDir);
         // create some secondary file stores
         secondaryStores = new ArrayList<ContentStore>(3);
         for (int i = 0; i < 4; i++)
diff --git a/source/java/org/alfresco/repo/domain/contentdata/AbstractContentDataDAOImpl.java b/source/java/org/alfresco/repo/domain/contentdata/AbstractContentDataDAOImpl.java
index c913109ab2..c12448deed 100644
--- a/source/java/org/alfresco/repo/domain/contentdata/AbstractContentDataDAOImpl.java
+++ b/source/java/org/alfresco/repo/domain/contentdata/AbstractContentDataDAOImpl.java
@@ -19,6 +19,8 @@
 package org.alfresco.repo.domain.contentdata;
 
 import java.io.Serializable;
+import java.util.Collections;
+import java.util.List;
 import java.util.Locale;
 import java.util.Set;
 
@@ -34,11 +36,11 @@ import org.alfresco.repo.transaction.TransactionListenerAdapter;
 import org.alfresco.repo.transaction.TransactionalResourceHelper;
 import org.alfresco.service.cmr.repository.ContentData;
 import org.alfresco.util.EqualsHelper;
+import org.alfresco.util.Pair;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.dao.ConcurrencyFailureException;
 import org.springframework.dao.DataIntegrityViolationException;
-import org.alfresco.util.Pair;
 
 /**
  * Abstract implementation for ContentData DAO.
@@ -121,14 +123,6 @@ public abstract class AbstractContentDataDAOImpl implements ContentDataDAO
                 contentDataCallbackDAO);
     }
     
-    /**
-     * Register new content for post-rollback handling
-     */
-    protected void registerNewContentUrl(String contentUrl)
-    {
-        contentStoreCleaner.registerNewContentUrl(contentUrl);
-    }
-    
     /**
      * A <b>content_url</b> entity was dereferenced.  This makes no assumptions about the
      * current references - dereference deletion is handled in the commit phase.
@@ -300,7 +294,7 @@ public abstract class AbstractContentDataDAOImpl implements ContentDataDAO
         if (contentUrl != null)
         {
             // We must find or create the ContentUrlEntity
-            contentUrlId = getOrCreateContentUrlEntity(contentUrl, size, contentData.isReferenced()).getId();
+            contentUrlId = getOrCreateContentUrlEntity(contentUrl, size).getId();
         }
         // Resolve the mimetype
         Long mimetypeId = null;
@@ -347,7 +341,7 @@ public abstract class AbstractContentDataDAOImpl implements ContentDataDAO
             }
             if (newContentUrl != null)
             {
-                Long contentUrlId = getOrCreateContentUrlEntity(newContentUrl, contentData.getSize(), contentData.isReferenced()).getId();
+                Long contentUrlId = getOrCreateContentUrlEntity(newContentUrl, contentData.getSize()).getId();
                 contentDataEntity.setContentUrlId(contentUrlId);
                 contentDataEntity.setContentUrl(newContentUrl);
             }
@@ -391,7 +385,7 @@ public abstract class AbstractContentDataDAOImpl implements ContentDataDAO
      * whether it has been created or is being re-used.
      * @param isReferenced if <code>true</code> we won't worry about eagerly deleting the content on transaction rollback
      */
-    private ContentUrlEntity getOrCreateContentUrlEntity(String contentUrl, long size, boolean isReferenced)
+    private ContentUrlEntity getOrCreateContentUrlEntity(String contentUrl, long size)
     {
         // Create the content URL entity
         ContentUrlEntity contentUrlEntity = getContentUrlEntity(contentUrl);
@@ -408,16 +402,21 @@ public abstract class AbstractContentDataDAOImpl implements ContentDataDAO
                         "   Existing: " + contentUrlEntity);
             }
             // Check orphan state
-            if (contentUrlEntity.getOrphanTime() != null)
+            Long oldOrphanTime = contentUrlEntity.getOrphanTime();
+            if (oldOrphanTime != null)
             {
                 Long id = contentUrlEntity.getId();
-                updateContentUrlOrphanTime(id, null);
+                int updated = updateContentUrlOrphanTime(id, null, oldOrphanTime);
+                if (updated == 0)
+                {
+                    throw new ConcurrencyFailureException("Failed to remove orphan time: " + contentUrlEntity);
+                }
             }
         }
         else
         {
             // Create it
-            contentUrlEntity = createContentUrlEntity(contentUrl, size, isReferenced);
+            contentUrlEntity = createContentUrlEntity(contentUrl, size);
         }
         // Done
         return contentUrlEntity;
@@ -425,9 +424,8 @@ public abstract class AbstractContentDataDAOImpl implements ContentDataDAO
 
     /**
      * @param contentUrl    the content URL to create or search for
-     * @param isReferenced if <code>true</code> we won't worry about eagerly deleting the content on transaction rollback
      */
-    protected abstract ContentUrlEntity createContentUrlEntity(String contentUrl, long size, boolean isReferenced);
+    protected abstract ContentUrlEntity createContentUrlEntity(String contentUrl, long size);
     
     /**
      * @param id            the ID of the <b>content url</b> entity
@@ -453,9 +451,10 @@ public abstract class AbstractContentDataDAOImpl implements ContentDataDAO
      * 
      * @param id            the unique ID of the entity 
      * @param orphanTime    the time (ms since epoch) that the entity was orphaned
+     * @param oldOrphanTime the orphan time we expect to update for optimistic locking (may be <tt>null</tt>)
      * @return              Returns the number of rows updated
      */
-    protected abstract int updateContentUrlOrphanTime(Long id, Long orphanTime);
+    protected abstract int updateContentUrlOrphanTime(Long id, Long orphanTime, Long oldOrphanTime);
     
     /**
      * Create the row for the <b>alf_content_data<b>
@@ -512,11 +511,36 @@ public abstract class AbstractContentDataDAOImpl implements ContentDataDAO
                     // It is still referenced, so ignore it
                     continue;
                 }
-                // We mark the URL as orphaned.
-                Long contentUrlId = contentUrlEntity.getId();
-                updateContentUrlOrphanTime(contentUrlId, orphanTime);
                 // Pop this in the queue for deletion from the content store
-                contentStoreCleaner.registerOrphanedContentUrl(contentUrl);
+                boolean isEagerCleanup = contentStoreCleaner.registerOrphanedContentUrl(contentUrl);
+                if (!isEagerCleanup)
+                {
+                    // We mark the URL as orphaned.
+                    // The content binary is not scheduled for immediate removal so just mark the
+                    // row's orphan time.  Concurrently, it is possible for multiple references
+                    // to be made WHILE the orphan time is set, but we handle that separately.
+                    Long contentUrlId = contentUrlEntity.getId();
+                    Long oldOrphanTime = contentUrlEntity.getOrphanTime();
+                    int updated = updateContentUrlOrphanTime(contentUrlId, orphanTime, oldOrphanTime);
+                    if (updated != 1)
+                    {
+                        throw new ConcurrencyFailureException(
+                                "Failed to update content URL orphan time: " + contentUrlEntity);
+                    }
+                }
+                else
+                {
+                    // ALERT!!!
+                    // The content is scheduled for deletion once this transaction commits.
+                    // We need to make sure that the URL is not re-referenced by another transaction.
+                    List<Long> contentUrlId = Collections.singletonList(contentUrlEntity.getId());
+                    int deleted = deleteContentUrls(contentUrlId);
+                    if (deleted != 1)
+                    {
+                        throw new ConcurrencyFailureException(
+                                "Failed to delete eagerly-reaped content URL: " + contentUrlEntity);
+                    }
+                }
             }
             contentUrls.clear();
         }
diff --git a/source/java/org/alfresco/repo/domain/contentdata/ContentDataDAOTest.java b/source/java/org/alfresco/repo/domain/contentdata/ContentDataDAOTest.java
index c48102c4b2..bfe72c7391 100644
--- a/source/java/org/alfresco/repo/domain/contentdata/ContentDataDAOTest.java
+++ b/source/java/org/alfresco/repo/domain/contentdata/ContentDataDAOTest.java
@@ -37,7 +37,6 @@ import org.alfresco.service.transaction.TransactionService;
 import org.alfresco.util.ApplicationContextHelper;
 import org.alfresco.util.Pair;
 import org.alfresco.util.TempFileProvider;
-import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.dao.DataIntegrityViolationException;
 
@@ -62,10 +61,9 @@ public class ContentDataDAOTest extends TestCase
         ServiceRegistry serviceRegistry = (ServiceRegistry) ctx.getBean(ServiceRegistry.SERVICE_REGISTRY);
         transactionService = serviceRegistry.getTransactionService();
         txnHelper = transactionService.getRetryingTransactionHelper();
-        ApplicationEventPublisher applicationEventPublisher = (ApplicationEventPublisher) ctx.getBean("applicationEventPublisher");
         
         contentDataDAO = (ContentDataDAO) ctx.getBean("contentDataDAO");
-        contentStore = new FileContentStore(applicationEventPublisher, TempFileProvider.getTempDir());
+        contentStore = new FileContentStore(ctx, TempFileProvider.getTempDir());
     }
     
     private Pair<Long, ContentData> create(final ContentData contentData)
diff --git a/source/java/org/alfresco/repo/domain/contentdata/ContentUrlUpdateEntity.java b/source/java/org/alfresco/repo/domain/contentdata/ContentUrlUpdateEntity.java
new file mode 100644
index 0000000000..f7c6487c85
--- /dev/null
+++ b/source/java/org/alfresco/repo/domain/contentdata/ContentUrlUpdateEntity.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright (C) 2005-2010 Alfresco Software Limited.
+ *
+ * This file is part of Alfresco
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.alfresco.repo.domain.contentdata;
+
+
+/**
+ * Entity bean for updating the <b>alf_content_url</b> table.
+ * 
+ * @author Derek Hulley
+ * @since 3.2
+ */
+public class ContentUrlUpdateEntity
+{
+    private Long id;
+    private Long orphanTime;
+    private Long oldOrphanTime;
+    
+    public ContentUrlUpdateEntity()
+    {
+    }
+    
+    @Override
+    public String toString()
+    {
+        StringBuilder sb = new StringBuilder(512);
+        sb.append("ContentUrlUpdateEntity")
+          .append("[ ID=").append(id)
+          .append(", orphanTime=").append(orphanTime)
+          .append(", oldOrphanTime=").append(oldOrphanTime)
+          .append("]");
+        return sb.toString();
+    }
+
+    public Long getId()
+    {
+        return id;
+    }
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getOrphanTime()
+    {
+        return orphanTime;
+    }
+
+    public void setOrphanTime(Long orphanTime)
+    {
+        this.orphanTime = orphanTime;
+    }
+
+    public Long getOldOrphanTime()
+    {
+        return oldOrphanTime;
+    }
+
+    public void setOldOrphanTime(Long oldOrphanTime)
+    {
+        this.oldOrphanTime = oldOrphanTime;
+    }}
diff --git a/source/java/org/alfresco/repo/domain/contentdata/ibatis/ContentDataDAOImpl.java b/source/java/org/alfresco/repo/domain/contentdata/ibatis/ContentDataDAOImpl.java
index 8686a772e2..9f1d54213a 100644
--- a/source/java/org/alfresco/repo/domain/contentdata/ibatis/ContentDataDAOImpl.java
+++ b/source/java/org/alfresco/repo/domain/contentdata/ibatis/ContentDataDAOImpl.java
@@ -29,10 +29,11 @@ import org.alfresco.ibatis.IdsEntity;
 import org.alfresco.repo.domain.contentdata.AbstractContentDataDAOImpl;
 import org.alfresco.repo.domain.contentdata.ContentDataEntity;
 import org.alfresco.repo.domain.contentdata.ContentUrlEntity;
+import org.alfresco.repo.domain.contentdata.ContentUrlUpdateEntity;
 import org.alfresco.service.cmr.repository.ContentData;
+import org.alfresco.util.Pair;
 import org.springframework.dao.ConcurrencyFailureException;
 import org.springframework.dao.DataIntegrityViolationException;
-import org.alfresco.util.Pair;
 import org.springframework.orm.ibatis.SqlMapClientTemplate;
 
 import com.ibatis.sqlmap.client.event.RowHandler;
@@ -48,7 +49,7 @@ public class ContentDataDAOImpl extends AbstractContentDataDAOImpl
     private static final String SELECT_CONTENT_URL_BY_ID = "alfresco.content.select_ContentUrlById";
     private static final String SELECT_CONTENT_URL_BY_KEY = "alfresco.content.select_ContentUrlByKey";
     private static final String SELECT_CONTENT_URL_BY_KEY_UNREFERENCED = "alfresco.content.select_ContentUrlByKeyUnreferenced";
-    private static final String SELECT_CONTENT_URLS_BY_ORPHAN_TIME = "alfresco.content.select_ContentUrlByOrphanTime";
+    private static final String SELECT_CONTENT_URLS_ORPHANED = "alfresco.content.select_ContentUrlsOrphaned";
     private static final String SELECT_CONTENT_DATA_BY_ID = "alfresco.content.select_ContentDataById";
     private static final String SELECT_CONTENT_DATA_BY_NODE_AND_QNAME = "alfresco.content.select_ContentDataByNodeAndQName";
     private static final String INSERT_CONTENT_URL = "alfresco.content.insert_ContentUrl";
@@ -77,7 +78,7 @@ public class ContentDataDAOImpl extends AbstractContentDataDAOImpl
     }
 
     @Override
-    protected ContentUrlEntity createContentUrlEntity(String contentUrl, long size, boolean isReferenced)
+    protected ContentUrlEntity createContentUrlEntity(String contentUrl, long size)
     {
         ContentUrlEntity contentUrlEntity = new ContentUrlEntity();
         contentUrlEntity.setContentUrl(contentUrl);
@@ -86,13 +87,6 @@ public class ContentDataDAOImpl extends AbstractContentDataDAOImpl
         /* Long id = (Long) */ template.insert(INSERT_CONTENT_URL, contentUrlEntity);
         /*contentUrlEntity.setId(id);*/
         
-        // Don't register this URL for tidy up if it is still referenced by code outside of this transaction
-        if (!isReferenced)
-        {
-            // Register the url as new
-            registerNewContentUrl(contentUrl);
-        }
-
         // Done
         return contentUrlEntity;
     }
@@ -136,7 +130,7 @@ public class ContentDataDAOImpl extends AbstractContentDataDAOImpl
         };
         ContentUrlEntity contentUrlEntity = new ContentUrlEntity();
         contentUrlEntity.setOrphanTime(maxOrphanTime);
-        template.queryWithRowHandler(SELECT_CONTENT_URLS_BY_ORPHAN_TIME, contentUrlEntity, rowHandler);
+        template.queryWithRowHandler(SELECT_CONTENT_URLS_ORPHANED, contentUrlEntity, rowHandler);
     }
     
     @SuppressWarnings("unchecked")
@@ -145,7 +139,7 @@ public class ContentDataDAOImpl extends AbstractContentDataDAOImpl
         ContentUrlEntity contentUrlEntity = new ContentUrlEntity();
         contentUrlEntity.setOrphanTime(maxOrphanTime);
         List<ContentUrlEntity> results = template.queryForList(
-                SELECT_CONTENT_URLS_BY_ORPHAN_TIME,
+                SELECT_CONTENT_URLS_ORPHANED,
                 contentUrlEntity, 0, maxResults);
         // Pass the result to the callback
         for (ContentUrlEntity result : results)
@@ -157,12 +151,13 @@ public class ContentDataDAOImpl extends AbstractContentDataDAOImpl
         }
     }
     
-    public int updateContentUrlOrphanTime(Long id, Long orphanTime)
+    public int updateContentUrlOrphanTime(Long id, Long orphanTime, Long oldOrphanTime)
     {
-        ContentUrlEntity contentUrlEntity = new ContentUrlEntity();
-        contentUrlEntity.setId(id);
-        contentUrlEntity.setOrphanTime(orphanTime);
-        return template.update(UPDATE_CONTENT_URL_ORPHAN_TIME, contentUrlEntity);
+        ContentUrlUpdateEntity contentUrlUpdateEntity = new ContentUrlUpdateEntity();
+        contentUrlUpdateEntity.setId(id);
+        contentUrlUpdateEntity.setOrphanTime(orphanTime);
+        contentUrlUpdateEntity.setOldOrphanTime(oldOrphanTime);
+        return template.update(UPDATE_CONTENT_URL_ORPHAN_TIME, contentUrlUpdateEntity);
     }
 
     /**
diff --git a/source/java/org/alfresco/repo/domain/hibernate/AclDaoComponentImpl.java b/source/java/org/alfresco/repo/domain/hibernate/AclDaoComponentImpl.java
index 4cf7039340..9e0294ea6e 100644
--- a/source/java/org/alfresco/repo/domain/hibernate/AclDaoComponentImpl.java
+++ b/source/java/org/alfresco/repo/domain/hibernate/AclDaoComponentImpl.java
@@ -56,6 +56,7 @@ import org.alfresco.repo.security.permissions.SimpleAccessControlList;
 import org.alfresco.repo.security.permissions.SimpleAccessControlListProperties;
 import org.alfresco.repo.security.permissions.impl.AclChange;
 import org.alfresco.repo.security.permissions.impl.AclDaoComponent;
+import org.alfresco.repo.security.permissions.impl.PermissionsDaoComponent;
 import org.alfresco.repo.security.permissions.impl.SimplePermissionReference;
 import org.alfresco.repo.transaction.AlfrescoTransactionSupport;
 import org.alfresco.service.cmr.security.AccessStatus;
@@ -119,6 +120,8 @@ public class AclDaoComponentImpl extends HibernateDaoSupport implements AclDaoCo
     /** a transactionally-safe cache to be injected */
     private SimpleCache<Long, AccessControlList> aclCache;
 
+    private boolean useOldPermissions;
+    
     private enum WriteMode
     {
         /**
@@ -2548,4 +2551,28 @@ public class AclDaoComponentImpl extends HibernateDaoSupport implements AclDaoCo
         return createAccessControlListImpl(properties, aces, inherited);
     }
 
+    /* (non-Javadoc)
+     * @see org.alfresco.repo.security.permissions.impl.AclDaoComponent#getDefaultProperties()
+     */
+    public SimpleAccessControlListProperties getDefaultProperties()
+    {
+        if(useOldPermissions)
+        {
+            return OldADMPermissionsDaoComponentImpl.getDefaultProperties();
+        }
+        else
+        {
+            return DMPermissionsDaoComponentImpl.getDefaultProperties();
+        }
+    }
+
+    /**
+     * @param permissionsDaoComponent the permissionsDaoComponent to set
+     */
+    public void setUseOldPermissions(boolean useOldPermissions)
+    {
+        this.useOldPermissions = useOldPermissions;
+    }
+
+    
 }
diff --git a/source/java/org/alfresco/repo/domain/hibernate/DMAccessControlListDAO.java b/source/java/org/alfresco/repo/domain/hibernate/DMAccessControlListDAO.java
index b28610e9f3..531fb57ad8 100644
--- a/source/java/org/alfresco/repo/domain/hibernate/DMAccessControlListDAO.java
+++ b/source/java/org/alfresco/repo/domain/hibernate/DMAccessControlListDAO.java
@@ -209,7 +209,7 @@ public class DMAccessControlListDAO implements AccessControlListDAO
             if (existingAcl.getAclType() == ACLType.OLD)
             {
                 result.increment(ACLType.DEFINING);
-                SimpleAccessControlListProperties properties = DMPermissionsDaoComponentImpl.getDefaultProperties();
+                SimpleAccessControlListProperties properties = aclDaoComponent.getDefaultProperties();
                 properties.setInherits(existingAcl.getInherits());
                 AccessControlList existing = aclDaoComponent.getAccessControlList(existingAcl.getId());
                 Long actuallyInherited = null;
@@ -240,7 +240,7 @@ public class DMAccessControlListDAO implements AccessControlListDAO
             if (isRoot)
             {
                 result.increment(ACLType.DEFINING);
-                SimpleAccessControlListProperties properties = DMPermissionsDaoComponentImpl.getDefaultProperties();
+                SimpleAccessControlListProperties properties = aclDaoComponent.getDefaultProperties();
                 Long id = aclDaoComponent.createAccessControlList(properties);
 
                 DbAccessControlList newAcl = aclDaoComponent.getDbAccessControlList(id);
diff --git a/source/java/org/alfresco/repo/domain/hibernate/NodeAccessControlListDAO.java b/source/java/org/alfresco/repo/domain/hibernate/NodeAccessControlListDAO.java
index 384ff1de9d..16fedacf71 100644
--- a/source/java/org/alfresco/repo/domain/hibernate/NodeAccessControlListDAO.java
+++ b/source/java/org/alfresco/repo/domain/hibernate/NodeAccessControlListDAO.java
@@ -119,7 +119,9 @@ public class NodeAccessControlListDAO extends HibernateDaoSupport implements Acc
         Pair<Long, ChildAssociationRef> caPair = fNodeDAOService.getPrimaryParentAssoc(nodePair.getFirst());
         if ((caPair != null) && (caPair.getSecond().getParentRef() != null))
         {
-            Long aclId = fNodeDAOService.getNodeAccessControlList(caPair.getFirst());
+            NodeRef parentRef = caPair.getSecond().getParentRef();
+            Long parentNodeId = fNodeDAOService.getNodePair(parentRef).getFirst();
+            Long aclId = fNodeDAOService.getNodeAccessControlList(parentNodeId);
             return aclId;
         }
         else
@@ -150,6 +152,7 @@ public class NodeAccessControlListDAO extends HibernateDaoSupport implements Acc
 
     public void setAccessControlList(NodeRef nodeRef, Long aclId)
     {
-        throw new UnsupportedOperationException();
+        Pair<Long, NodeRef> nodePair = getNodePairNotNull(nodeRef);
+        fNodeDAOService.setNodeAccessControlList(nodePair.getFirst(), aclId);
     }
 }
diff --git a/source/java/org/alfresco/repo/domain/hibernate/OldADMPermissionsDaoComponentImpl.java b/source/java/org/alfresco/repo/domain/hibernate/OldADMPermissionsDaoComponentImpl.java
index 7efd2f9927..cfc751ba3c 100644
--- a/source/java/org/alfresco/repo/domain/hibernate/OldADMPermissionsDaoComponentImpl.java
+++ b/source/java/org/alfresco/repo/domain/hibernate/OldADMPermissionsDaoComponentImpl.java
@@ -91,4 +91,13 @@ public class OldADMPermissionsDaoComponentImpl extends AbstractPermissionsDaoCom
             aclDaoComponent.deleteAccessControlList(acl.getId());
         }
     }
+    
+    public static SimpleAccessControlListProperties getDefaultProperties()
+    {
+        SimpleAccessControlListProperties properties = new SimpleAccessControlListProperties();
+        properties.setAclType(ACLType.OLD);
+        properties.setInherits(true);
+        properties.setVersioned(false);
+        return properties;
+    }
 }
diff --git a/source/java/org/alfresco/repo/domain/mimetype/AbstractMimetypeDAOImpl.java b/source/java/org/alfresco/repo/domain/mimetype/AbstractMimetypeDAOImpl.java
index ba7aa7a740..b3339499ff 100644
--- a/source/java/org/alfresco/repo/domain/mimetype/AbstractMimetypeDAOImpl.java
+++ b/source/java/org/alfresco/repo/domain/mimetype/AbstractMimetypeDAOImpl.java
@@ -23,6 +23,7 @@ import java.io.Serializable;
 import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.repo.cache.SimpleCache;
 import org.alfresco.util.Pair;
+import org.springframework.dao.ConcurrencyFailureException;
 import org.springframework.extensions.surf.util.ParameterCheck;
 
 /**
@@ -125,6 +126,35 @@ public abstract class AbstractMimetypeDAOImpl implements MimetypeDAO
         return result;
     }
     
+    public int updateMimetype(String oldMimetype, String newMimetype)
+    {
+        ParameterCheck.mandatory("oldMimetype", oldMimetype);
+        ParameterCheck.mandatory("newMimetype", newMimetype);
+        
+        Pair<Long, String> oldMimetypePair = getMimetype(oldMimetype);
+        if (oldMimetypePair == null)
+        {
+            // There is no mimetype currently, so there is nothing to update.
+            // Just do a create
+            getOrCreateMimetype(newMimetype);
+            return 0;
+        }
+        // The ID will remain the same
+        Long id = oldMimetypePair.getFirst();
+        // We have to update it
+        int count = updateMimetypeEntity(id, newMimetype);
+        if (count != 1)
+        {
+            throw new ConcurrencyFailureException("Concurrent update of mimetype: " + oldMimetype);
+        }
+        // Cache it
+        mimetypeEntityCache.remove(oldMimetype);
+        mimetypeEntityCache.put(id, newMimetype);
+        mimetypeEntityCache.put(newMimetype, id);
+        // Done
+        return count;
+    }
+
     /**
      * @param id            the ID of the mimetype entity
      * @return              Return the entity or <tt>null</tt> if it doesn't exist
@@ -132,4 +162,5 @@ public abstract class AbstractMimetypeDAOImpl implements MimetypeDAO
     protected abstract MimetypeEntity getMimetypeEntity(Long id);
     protected abstract MimetypeEntity getMimetypeEntity(String mimetype);
     protected abstract MimetypeEntity createMimetypeEntity(String mimetype);
+    protected abstract int updateMimetypeEntity(Long id, String newMimetype);
 }
diff --git a/source/java/org/alfresco/repo/domain/mimetype/MimetypeDAO.java b/source/java/org/alfresco/repo/domain/mimetype/MimetypeDAO.java
index 1f4ac7eef5..0d190e0b32 100644
--- a/source/java/org/alfresco/repo/domain/mimetype/MimetypeDAO.java
+++ b/source/java/org/alfresco/repo/domain/mimetype/MimetypeDAO.java
@@ -49,4 +49,15 @@ public interface MimetypeDAO
      * @return              the Mimetype pair (id, mimetype) (never null)
      */
     Pair<Long, String> getOrCreateMimetype(String mimetype);
+    
+    /**
+     * Update a mimetype if it exists.  This method does not do any conflict resolution
+     * i.e. it will only succeed if the new mimetype does not exist already.  Higher-level
+     * logic is required to handle updates to dependent rows, etc.
+     * 
+     * @param oldMimetype   the old Mimetype
+     * @param newMimetype   the new Mimetype
+     * @return              the number of rows modified
+     */
+    int updateMimetype(String oldMimetype, String newMimetype);
 }
diff --git a/source/java/org/alfresco/repo/domain/mimetype/MimetypeDAOTest.java b/source/java/org/alfresco/repo/domain/mimetype/MimetypeDAOTest.java
index 96abf55e5f..7b936a8aaa 100644
--- a/source/java/org/alfresco/repo/domain/mimetype/MimetypeDAOTest.java
+++ b/source/java/org/alfresco/repo/domain/mimetype/MimetypeDAOTest.java
@@ -136,4 +136,27 @@ public class MimetypeDAOTest extends TestCase
                 "Upper and lowercase mimetype instance IDs were not the same",
                 lowercasePair.getFirst(), uppercasePair.getFirst());
     }
+    
+    public void testUpdate() throws Exception
+    {
+        final String oldMimetype = GUID.generate();
+        final String newMimetype = GUID.generate();
+        Pair<Long, String> oldMimetypePair = get(oldMimetype, true, true);
+        // Update it
+        RetryingTransactionCallback<Pair<Long, String>> callback = new RetryingTransactionCallback<Pair<Long, String>>()
+        {
+            public Pair<Long, String> execute() throws Throwable
+            {
+                int count = mimetypeDAO.updateMimetype(oldMimetype, newMimetype);
+                assertEquals("Incorrect number updated", 1, count);
+                return mimetypeDAO.getMimetype(newMimetype);
+            }
+        };
+        Pair<Long, String> newMimetypePair = txnHelper.doInTransaction(callback, false, false);
+        // Check
+        assertEquals("ID should remain the same if the old mimetype existed",
+                oldMimetypePair.getFirst(), newMimetypePair.getFirst());
+        get(oldMimetype, false, false);
+        get(newMimetype, false, true);
+    }
 }
diff --git a/source/java/org/alfresco/repo/domain/mimetype/MimetypeEntity.java b/source/java/org/alfresco/repo/domain/mimetype/MimetypeEntity.java
index 1f75534acf..6a3946df03 100644
--- a/source/java/org/alfresco/repo/domain/mimetype/MimetypeEntity.java
+++ b/source/java/org/alfresco/repo/domain/mimetype/MimetypeEntity.java
@@ -72,6 +72,18 @@ public class MimetypeEntity
         return sb.toString();
     }
 
+    public void incrementVersion()
+    {
+        if (version >= Short.MAX_VALUE)
+        {
+            this.version = 0L;
+        }
+        else
+        {
+            this.version++;
+        }
+    }
+    
     public Long getId()
     {
         return id;
diff --git a/source/java/org/alfresco/repo/domain/mimetype/ibatis/MimetypeDAOImpl.java b/source/java/org/alfresco/repo/domain/mimetype/ibatis/MimetypeDAOImpl.java
index 4c76af6f89..3760003303 100644
--- a/source/java/org/alfresco/repo/domain/mimetype/ibatis/MimetypeDAOImpl.java
+++ b/source/java/org/alfresco/repo/domain/mimetype/ibatis/MimetypeDAOImpl.java
@@ -20,6 +20,7 @@ package org.alfresco.repo.domain.mimetype.ibatis;
 
 import org.alfresco.repo.domain.mimetype.AbstractMimetypeDAOImpl;
 import org.alfresco.repo.domain.mimetype.MimetypeEntity;
+import org.springframework.dao.DataIntegrityViolationException;
 import org.springframework.orm.ibatis.SqlMapClientTemplate;
 
 /**
@@ -33,6 +34,7 @@ public class MimetypeDAOImpl extends AbstractMimetypeDAOImpl
     private static final String SELECT_MIMETYPE_BY_ID = "alfresco.content.select_MimetypeById";
     private static final String SELECT_MIMETYPE_BY_KEY = "alfresco.content.select_MimetypeByKey";
     private static final String INSERT_MIMETYPE = "alfresco.content.insert_Mimetype";
+    private static final String UPDATE_MIMETYPE = "alfresco.content.update_Mimetype";
     
     private SqlMapClientTemplate template;
 
@@ -72,4 +74,18 @@ public class MimetypeDAOImpl extends AbstractMimetypeDAOImpl
         // Done
         return mimetypeEntity;
     }
+
+    @Override
+    protected int updateMimetypeEntity(Long id, String newMimetype)
+    {
+        MimetypeEntity mimetypeEntity = getMimetypeEntity(id);
+        if (mimetypeEntity == null)
+        {
+            throw new DataIntegrityViolationException(
+                    "Cannot update mimetype as ID doesn't exist: " + id);
+        }
+        mimetypeEntity.incrementVersion();
+        mimetypeEntity.setMimetype(newMimetype);
+        return template.update(UPDATE_MIMETYPE, mimetypeEntity);
+    }
 }
diff --git a/source/java/org/alfresco/repo/domain/patch/PatchDAO.java b/source/java/org/alfresco/repo/domain/patch/PatchDAO.java
index d9e8f86545..155538ae73 100644
--- a/source/java/org/alfresco/repo/domain/patch/PatchDAO.java
+++ b/source/java/org/alfresco/repo/domain/patch/PatchDAO.java
@@ -59,4 +59,13 @@ public interface PatchDAO
      * @param maxNodeId         the exclusive node ID to limit the updates to
      */
     public void updateAdmV31ContentProperties(Long minNodeId, Long maxNodeId);
+    
+    /**
+     * Update all <b>alf_content_data</b> mimetype references.
+     * 
+     * @param oldMimetypeId     the ID to search for
+     * @param newMimetypeId     the ID to change to
+     * @return                  the number of rows affected
+     */
+    public int updateContentMimetypeIds(Long oldMimetypeId, Long newMimetypeId);
 }
diff --git a/source/java/org/alfresco/repo/domain/patch/ibatis/PatchDAOImpl.java b/source/java/org/alfresco/repo/domain/patch/ibatis/PatchDAOImpl.java
index aa4d6d1c68..e575fa07fd 100644
--- a/source/java/org/alfresco/repo/domain/patch/ibatis/PatchDAOImpl.java
+++ b/source/java/org/alfresco/repo/domain/patch/ibatis/PatchDAOImpl.java
@@ -45,6 +45,7 @@ public class PatchDAOImpl extends AbstractPatchDAOImpl
     private static final String SELECT_AVM_NODES_WITH_OLD_CONTENT_PROPERTIES = "alfresco.patch.select_avmNodesWithOldContentProperties";
     private static final String SELECT_ADM_OLD_CONTENT_PROPERTIES = "alfresco.patch.select_admOldContentProperties";
     private static final String UPDATE_ADM_OLD_CONTENT_PROPERTY = "alfresco.patch.update_admOldContentProperty";
+    private static final String UPDATE_CONTENT_MIMETYPE_ID = "alfresco.patch.update_contentMimetypeId";
     
     private SqlMapClientTemplate template;
     
@@ -144,4 +145,12 @@ public class PatchDAOImpl extends AbstractPatchDAOImpl
         params.put("longValue", longValue);
         template.update(UPDATE_ADM_OLD_CONTENT_PROPERTY, params);
     }
+
+    public int updateContentMimetypeIds(Long oldMimetypeId, Long newMimetypeId)
+    {
+        Map<String, Object> params = new HashMap<String, Object>(11);
+        params.put("newMimetypeId", newMimetypeId);
+        params.put("oldMimetypeId", oldMimetypeId);
+        return template.update(UPDATE_CONTENT_MIMETYPE_ID, params);
+    }
 }
diff --git a/source/java/org/alfresco/repo/domain/propval/PropertyValueDAOTest.java b/source/java/org/alfresco/repo/domain/propval/PropertyValueDAOTest.java
index e9cb57d4f8..1ba93818ec 100644
--- a/source/java/org/alfresco/repo/domain/propval/PropertyValueDAOTest.java
+++ b/source/java/org/alfresco/repo/domain/propval/PropertyValueDAOTest.java
@@ -242,7 +242,7 @@ public class PropertyValueDAOTest extends TestCase
     
     public void testPropertyDoubleValue() throws Exception
     {
-        final Double doubleValue = Double.valueOf(1.7976931348623E+308);
+        final Double doubleValue = Double.valueOf(1.7976931348623E+125);
         RetryingTransactionCallback<Pair<Long, Double>> createValueCallback = new RetryingTransactionCallback<Pair<Long, Double>>()
         {
             public Pair<Long, Double> execute() throws Throwable
diff --git a/source/java/org/alfresco/repo/forms/processor/node/TypeFormProcessor.java b/source/java/org/alfresco/repo/forms/processor/node/TypeFormProcessor.java
index b63be6c027..16153634e4 100644
--- a/source/java/org/alfresco/repo/forms/processor/node/TypeFormProcessor.java
+++ b/source/java/org/alfresco/repo/forms/processor/node/TypeFormProcessor.java
@@ -256,7 +256,7 @@ public class TypeFormProcessor extends ContentModelFormProcessor<TypeDefinition,
 					}
     				
     			}, 
-    			AuthenticationUtil.getAdminUserName());
+    			AuthenticationUtil.getSystemUserName());
         }
         else
         {
diff --git a/source/java/org/alfresco/repo/imap/AlfrescoImapFolder.java b/source/java/org/alfresco/repo/imap/AlfrescoImapFolder.java
index d7521f24cf..f2d4ce46a7 100644
--- a/source/java/org/alfresco/repo/imap/AlfrescoImapFolder.java
+++ b/source/java/org/alfresco/repo/imap/AlfrescoImapFolder.java
@@ -461,12 +461,12 @@ public class AlfrescoImapFolder extends AbstractImapFolder
             logger.debug("getMessageCountInternal entry");
         }
         
-        if (messages.size() == 0)
+        if (messages.size() == 0 && folderInfo != null)
         {
-            List<FileInfo> fileInfos = imapService.searchMails(folderInfo.getNodeRef(), "*", viewMode, false);
+            List<FileInfo> fileInfos = imapService.searchMails(folderInfo.getNodeRef(), viewMode);
             getMessages(fileInfos);
         }
-        if (logger.isDebugEnabled())
+        if (logger.isDebugEnabled() && folderInfo != null)
         {
             logger.debug(folderInfo.getName() + " - Messages count:" + messages.size());
         }
@@ -481,9 +481,9 @@ public class AlfrescoImapFolder extends AbstractImapFolder
     @Override
     protected long[] getMessageUidsInternal()
     {
-        if (messages == null || messages.size() == 0)
+        if (messages == null || messages.size() == 0 && folderInfo != null)
         {
-            List<FileInfo> fileInfos = imapService.searchMails(folderInfo.getNodeRef(), "*", viewMode, false);
+            List<FileInfo> fileInfos = imapService.searchMails(folderInfo.getNodeRef(), viewMode);
             getMessages(fileInfos);
         }
         int len = messages.size();
@@ -505,7 +505,7 @@ public class AlfrescoImapFolder extends AbstractImapFolder
     @Override
     protected List<SimpleStoredMessage> getMessagesInternal()
     {
-        List<FileInfo> fileInfos = imapService.searchMails(folderInfo.getNodeRef(), "*", viewMode, false);
+        List<FileInfo> fileInfos = imapService.searchMails(folderInfo.getNodeRef(), viewMode);
         return getMessages(fileInfos);
     }
 
@@ -513,6 +513,7 @@ public class AlfrescoImapFolder extends AbstractImapFolder
     {
         if (fileInfos == null || fileInfos.size() == 0)
         {
+            logger.debug("getMessages - fileInfos is empty or null");
             return Collections.emptyList();
         }
         if (fileInfos.size() != messages.size())
@@ -569,7 +570,7 @@ public class AlfrescoImapFolder extends AbstractImapFolder
         }
         if (messages == null || messages.size() == 0)
         {
-            List<FileInfo> fileInfos = imapService.searchMails(folderInfo.getNodeRef(), "*", viewMode, false);
+            List<FileInfo> fileInfos = imapService.searchMails(folderInfo.getNodeRef(), viewMode);
             getMessages(fileInfos);
         }
         List<SimpleStoredMessage> ret = new ArrayList<SimpleStoredMessage>();
@@ -628,9 +629,9 @@ public class AlfrescoImapFolder extends AbstractImapFolder
     {
         List<SimpleStoredMessage> result = new ArrayList<SimpleStoredMessage>();
 
-        if (messages.size() == 0)
+        if (messages.size() == 0 && folderInfo != null)
         {
-            List<FileInfo> fileInfos = imapService.searchMails(folderInfo.getNodeRef(), "*", viewMode, false);
+            List<FileInfo> fileInfos = imapService.searchMails(folderInfo.getNodeRef(), viewMode);
             getMessages(fileInfos);
         }
 
@@ -643,7 +644,7 @@ public class AlfrescoImapFolder extends AbstractImapFolder
             }
 
         }
-        if (logger.isDebugEnabled())
+        if (logger.isDebugEnabled() && folderInfo != null)
         {
             logger.debug(folderInfo.getName() + " - Non deleted messages count:" + result.size());
         }
@@ -672,9 +673,9 @@ public class AlfrescoImapFolder extends AbstractImapFolder
     @Override
     protected int getRecentCountInternal(boolean reset)
     {
-        if (messages.size() == 0)
+        if (messages.size() == 0 && folderInfo != null)
         {
-            List<FileInfo> fileInfos = imapService.searchMails(folderInfo.getNodeRef(), "*", viewMode, false);
+            List<FileInfo> fileInfos = imapService.searchMails(folderInfo.getNodeRef(), viewMode);
             getMessages(fileInfos);
         }
 
@@ -693,7 +694,7 @@ public class AlfrescoImapFolder extends AbstractImapFolder
 
         }
 
-        if (logger.isDebugEnabled())
+        if (logger.isDebugEnabled() && folderInfo != null)
         {
             logger.debug(folderInfo.getName() + " - Recent count: " + count + " reset: " + reset);
         }
@@ -731,9 +732,9 @@ public class AlfrescoImapFolder extends AbstractImapFolder
     @Override
     protected int getUnseenCountInternal()
     {
-        if (messages.size() == 0)
+        if (messages.size() == 0 && folderInfo != null)
         {
-            List<FileInfo> fileInfos = imapService.searchMails(folderInfo.getNodeRef(), "*", viewMode, false);
+            List<FileInfo> fileInfos = imapService.searchMails(folderInfo.getNodeRef(), viewMode);
             getMessages(fileInfos);
         }
 
@@ -747,7 +748,7 @@ public class AlfrescoImapFolder extends AbstractImapFolder
             }
 
         }
-        if (logger.isDebugEnabled())
+        if (logger.isDebugEnabled() && folderInfo != null)
         {
             logger.debug(folderInfo.getName() + " - Unseen count: " + count);
         }
diff --git a/source/java/org/alfresco/repo/imap/ImapService.java b/source/java/org/alfresco/repo/imap/ImapService.java
index 2a2a9b5452..4b2bee07ed 100644
--- a/source/java/org/alfresco/repo/imap/ImapService.java
+++ b/source/java/org/alfresco/repo/imap/ImapService.java
@@ -118,26 +118,26 @@ public interface ImapService
      */
     public void unsubscribe(AlfrescoImapUser user, String mailbox);
 
-    /**
-     * Search for files in specified context
-     * 
-     * @param contextNodeRef context folder for search
-     * @param namePattern name pattern for search
-     * @param includeSubFolders include SubFolders
-     * @return list of files
-     */
-    public List<FileInfo> searchFiles(NodeRef contextNodeRef, String namePattern, boolean includeSubFolders);
+//    /**
+//     * Search for files in specified context
+//     * 
+//     * @param contextNodeRef context folder for search
+//     * @param namePattern name pattern for search
+//     * @param includeSubFolders include SubFolders
+//     * @return list of files
+//     */
+//    public List<FileInfo> searchFiles(NodeRef contextNodeRef, String namePattern, boolean includeSubFolders);
 
-    /**
-     * Search for mailboxes in specified context
-     * 
-     * @param contextNodeRef context folder for search
-     * @param namePattern name pattern for search
-     * @param includeSubFolders include SubFolders
-     * @param viewMode (ARCHIVE, MIXED or VIRTUAL)
-     * @return list of mailboxes that are visible from specified view
-     */
-    public List<FileInfo> searchFolders(NodeRef contextNodeRef, String namePattern, boolean includeSubFolders, ImapViewMode viewMode);
+//    /**
+//     * Search for mailboxes in specified context
+//     * 
+//     * @param contextNodeRef context folder for search
+//     * @param namePattern name pattern for search
+//     * @param includeSubFolders include SubFolders
+//     * @param viewMode (ARCHIVE, MIXED or VIRTUAL)
+//     * @return list of mailboxes that are visible from specified view
+//     */
+//    public List<FileInfo> searchFolders(NodeRef contextNodeRef, String namePattern, boolean includeSubFolders, ImapViewMode viewMode);
 
     /**
      * Search for emails in specified folder depend on view mode.
@@ -148,7 +148,7 @@ public interface ImapService
      * @param includeSubFolders includeSubFolders
      * @return list of emails that context folder contains.
      */
-    public List<FileInfo> searchMails(NodeRef contextNodeRef, String namePattern, ImapViewMode viewMode, boolean includeSubFolders);
+    public List<FileInfo> searchMails(NodeRef contextNodeRef, ImapViewMode viewMode);
 
     /**
      * Return flags that belong to the specified imap folder.
diff --git a/source/java/org/alfresco/repo/imap/ImapServiceImpl.java b/source/java/org/alfresco/repo/imap/ImapServiceImpl.java
index aabf5ce84b..4f09581c65 100644
--- a/source/java/org/alfresco/repo/imap/ImapServiceImpl.java
+++ b/source/java/org/alfresco/repo/imap/ImapServiceImpl.java
@@ -20,6 +20,7 @@ package org.alfresco.repo.imap;
 
 import java.io.Serializable;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -39,12 +40,15 @@ import org.alfresco.repo.admin.SysAdminParams;
 import org.alfresco.repo.imap.AlfrescoImapConst.ImapViewMode;
 import org.alfresco.repo.imap.config.ImapConfigMountPointsBean;
 import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.site.SiteModel;
 import org.alfresco.repo.site.SiteServiceException;
 import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
 import org.alfresco.service.ServiceRegistry;
 import org.alfresco.service.cmr.model.FileFolderService;
 import org.alfresco.service.cmr.model.FileInfo;
+import org.alfresco.service.cmr.model.SubFolderFilter;
 import org.alfresco.service.cmr.preference.PreferenceService;
+import org.alfresco.service.cmr.repository.ChildAssociationRef;
 import org.alfresco.service.cmr.repository.InvalidNodeRefException;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.NodeService;
@@ -370,12 +374,13 @@ public class ImapServiceImpl implements ImapService
         NodeRef parentNodeRef = root; // it is used for hierarhy deep search.
         for (String folderName : getMailPathInRepo(mailboxName).split(String.valueOf(AlfrescoImapConst.HIERARCHY_DELIMITER)))
         {
-            List<FileInfo> folders = searchFolders(parentNodeRef, folderName, false, ImapViewMode.MIXED);
+            NodeRef child = fileFolderService.searchSimple(parentNodeRef, folderName);
+            
             if (logger.isDebugEnabled())
             {
                 logger.debug("Trying to create folder '" + folderName + "'");
             }
-            if (folders.size() == 0)
+            if (child == null)
             {
                 // folder doesn't exist
                 AccessStatus status = permissionService.hasPermission(parentNodeRef, PermissionService.CREATE_CHILDREN);
@@ -402,7 +407,7 @@ public class ImapServiceImpl implements ImapService
                     logger.debug("Folder '" + folderName + "' already exists");
                 }
                 // next search from new parent
-                parentNodeRef = folders.get(0).getNodeRef();
+                parentNodeRef = child;
             }
         }
         throw new AlfrescoRuntimeException(ERROR_FOLDER_ALREADY_EXISTS);
@@ -410,19 +415,19 @@ public class ImapServiceImpl implements ImapService
 
     public void deleteMailbox(AlfrescoImapUser user, String mailboxName)
     {
+        if (logger.isDebugEnabled())
+        {
+            logger.debug("Delete mailbox: mailboxName=" + mailboxName);
+        }
         if (mailboxName == null)
         {
             throw new IllegalArgumentException(I18NUtil.getMessage(ERROR_MAILBOX_NAME_IS_MANDATORY));
         }
-        if (logger.isDebugEnabled())
-        {
-            logger.debug("Deleting folder: mailboxName=" + mailboxName);
-        }
 
         AlfrescoImapFolder folder = getFolder(user, mailboxName);
         NodeRef nodeRef = folder.getFolderInfo().getNodeRef();
-
-        List<FileInfo> childFolders = searchFolders(nodeRef, "*", false, folder.getViewMode());
+        
+        List<FileInfo> childFolders = fileFolderService.listFolders(nodeRef);
 
         if (childFolders.isEmpty())
         {
@@ -436,7 +441,7 @@ public class ImapServiceImpl implements ImapService
             {
                 // Delete all messages for this folder
                 // Don't delete subfolders and their messages
-                List<FileInfo> messages = searchFiles(nodeRef, "*", false);
+                List<FileInfo> messages = fileFolderService.listFiles(nodeRef);
                 for (FileInfo message : messages)
                 {
                     fileFolderService.delete(message.getNodeRef());
@@ -489,10 +494,11 @@ public class ImapServiceImpl implements ImapService
                     }
                 }
                 else
-                // not last element than checks if it exists and creates if doesn't
                 {
-                    List<FileInfo> folders = searchFolders(parentNodeRef, folderName, false, sourceNode.getViewMode());
-                    if (folders.size() == 0)
+                    // not last element than checks if it exists and creates if doesn't
+                    NodeRef child = fileFolderService.searchSimple(parentNodeRef, folderName);
+                                      
+                    if (child == null)
                     {
                         // check creation permission
                         AccessStatus status = permissionService.hasPermission(parentNodeRef, PermissionService.CREATE_CHILDREN);
@@ -509,7 +515,7 @@ public class ImapServiceImpl implements ImapService
                     }
                     else
                     {
-                        parentNodeRef = folders.get(0).getNodeRef();
+                        parentNodeRef = child;
                         if (logger.isDebugEnabled())
                         {
                             logger.debug("Folder '" + folderName + "' already exists");
@@ -531,12 +537,17 @@ public class ImapServiceImpl implements ImapService
         }
     }
 
+    /**
+     * Get Folder
+     * @param user
+     * @param mailboxName
+     */
     public AlfrescoImapFolder getFolder(AlfrescoImapUser user, String mailboxName)
     {
         mailboxName = Utf7.decode(mailboxName, Utf7.UTF7_MODIFIED);
         if (logger.isDebugEnabled())
         {
-            logger.debug("Getting folder '" + mailboxName + "'");
+            logger.debug("Get folder '" + mailboxName + "'");
         }
         // If MailFolder object is used to obtain hierarchy delimiter by LIST command:
         // Example:
@@ -552,36 +563,65 @@ public class ImapServiceImpl implements ImapService
             return new AlfrescoImapFolder(user.getQualifiedMailboxName(), serviceRegistry);
         }
 
-        NodeRef root = getMailboxRootRef(mailboxName, user.getLogin());
-        String mountPointName = getMountPointName(mailboxName);
-        NodeRef nodeRef = root; // initial top folder
         ImapViewMode viewMode = getViewMode(mailboxName);
-
+        String mountPointName = getMountPointName(mailboxName);
+        
+        NodeRef root = getMailboxRootRef(mailboxName, user.getLogin());
+        NodeRef nodeRef = root; // initial top folder
+        
         String[] folderNames = getMailPathInRepo(mailboxName).split(String.valueOf(AlfrescoImapConst.HIERARCHY_DELIMITER));
-
+        
+        if(folderNames.length == 1 && folderNames[0].length() == 0)
+        {
+            // This is the root of the mount point e.g "Alfresco IMAP" which has a path from root of ""
+            FileInfo folderFileInfo = fileFolderService.getFileInfo(root);
+            
+            AlfrescoImapFolder folder = new AlfrescoImapFolder(
+                    user.getQualifiedMailboxName(),
+                    folderFileInfo,
+                    mountPointName,
+                    viewMode,
+                    root,
+                    mountPointName,
+                    isExtractionEnabled(folderFileInfo.getNodeRef()),
+                    serviceRegistry);
+        
+            if (logger.isDebugEnabled())
+            {
+                logger.debug("Returning root folder '" + mailboxName + "'");
+            }
+            return folder;
+        }
+      
         for (int i = 0; i < folderNames.length; i++)
         {
             if (logger.isDebugEnabled())
             {
                 logger.debug("Processing of " + folderNames[i]);
-            }            
-            NodeRef targetNode = nodeService.getChildByName(nodeRef, ContentModel.ASSOC_CONTAINS, folderNames[i]);
+            } 
+            
+            NodeRef targetNode = fileFolderService.searchSimple(nodeRef, folderNames[i]);
+            
             if (targetNode == null)
             {
-                List<FileInfo> folderList = searchFolders(nodeRef, folderNames[i], false, viewMode);
-                if (folderList != null && !folderList.isEmpty() && folderList.get(0) != null)
+                AlfrescoImapFolder folder = new AlfrescoImapFolder(user.getQualifiedMailboxName(), serviceRegistry);
+                if (logger.isDebugEnabled())
                 {
-                    targetNode = folderList.get(0).getNodeRef();
+                    logger.debug("Returning empty folder '" + folderNames[i]);
                 }
+                return folder;
             }
-            if (targetNode == null)
-            {
-                return new AlfrescoImapFolder(user.getQualifiedMailboxName(), serviceRegistry);
-            }             
+            
             if (i == (folderNames.length - 1)) // is last
             {
+                if (logger.isDebugEnabled())
+                {
+                    logger.debug("found folder to list ");
+                }
+                
                 FileInfo folderFileInfo = fileFolderService.getFileInfo(targetNode);
-                return new AlfrescoImapFolder(
+                
+                AlfrescoImapFolder folder = new AlfrescoImapFolder(
                         user.getQualifiedMailboxName(),
                         folderFileInfo,
                         folderFileInfo.getName(),
@@ -590,146 +630,245 @@ public class ImapServiceImpl implements ImapService
                         mountPointName,
                         isExtractionEnabled(folderFileInfo.getNodeRef()),
                         serviceRegistry);
+            
+                if (logger.isDebugEnabled())
+                {
+                    logger.debug("Returning folder '" + mailboxName + "'");
+                }
+                return folder;
             }
-            else
-            {
-                nodeRef = targetNode; // next parent
-            }
+  
+            /**
+             * End of loop - next element in path
+             */
+            nodeRef = targetNode;
+        }
+        
+        if (logger.isDebugEnabled())
+        {
+            logger.debug("Cannot get a folder '" + mailboxName + "'");
         }
-
         throw new AlfrescoRuntimeException(ERROR_CANNOT_GET_A_FOLDER, new String[] { mailboxName });
     }
+    
+    /**
+     * Deep search for mailboxes/folders in the specified context
+     * 
+     * Certain folders are excluded depending upon the view mode.
+     * - For ARCHIVE mode all Share Sites are excluded.
+     * - For MIXED and VIRTUAL non favourite sites are excluded.
+     * 
+     * @param contextNodeRef context folder for search
+     * @param viewMode is folder in "Virtual" View
+     * @return list of mailboxes/folders
+     */
+    private List<FileInfo> searchDeep(final NodeRef contextNodeRef, final ImapViewMode viewMode)
+    {     
+        if (logger.isDebugEnabled())
+        {
+            logger.debug("searchDeep start " + contextNodeRef + ", " + viewMode);
+        }
+        
+        /**
+         * Exclude Share Sites of TYPE_SITE
+         */
+        final Collection<QName> typesToExclude = getServiceRegistry().getDictionaryService().getSubTypes(SiteModel.TYPE_SITE, true);
+        
+        /**
+         * Share Site Exclusion Filter
+         */
+        SubFolderFilter filter =  new SubFolderFilter()
+        {
+            List<NodeRef> favs = null;
+            public boolean isEnterSubfolder(ChildAssociationRef subfolderRef)
+            {
+              
+               NodeRef folder = subfolderRef.getChildRef();
+               QName typeOfFolder = nodeService.getType(folder);
+               if(typesToExclude.contains(typeOfFolder))
+               {
+                   if (viewMode == ImapViewMode.VIRTUAL || viewMode == ImapViewMode.MIXED)
+                   {
+                       /**
+                        * In VIRTUAL and MIXED MODE WE SHOULD ONLY DISPLAY FOLDERS FROM FAVOURITE SITES
+                        */
+                       if(favs == null)
+                       {
+                           favs = getFavouriteSites(getCurrentUser());
+                       }
+                       
+                       if(favs.contains(folder))
+                       {
+                           logger.debug("searchDeep (VIRTUAL) including fav site folder :" + subfolderRef.getQName());
+                           return true;
+                       }
+                       else
+                       {
+                           logger.debug("searchDeep (VIRTUAL) excluding non fav site folder :" + subfolderRef.getQName());
+                           return false;
+                       }
+                   }
+                   else
+                   {
+                       /**
+                        * IN ARCHIVE MODE we don't display folders for any SITES, regardless of whether they are favourites.
+                        */
+                       logger.debug("searchDeep (ARCHIVE) excluding site folder :" + subfolderRef.getQName());
+                       return false;
+                   }
+               }
+               return true;
+            }
+       }; 
+            
+        
+        List<FileInfo> searchResult = fileFolderService.listDeepFolders(contextNodeRef, filter);        
+        
+        if (logger.isDebugEnabled())
+        {
+            logger.debug("SearchDeep folders return at end");
+        }
+        return new ArrayList<FileInfo>(searchResult);
+    }
+
 
     /**
-     * Search for mailboxes in specified context
+     * Shallow search for mailboxes in specified context
      * 
      * @param contextNodeRef context folder for search
      * @param namePattern name pattern for search
-     * @param includeSubFolders include SubFolders
-     * @param isVirtualView is folder in "Virtual" View
+     * @param viewMode is folder in "Virtual" View
      * @return list of mailboxes
      */
-    public List<FileInfo> searchFolders(NodeRef contextNodeRef, String namePattern, boolean includeSubFolders, ImapViewMode viewMode)
+    private List<FileInfo> searchFolders(NodeRef contextNodeRef, String namePattern, ImapViewMode viewMode)
     {
         if (logger.isDebugEnabled())
         {
-            logger.debug("Search folders namePattern" + namePattern);
+            logger.debug("Search folders, contextNodeRef" + contextNodeRef + " namePattern, " + namePattern);
         }
-           
-        List<FileInfo> searchResult = fileFolderService.search(contextNodeRef, namePattern, false, true, includeSubFolders);
-        Set<FileInfo> result = new HashSet<FileInfo>(searchResult);
-        if (viewMode == ImapViewMode.VIRTUAL || viewMode == ImapViewMode.MIXED)
+        
+        List<FileInfo> searchResult; 
+        
+        /**
+         * Shallow search for all folders below contextNodeRef
+         */
+        if("*".equals(namePattern))
         {
-            List<SiteInfo> nonFavSites = getNonFavouriteSites(getCurrentUser());
-            for (SiteInfo siteInfo : nonFavSites)
-            {
-                FileInfo nonFavSite = fileFolderService.getFileInfo(siteInfo.getNodeRef());
-                List<FileInfo> siteChilds = fileFolderService.search(nonFavSite.getNodeRef(), namePattern, false, true, true);
-                result.removeAll(siteChilds);
-                result.remove(nonFavSite);
-            }
-
+            /**
+             * This is a simple listing of all folders below contextNodeRef
+             */
+            searchResult = fileFolderService.listFolders(contextNodeRef);
         }
         else
         {
-            // Remove folders from Sites
-            List<SiteInfo> sites = serviceRegistry.getTransactionService().getRetryingTransactionHelper().doInTransaction(new RetryingTransactionCallback<List<SiteInfo>>()
-            {
-                public List<SiteInfo> execute() throws Exception
-                {
-                    List<SiteInfo> res = new ArrayList<SiteInfo>();
-                    try
-                    {
-
-                        res = serviceRegistry.getSiteService().listSites(getCurrentUser());
-                    }
-                    catch (SiteServiceException e)
-                    {
-                        // Do nothing. Root sites folder was not created.
-                        if (logger.isWarnEnabled())
-                        {
-                            logger.warn("Root sites folder was not created.");
-                        }
-                    }
-                    catch (InvalidNodeRefException e)
-                    {
-                        // Do nothing. Root sites folder was deleted.
-                        if (logger.isWarnEnabled())
-                        {
-                            logger.warn("Root sites folder was deleted.");
-                        }
-                    }
-                    
-                    if (logger.isDebugEnabled())
-                    {
-                        logger.debug("Search folders return ");
-                    }
-
-                    return res;
-                }
-            }, false, true);
-            for (SiteInfo siteInfo : sites)
-            {
-                List<FileInfo> siteChilds = fileFolderService.search(siteInfo.getNodeRef(), namePattern, false, true, true);
-                result.removeAll(siteChilds);
-                // remove site
-                result.remove(fileFolderService.getFileInfo(siteInfo.getNodeRef()));
-            }
-
+            // MER TODO I'm not sure we ever get here in real use of IMAP.   But if we do then the use of this 
+            // deprecated method needs to be re-worked. 
+            searchResult = fileFolderService.search(contextNodeRef, namePattern, false, true, false);
         }
         
+        
+// DO WE NEED TO WORRY ABOUT THE STUFF BELOW ?  
+// WOULD ONLY BE RELEVANT if ContextNodeRef is site root.        
+// IF contextNodeRef is the imap home or the contextNodeRef is in the depths of a non favourite site.
+//        
+//        Set<FileInfo> result = new HashSet<FileInfo>(searchResult);
+//        if (viewMode == ImapViewMode.VIRTUAL || viewMode == ImapViewMode.MIXED)
+//        {
+//            /**
+//             * In VIRTUAL and MIXED MODE WE SHOULD ONLY DISPLAY FAVOURITE SITES
+//             */
+//            List<SiteInfo> nonFavSites = getNonFavouriteSites(getCurrentUser());
+//            for (SiteInfo siteInfo : nonFavSites)
+//            {
+//                FileInfo nonFavSite = fileFolderService.getFileInfo(siteInfo.getNodeRef());
+//                
+//                // search deep for all folders in the site
+//                List<FileInfo> siteChilds = fileFolderService.search(nonFavSite.getNodeRef(), namePattern, false, true, true);
+//                result.removeAll(siteChilds);
+//                result.remove(nonFavSite);
+//            }
+//
+//        }
+//        else
+//        {
+//            /**
+//             * IN ARCHIVE MODE we don't display folders any SITES
+//             */
+//            // Remove folders from Sites
+//            List<SiteInfo> sites = serviceRegistry.getTransactionService().getRetryingTransactionHelper().doInTransaction(new RetryingTransactionCallback<List<SiteInfo>>()
+//            {
+//                public List<SiteInfo> execute() throws Exception
+//                {
+//                    List<SiteInfo> res = new ArrayList<SiteInfo>();
+//                    try
+//                    {
+//
+//                        res = serviceRegistry.getSiteService().listSites(getCurrentUser());
+//                    }
+//                    catch (SiteServiceException e)
+//                    {
+//                        // Do nothing. Root sites folder was not created.
+//                        if (logger.isWarnEnabled())
+//                        {
+//                            logger.warn("Root sites folder was not created.");
+//                        }
+//                    }
+//                    catch (InvalidNodeRefException e)
+//                    {
+//                        // Do nothing. Root sites folder was deleted.
+//                        if (logger.isWarnEnabled())
+//                        {
+//                            logger.warn("Root sites folder was deleted.");
+//                        }
+//                    }
+//                    
+//                    if (logger.isDebugEnabled())
+//                    {
+//                        logger.debug("Search folders return ");
+//                    }
+//
+//                    return res;
+//                }
+//            }, false, true);
+//            
+//            for (SiteInfo siteInfo : sites)
+//            {
+//                List<FileInfo> siteChilds = fileFolderService.search(siteInfo.getNodeRef(), namePattern, false, true, true);
+//                result.removeAll(siteChilds);
+//                // remove site
+//                result.remove(fileFolderService.getFileInfo(siteInfo.getNodeRef()));
+//            }
+//
+//        }
+        
         if (logger.isDebugEnabled())
         {
-            logger.debug("Search folders return at end");
+            logger.debug("Search folders return at end, namePattern:" + namePattern);
         }
-        return new ArrayList<FileInfo>(result);
+       
+        return searchResult;
     }
 
     /**
-     * Search for files in specified context
+     * Search for emails in specified folder depending on view mode.
+     * 
+     * Shallow list of files
      * 
      * @param contextNodeRef context folder for search
-     * @param namePattern name pattern for search
-     * @param searchType type for search
-     * @param includeSubFolders include SubFolders
-     * @return list of files with specifed type
-     */
-    public List<FileInfo> searchFiles(NodeRef contextNodeRef, String namePattern, boolean includeSubFolders)
-    {
-
-        if (logger.isDebugEnabled())
-        {
-            logger.debug("Search files namePattern," + contextNodeRef + ", " + namePattern + ", " + includeSubFolders);
-        }
-        
-        List<FileInfo> files = fileFolderService.search(contextNodeRef, namePattern, true, false, includeSubFolders);
-        
-        if (logger.isDebugEnabled())
-        {
-            logger.debug("Search files return");
-        }
-        
-        return files;
-    }
-
-    /**
-     * Search for emails in specified folder depend on view mode.
-     * 
-     * @param contextNodeRef context folder for search
-     * @param namePattern name pattern for search
      * @param viewMode context folder view mode
-     * @param includeSubFolders includeSubFolders
      * @return list of emails that context folder contains.
      */
-    public List<FileInfo> searchMails(NodeRef contextNodeRef, String namePattern, ImapViewMode viewMode, boolean includeSubFolders)
+    public List<FileInfo> searchMails(NodeRef contextNodeRef, ImapViewMode viewMode)
     {
         if (logger.isDebugEnabled())
         {
-            logger.debug("Search mails namePattern," + contextNodeRef + ", " + namePattern + ", " + viewMode + ", " + includeSubFolders);
+            logger.debug("Search mails namePattern," + contextNodeRef + ", " + viewMode );
         }
         
+        List<FileInfo> searchResult = fileFolderService.listFiles(contextNodeRef);
+        
         List<FileInfo> result = new LinkedList<FileInfo>();
-        List<FileInfo> searchResult = fileFolderService.search(contextNodeRef, namePattern, true, false, includeSubFolders);
+        //List<FileInfo> searchResult = fileFolderService.search(contextNodeRef, namePattern, true, false, includeSubFolders);
         switch (viewMode)
         {
         case MIXED:
@@ -755,6 +894,7 @@ public class ImapServiceImpl implements ImapService
             break;
         }
 
+        logger.debug("found files:" + result.size());
         return result;
     }
 
@@ -762,7 +902,7 @@ public class ImapServiceImpl implements ImapService
     {
         if (logger.isDebugEnabled())
         {
-            logger.debug("Subscribing: " + mailbox);
+            logger.debug("Subscribing: " + user + ", " + mailbox);
         }
         AlfrescoImapFolder mailFolder = getFolder(user, mailbox);
         nodeService.removeAspect(mailFolder.getFolderInfo().getNodeRef(), ImapModel.ASPECT_IMAP_FOLDER_NONSUBSCRIBED);
@@ -772,10 +912,19 @@ public class ImapServiceImpl implements ImapService
     {
         if (logger.isDebugEnabled())
         {
-            logger.debug("Unsubscribing: " + mailbox);
+            logger.debug("Unsubscribing: " + user + ", " + mailbox);
         }
         AlfrescoImapFolder mailFolder = getFolder(user, mailbox);
-        nodeService.addAspect(mailFolder.getFolderInfo().getNodeRef(), ImapModel.ASPECT_IMAP_FOLDER_NONSUBSCRIBED, null);
+        if(mailFolder.getFolderInfo() != null)
+        {
+            logger.debug("unsubscribing by ASPECT_IMAP_FOLDER_NONSUBSCRIBED");
+            nodeService.addAspect(mailFolder.getFolderInfo().getNodeRef(), ImapModel.ASPECT_IMAP_FOLDER_NONSUBSCRIBED, null);
+        }
+        else
+        {
+            // perhaps the folder has been deleted by another async process?
+            logger.debug("Unable to find folder to unsubscribe");
+        }
     }
 
     /**
@@ -811,6 +960,8 @@ public class ImapServiceImpl implements ImapService
     public synchronized void setFlags(FileInfo messageInfo, Flags flags, boolean value)
     {
         checkForFlaggableAspect(messageInfo.getNodeRef());
+        
+
         for (Flags.Flag flag : flags.getSystemFlags())
         {
             setFlag(messageInfo, flag, value);
@@ -826,8 +977,18 @@ public class ImapServiceImpl implements ImapService
      */
     public void setFlag(FileInfo messageInfo, Flag flag, boolean value)
     {
-        checkForFlaggableAspect(messageInfo.getNodeRef());
-        nodeService.setProperty(messageInfo.getNodeRef(), flagToQname.get(flag), value);
+        NodeRef nodeRef = messageInfo.getNodeRef();
+        checkForFlaggableAspect(nodeRef);
+        AccessStatus status = permissionService.hasPermission(nodeRef, PermissionService.WRITE_PROPERTIES);
+        if (status == AccessStatus.DENIED)
+        {
+            logger.debug("checkForFlaggableAspect - no permissions to add FLAG " + nodeRef);
+            //TODO should we throw an exception here?
+        }
+        else
+        {
+            nodeService.setProperty(messageInfo.getNodeRef(), flagToQname.get(flag), value);
+        }
     }
 
     /**
@@ -835,6 +996,10 @@ public class ImapServiceImpl implements ImapService
      */
     private List<AlfrescoImapFolder> listMailboxes(AlfrescoImapUser user, String mailboxPattern, boolean listSubscribed)
     {
+        if(logger.isDebugEnabled())
+        {
+            logger.debug("listMailboxes" + user + ", mailboxPattern:" + mailboxPattern + ", listSubscribed:" + listSubscribed);
+        }
         List<AlfrescoImapFolder> result = new LinkedList<AlfrescoImapFolder>();
 
         Map<String, NodeRef> mountPoints = getMountPoints();
@@ -900,7 +1065,8 @@ public class ImapServiceImpl implements ImapService
                                     isExtractionEnabled(mountPointFileInfo.getNodeRef())));
                 }
             }
-
+            
+            
         }
 
         // List mailboxes that are in user IMAP Home
@@ -917,11 +1083,24 @@ public class ImapServiceImpl implements ImapService
             }
             result.addAll(imapFolders);
         }
+        
+        logger.debug("listMailboxes returning size:" + result.size());
 
         return result;
 
     }
 
+    /**
+     * Get the list of folders
+     * 
+     * @param mailboxRoot
+     * @param root
+     * @param user
+     * @param mailboxPattern
+     * @param listSubscribed
+     * @param viewMode
+     * @return
+     */
     private List<AlfrescoImapFolder> listFolder(
             NodeRef mailboxRoot,
             NodeRef root,
@@ -932,7 +1111,7 @@ public class ImapServiceImpl implements ImapService
     {
         if (logger.isDebugEnabled())
         {
-            logger.debug("Listing mailboxes: mailboxPattern=" + mailboxPattern);
+            logger.debug("List folder: mailboxPattern=" + mailboxPattern);
         }
 
         int index = mailboxPattern.indexOf(AlfrescoImapConst.HIERARCHY_DELIMITER);
@@ -957,9 +1136,12 @@ public class ImapServiceImpl implements ImapService
 
         if (index < 0)
         {
+            // This is the last level
+            
             if ("*".equals(name))
             {
-                Collection<FileInfo> list = searchFolders(root, name, true, viewMode);
+                // Deep listing of all folders
+                Collection<FileInfo> list = searchDeep(root, viewMode);
                 if (listSubscribed)
                 {
                     list = getSubscribed(list, user.getLogin());
@@ -973,8 +1155,9 @@ public class ImapServiceImpl implements ImapService
             }
             else if (name.endsWith("*"))
             {
+                // Ends with wildcard
                 List<FileInfo> fullList = new LinkedList<FileInfo>();
-                List<FileInfo> list = searchFolders(root, name.replace('%', '*'), false, viewMode);
+                List<FileInfo> list = searchFolders(root, name.replace('%', '*'), viewMode);
                 Collection<FileInfo> subscribedList = list;
                 if (listSubscribed)
                 {
@@ -986,7 +1169,7 @@ public class ImapServiceImpl implements ImapService
                     fullList.addAll(subscribedList);
                     for (FileInfo fileInfo : list)
                     {
-                        List<FileInfo> childList = searchFolders(fileInfo.getNodeRef(), "*", true, viewMode);
+                        List<FileInfo> childList = searchDeep(fileInfo.getNodeRef(), viewMode);
                         if (listSubscribed)
                         {
                             fullList.addAll(getSubscribed(childList, user.getLogin()));
@@ -1002,7 +1185,8 @@ public class ImapServiceImpl implements ImapService
             }
             else if ("%".equals(name))
             {
-                List<FileInfo> list = searchFolders(root, "*", false, viewMode);
+                // Non recursive listing
+                List<FileInfo> list = searchFolders(root, "*", viewMode);
                 LinkedList<AlfrescoImapFolder> subscribedList = new LinkedList<AlfrescoImapFolder>();
 
                 if (listSubscribed)
@@ -1050,7 +1234,8 @@ public class ImapServiceImpl implements ImapService
             }
             else if (name.contains("%") || name.contains("*"))
             {
-                List<FileInfo> list = searchFolders(root, name.replace('%', '*'), false, viewMode);
+                // wild cards in the middle of the name
+                List<FileInfo> list = searchFolders(root, name.replace('%', '*'), viewMode);
                 Collection<FileInfo> subscribedList = list;
                 if (listSubscribed)
                 {
@@ -1065,7 +1250,8 @@ public class ImapServiceImpl implements ImapService
             }
             else
             {
-                List<FileInfo> list = searchFolders(root, name, false, viewMode);
+                // No wild cards
+                List<FileInfo> list = searchFolders(root, name, viewMode);
                 Collection<FileInfo> subscribedList = list;
                 if (listSubscribed)
                 {
@@ -1083,7 +1269,7 @@ public class ImapServiceImpl implements ImapService
         // If (index != -1) this is not the last level
         List<AlfrescoImapFolder> result = new LinkedList<AlfrescoImapFolder>();
 
-        List<FileInfo> list = searchFolders(root, name.replace('%', '*'), false, viewMode);
+        List<FileInfo> list = searchFolders(root, name.replace('%', '*'), viewMode);
         for (FileInfo folder : list)
         {
             Collection<AlfrescoImapFolder> childFolders = listFolder(mailboxRoot, folder.getNodeRef(), user, remainName, listSubscribed, viewMode);
@@ -1104,35 +1290,51 @@ public class ImapServiceImpl implements ImapService
 
     /**
      * Convert mailpath from IMAP client representation to the alfresco representation view 
-     * (e.g. with default settings "getMailPathInRepo(Repository_virtual.Imap Home)" will return "Company Home.Imap Home")
+     * (e.g. with default settings 
+     * "getMailPathInRepo(Repository_virtual/Imap Home)" will return "Company Home/Imap Home")
      * 
      * @param mailPath mailbox path in IMAP client
      * @return mailbox path in alfresco
      */
     private String getMailPathInRepo(String mailPath)
     {
+        if(logger.isDebugEnabled())
+        {
+            logger.debug("getMailPathInRepo :" + mailPath);
+        }
         String rootFolder;
         String remain = "";
         int index = mailPath.indexOf(AlfrescoImapConst.HIERARCHY_DELIMITER);
         if (index > 0)
         {
+            // mail path contains a /
             rootFolder = mailPath.substring(0, index);
-            remain = mailPath.substring(index);
+            remain = mailPath.substring(index + 1);
         }
         else
         {
+            //mail path is a root folder
             rootFolder = mailPath;
         }
         if (imapConfigMountPoints.keySet().contains(rootFolder))
         {
             Map<String, NodeRef> mountPoints = getMountPoints();
             NodeRef rootRef = mountPoints.get(rootFolder);
-            String rootName = nodeService.getProperty(rootRef, ContentModel.PROP_NAME).toString();
+            String path = remain;
+            
+            if(logger.isDebugEnabled())
+            {
+                logger.debug("getMailPathInRepo mounted point returning :" + path);
+            }
 
-            return rootName + remain;
+            return path;
         }
         else
         {
+            if(logger.isDebugEnabled())
+            {
+                logger.debug("getMailPathInRepo not mounted returning path as is:" + mailPath);
+            }
             return mailPath;
         }
     }
@@ -1219,11 +1421,16 @@ public class ImapServiceImpl implements ImapService
         {
             Map<String, NodeRef> mountPoints = getMountPoints();
             NodeRef mountRef = mountPoints.get(rootFolder);
-            return nodeService.getParentAssocs(mountRef).get(0).getParentRef();
+            logger.debug("getMailboxRootRef mounted, " + mountRef);
+            return mountRef;
+            // MER EXPERIMENT
+            //return nodeService.getParentAssocs(mountRef).get(0).getParentRef();
         }
         else
         {
-            return getUserImapHomeRef(userName);
+            NodeRef ret = getUserImapHomeRef(userName);
+            logger.debug("getMailboxRootRef using userImapHome, " + ret);
+            return ret;
         }
     }
 
@@ -1269,21 +1476,14 @@ public class ImapServiceImpl implements ImapService
     private boolean isSubscribed(FileInfo fileInfo, String userName)
     {
         return !nodeService.hasAspect(fileInfo.getNodeRef(), ImapModel.ASPECT_IMAP_FOLDER_NONSUBSCRIBED);
-        // This is a multiuser support. Commented due new requirements
-
-        // Map<QName, Serializable> properties = fileInfo.getProperties();
-        // String subscribedList = (String) properties.get(ImapModel.PROP_IMAP_FOLDER_SUBSCRIBED);
-        // if (subscribedList == null)
-        // {
-        // return false;
-        // }
-        // else
-        // {
-        // return subscribedList.contains(imapHelper.formatUserEntry(userName));
-        // }
-
     }
 
+    /**
+     * getSubscribed filters out folders which are not subscribed.
+     * @param list
+     * @param userName
+     * @return collection of subscribed folders.
+     */
     private Collection<FileInfo> getSubscribed(Collection<FileInfo> list, String userName)
     {
         Collection<FileInfo> result = new LinkedList<FileInfo>();
@@ -1301,7 +1501,7 @@ public class ImapServiceImpl implements ImapService
 
     private boolean hasSubscribedChild(FileInfo parent, String userName, ImapViewMode viewMode)
     {
-        List<FileInfo> list = searchFolders(parent.getNodeRef(), "*", true, viewMode);
+        List<FileInfo> list = searchDeep(parent.getNodeRef(), viewMode);
 
         for (FileInfo fileInfo : list)
         {
@@ -1314,6 +1514,7 @@ public class ImapServiceImpl implements ImapService
         return false;
     }
 
+    
     private List<AlfrescoImapFolder> createMailFolderList(AlfrescoImapUser user, Collection<FileInfo> list, NodeRef imapUserHomeRef)
     {
         List<AlfrescoImapFolder> result = new LinkedList<AlfrescoImapFolder>();
@@ -1371,71 +1572,101 @@ public class ImapServiceImpl implements ImapService
     }
 
     /**
-     * Return list of sites, that belong to the specified user and not marked as "Imap favourite"
+     * Return list of "favourite" sites, that belong to the specified user and are marked as "Imap favourite"
      * 
      * @param userName name of user
-     * @return List of nonFavourite sites.
+     * @return List of favourite sites.
      */
-    private List<SiteInfo> getNonFavouriteSites(final String userName)
+    private List<NodeRef> getFavouriteSites(final String userName)
     {
-        List<SiteInfo> nonFavSites = new LinkedList<SiteInfo>();
+        List<NodeRef> favSites = new LinkedList<NodeRef>();
 
-        PreferenceService preferenceService = (PreferenceService) serviceRegistry.getService(ServiceRegistry.PREFERENCE_SERVICE);
-        Map<String, Serializable> prefs = preferenceService.getPreferences(userName, AlfrescoImapConst.PREF_IMAP_FAVOURITE_SITES);
+        PreferenceService preferenceService = (PreferenceService) serviceRegistry
+                .getService(ServiceRegistry.PREFERENCE_SERVICE);
+        Map<String, Serializable> prefs = preferenceService.getPreferences(
+                userName, AlfrescoImapConst.PREF_IMAP_FAVOURITE_SITES);
 
-        List<SiteInfo> sites = serviceRegistry.getTransactionService().getRetryingTransactionHelper().doInTransaction(new RetryingTransactionCallback<List<SiteInfo>>()
-        {
-            public List<SiteInfo> execute() throws Exception
-           {
-                List<SiteInfo> res = new ArrayList<SiteInfo>();
-                try
-               {
+        /**
+         * List the user's sites
+         */
+        List<SiteInfo> sites = serviceRegistry.getTransactionService()
+                .getRetryingTransactionHelper().doInTransaction(
+                        new RetryingTransactionCallback<List<SiteInfo>>()
+                        {
+                            public List<SiteInfo> execute() throws Exception
+                            {
+                                List<SiteInfo> res = new ArrayList<SiteInfo>();
+                                try
+                                {
 
-                    res = serviceRegistry.getSiteService().listSites(userName);
-        }
-        catch (SiteServiceException e)
-        {
-            //Do nothing. Root sites folder was not created.
-            if (logger.isDebugEnabled())
-            {
-                logger.warn("Root sites folder was not created.");
-            }
-        }
-        catch (InvalidNodeRefException e)
-        {
-            //Do nothing. Root sites folder was deleted.
-            if (logger.isDebugEnabled())
-            {
-                logger.warn("Root sites folder was deleted.");
-            }
-        }
+                                    res = serviceRegistry.getSiteService()
+                                            .listSites(userName);
+                                } 
+                                catch (SiteServiceException e)
+                                {
+                                    // Do nothing. Root sites folder was not
+                                    // created.
+                                    if (logger.isDebugEnabled())
+                                    {
+                                        logger.warn("Root sites folder was not created.");
+                                    }
+                                } 
+                                catch (InvalidNodeRefException e)
+                                {
+                                    // Do nothing. Root sites folder was
+                                    // deleted.
+                                    if (logger.isDebugEnabled())
+                                    {
+                                        logger.warn("Root sites folder was deleted.");
+                                    }
+                                }
 
-                return res;
-            }
-        }, false, true);
+                                return res;
+                            }
+                        }, false, true);
 
         for (SiteInfo siteInfo : sites)
         {
-            String key = AlfrescoImapConst.PREF_IMAP_FAVOURITE_SITES + "." + siteInfo.getShortName();
+            String key = AlfrescoImapConst.PREF_IMAP_FAVOURITE_SITES + "."
+                    + siteInfo.getShortName();
             Boolean isImapFavourite = (Boolean) prefs.get(key);
-            if (isImapFavourite == null || !isImapFavourite)
+            if (isImapFavourite != null && isImapFavourite)
             {
-                nonFavSites.add(siteInfo);
+                if(logger.isDebugEnabled())
+                {
+                    logger.debug("favourite site user:" + userName + "site:" + siteInfo.getShortName());
+                }
+                favSites.add(siteInfo.getNodeRef());
             }
         }
+        
+        logger.debug("at end of getFavouriteSites user:" + userName);
 
-        return nonFavSites;
+        return favSites;
     }
 
+    /**
+     * Checks for the existence of the flaggable aspect and adds it if it is not already present on the folder. 
+     * @param nodeRef
+     */
     private void checkForFlaggableAspect(NodeRef nodeRef)
     {
         if (!nodeService.hasAspect(nodeRef, ImapModel.ASPECT_FLAGGABLE))
         {
-            Map<QName, Serializable> aspectProperties = new HashMap<QName, Serializable>();
-            nodeService.addAspect(nodeRef, ImapModel.ASPECT_FLAGGABLE, aspectProperties);
+            AccessStatus status = permissionService.hasPermission(nodeRef, PermissionService.WRITE_PROPERTIES);
+            if (status == AccessStatus.DENIED)
+            {
+                logger.debug("checkForFlaggableAspect - no permissions to add FLAGGABLE aspect" + nodeRef);
+            }
+            else
+            {    
+                logger.debug("adding flaggable aspect nodeRef:" + nodeRef);
+                Map<QName, Serializable> aspectProperties = new HashMap<QName, Serializable>();
+                nodeService.addAspect(nodeRef, ImapModel.ASPECT_FLAGGABLE, aspectProperties);
+            }
         }
     }
-
+    
     private boolean isExtractionEnabled(NodeRef nodeRef)
     {
         return extractAttachmentsEnabled && !ignoreExtractionFolders.contains(nodeRef);
diff --git a/source/java/org/alfresco/repo/imap/ImapServiceImplTest.java b/source/java/org/alfresco/repo/imap/ImapServiceImplTest.java
index 4eceaea209..6f7d4b3eb3 100644
--- a/source/java/org/alfresco/repo/imap/ImapServiceImplTest.java
+++ b/source/java/org/alfresco/repo/imap/ImapServiceImplTest.java
@@ -59,6 +59,9 @@ import org.alfresco.util.config.RepositoryFolderConfigBean;
 import org.springframework.context.ApplicationContext;
 import org.springframework.core.io.ClassPathResource;
 
+/**
+ * Unit test for ImapServiceImpl
+ */
 public class ImapServiceImplTest extends TestCase 
 {
 
@@ -261,7 +264,38 @@ public class ImapServiceImplTest extends TestCase
         imapService.createMailbox(user, MAILBOX_NAME_A);
         imapService.createMailbox(user, MAILBOX_NAME_B);
         List<AlfrescoImapFolder> mf = imapService.listMailboxes(user, MAILBOX_PATTERN);
-        assertEquals(mf.size(), 2);
+        assertEquals(2, mf.size());
+        
+        boolean foundA = false;
+        boolean foundB = false;
+        
+        for(AlfrescoImapFolder folder : mf)
+        {
+            if(MAILBOX_NAME_A.equals(folder.getName()))
+            {
+               foundA = true;
+            }
+            if(MAILBOX_NAME_B.equals(folder.getName()))
+            {
+               foundB = true;
+            }
+        }
+        
+        assertTrue("folder A found", foundA);
+        assertTrue("folder B found", foundB);
+        
+        /**
+         * The new mailboxes should be subscribed?
+         */
+        List<AlfrescoImapFolder> aif = imapService.listSubscribedMailboxes(user, MAILBOX_PATTERN);
+        assertEquals(2, aif.size());
+        
+        /**
+         * Unsubscribe to one of the mailboxes.
+         */
+        imapService.unsubscribe(user, MAILBOX_NAME_B);
+        List<AlfrescoImapFolder> aif2 = imapService.listSubscribedMailboxes(user, MAILBOX_PATTERN);
+        assertEquals(1, aif2.size());
     }
     
     public void testListSubscribedMailbox() throws Exception
@@ -272,6 +306,9 @@ public class ImapServiceImplTest extends TestCase
         imapService.subscribe(user, MAILBOX_NAME_B);
         List<AlfrescoImapFolder> aif = imapService.listSubscribedMailboxes(user, MAILBOX_PATTERN);
         assertEquals(aif.size(), 2);
+        
+        assertTrue("Can't subscribe mailbox A", checkSubscribedMailbox(user, MAILBOX_NAME_A));
+        assertTrue("Can't subscribe mailbox B", checkSubscribedMailbox(user, MAILBOX_NAME_B));
     }
 
     public void testCreateMailbox() throws Exception
@@ -325,52 +362,52 @@ public class ImapServiceImplTest extends TestCase
         assertFalse("Can't delete mailbox", checkMailbox(user, MAILBOX_NAME_B));
     }
 
-    public void testSearchFoldersInArchive() throws Exception
-    {
-        List<FileInfo> fi = imapService.searchFolders(testImapFolderNodeRef, FOLDER_PATTERN, true, ImapViewMode.ARCHIVE);
-        assertNotNull("Can't find folders in Archive Mode", fi);
-        assertEquals("Can't find folders in Archive Mode", fi.size(), 2);
-        
-        fi = imapService.searchFolders(testImapFolderNodeRef, FOLDER_PATTERN, false, ImapViewMode.ARCHIVE);
-        assertNotNull("Can't find folders in Archive Mode", fi);
-        assertEquals("Can't find folders in Archive Mode", fi.size(), 1);
-    }
+//    public void testSearchFoldersInArchive() throws Exception
+//    {
+//        List<FileInfo> fi = imapService.searchFolders(testImapFolderNodeRef, FOLDER_PATTERN, true, ImapViewMode.ARCHIVE);
+//        assertNotNull("Can't find folders in Archive Mode", fi);
+//        assertEquals("Can't find folders in Archive Mode", fi.size(), 2);
+//        
+//        fi = imapService.searchFolders(testImapFolderNodeRef, FOLDER_PATTERN, false, ImapViewMode.ARCHIVE);
+//        assertNotNull("Can't find folders in Archive Mode", fi);
+//        assertEquals("Can't find folders in Archive Mode", fi.size(), 1);
+//    }
+//
+//    public void testSearchFoldersInVirtual() throws Exception
+//    {
+//        List<FileInfo> fi = imapService.searchFolders(testImapFolderNodeRef, FOLDER_PATTERN, true, ImapViewMode.VIRTUAL);
+//        assertNotNull("Can't find folders in Virtual Mode", fi);
+//        assertEquals("Can't find folders in Virtual Mode", fi.size(), 2);
+//
+//        fi = imapService.searchFolders(testImapFolderNodeRef, FOLDER_PATTERN, false, ImapViewMode.VIRTUAL);
+//        assertNotNull("Can't find folders in Virtual Mode", fi);
+//        assertEquals("Can't find folders in Virtual Mode", fi.size(), 1);
+//    }
+//    
+//    public void testSearchFoldersInMixed() throws Exception
+//    {
+//        List<FileInfo> fi = imapService.searchFolders(testImapFolderNodeRef, FOLDER_PATTERN, true, ImapViewMode.MIXED);
+//        assertNotNull("Can't find folders in Mixed Mode", fi);
+//        assertEquals("Can't find folders in Mixed Mode", fi.size(), 2);
+//
+//        fi = imapService.searchFolders(testImapFolderNodeRef, FOLDER_PATTERN, false, ImapViewMode.MIXED);
+//        assertNotNull("Can't find folders in Mixed Mode", fi);
+//        assertEquals("Can't find folders in Mixed Mode", fi.size(), 1);
+//    }
 
-    public void testSearchFoldersInVirtual() throws Exception
-    {
-        List<FileInfo> fi = imapService.searchFolders(testImapFolderNodeRef, FOLDER_PATTERN, true, ImapViewMode.VIRTUAL);
-        assertNotNull("Can't find folders in Virtual Mode", fi);
-        assertEquals("Can't find folders in Virtual Mode", fi.size(), 2);
-
-        fi = imapService.searchFolders(testImapFolderNodeRef, FOLDER_PATTERN, false, ImapViewMode.VIRTUAL);
-        assertNotNull("Can't find folders in Virtual Mode", fi);
-        assertEquals("Can't find folders in Virtual Mode", fi.size(), 1);
-    }
-    
-    public void testSearchFoldersInMixed() throws Exception
-    {
-        List<FileInfo> fi = imapService.searchFolders(testImapFolderNodeRef, FOLDER_PATTERN, true, ImapViewMode.MIXED);
-        assertNotNull("Can't find folders in Mixed Mode", fi);
-        assertEquals("Can't find folders in Mixed Mode", fi.size(), 2);
-
-        fi = imapService.searchFolders(testImapFolderNodeRef, FOLDER_PATTERN, false, ImapViewMode.MIXED);
-        assertNotNull("Can't find folders in Mixed Mode", fi);
-        assertEquals("Can't find folders in Mixed Mode", fi.size(), 1);
-    }
-
-    public void testSearchFiles() throws Exception
-    {
-        List<FileInfo> fi = imapService.searchFiles(testImapFolderNodeRef, FILE_PATTERN, true);
-        assertNotNull(fi);
-        assertTrue(fi.size() > 0);
-    }
-
-    public void testSearchMails() throws Exception
-    {
-        List<FileInfo> fi = imapService.searchMails(testImapFolderNodeRef, "*", ImapViewMode.MIXED, true);
-        assertNotNull(fi);
-        assertTrue(fi.size() > 0);
-    }
+//    public void testSearchFiles() throws Exception
+//    {
+//        List<FileInfo> fi = imapService.searchFiles(testImapFolderNodeRef, FILE_PATTERN, true);
+//        assertNotNull(fi);
+//        assertTrue(fi.size() > 0);
+//    }
+//
+//    public void testSearchMails() throws Exception
+//    {
+//        List<FileInfo> fi = imapService.searchMails(testImapFolderNodeRef, ImapViewMode.MIXED);
+//        assertNotNull(fi);
+//        assertTrue(fi.size() > 0);
+//    }
 
     public void testSubscribe() throws Exception
     {
@@ -385,6 +422,7 @@ public class ImapServiceImplTest extends TestCase
         imapService.createMailbox(user, MAILBOX_NAME_A);
         imapService.subscribe(user, MAILBOX_NAME_A);
         imapService.unsubscribe(user, MAILBOX_NAME_A);
+        // TODO MER 21/05/2010 : line below looks like a bug to me.
         assertFalse("Can't unsubscribe mailbox", checkSubscribedMailbox(user, MAILBOX_NAME_A));
     }
     
@@ -402,7 +440,7 @@ public class ImapServiceImplTest extends TestCase
 
     public void testSetFlags() throws Exception
     {
-        List<FileInfo> fis = imapService.searchMails(testImapFolderNodeRef, "*", ImapViewMode.ARCHIVE, true);
+        List<FileInfo> fis = imapService.searchMails(testImapFolderNodeRef, ImapViewMode.ARCHIVE);
         if (fis != null && fis.size() > 0)
         {
             FileInfo messageFileInfo = fis.get(0);
@@ -435,7 +473,7 @@ public class ImapServiceImplTest extends TestCase
     
     public void testSetFlag() throws Exception
     {
-        List<FileInfo> fis = imapService.searchMails(testImapFolderNodeRef, "*", ImapViewMode.ARCHIVE, true);
+        List<FileInfo> fis = imapService.searchMails(testImapFolderNodeRef, ImapViewMode.ARCHIVE);
         if (fis != null && fis.size() > 0)
         {
             FileInfo messageFileInfo = fis.get(0);
@@ -455,7 +493,7 @@ public class ImapServiceImplTest extends TestCase
 
     public void testGetFlags() throws Exception
     {
-        List<FileInfo> fis = imapService.searchMails(testImapFolderNodeRef, "*", ImapViewMode.ARCHIVE, true);
+        List<FileInfo> fis = imapService.searchMails(testImapFolderNodeRef, ImapViewMode.ARCHIVE);
         if (fis != null && fis.size() > 0)
         {
             FileInfo messageFileInfo = fis.get(0);
diff --git a/source/java/org/alfresco/repo/jscript/People.java b/source/java/org/alfresco/repo/jscript/People.java
index 4fecc020b2..12b2dff645 100644
--- a/source/java/org/alfresco/repo/jscript/People.java
+++ b/source/java/org/alfresco/repo/jscript/People.java
@@ -495,6 +495,8 @@ public final class People extends BaseScopableProcessorExtension implements Init
                     query.append(term);
                     query.append("*\" @").append(NamespaceService.CONTENT_MODEL_PREFIX).append("\\:lastName:\"*");
                     query.append(term);
+                    query.append("*\" @").append(NamespaceService.CONTENT_MODEL_PREFIX).append("\\:userName:\"*");
+                    query.append(term);
                     query.append("*\" ");
                 }
                 
diff --git a/source/java/org/alfresco/repo/management/SafeApplicationEventMulticaster.java b/source/java/org/alfresco/repo/management/SafeApplicationEventMulticaster.java
new file mode 100644
index 0000000000..f30c455670
--- /dev/null
+++ b/source/java/org/alfresco/repo/management/SafeApplicationEventMulticaster.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright (C) 2005-2010 Alfresco Software Limited.
+ *
+ * This file is part of Alfresco
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.alfresco.repo.management;
+
+import java.util.LinkedList;
+import java.util.List;
+
+import org.springframework.beans.BeansException;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.context.ApplicationEvent;
+import org.springframework.context.event.ContextClosedEvent;
+import org.springframework.context.event.ContextRefreshedEvent;
+import org.springframework.context.event.SimpleApplicationEventMulticaster;
+
+/**
+ * A workaround for a Spring problem, where it tries to multicast to a parent application context that either hasn't
+ * finished refreshing yet or is in the process of shutting down.
+ * 
+ * @author dward
+ */
+public class SafeApplicationEventMulticaster extends SimpleApplicationEventMulticaster implements
+        ApplicationContextAware
+{
+    /** The owning application context. */
+    private ApplicationContext context;
+
+    /** Has the application started? */
+    private boolean isApplicationStarted;
+
+    /** The queued events that can't be broadcast until the application is started. */
+    private List<ApplicationEvent> queuedEvents = new LinkedList<ApplicationEvent>();
+
+    /*
+     * (non-Javadoc)
+     * @see org.springframework.context.ApplicationContextAware#setApplicationContext(org.springframework.context.
+     * ApplicationContext)
+     */
+    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException
+    {
+        this.context = applicationContext;
+        setBeanFactory(applicationContext);
+    }
+
+    /*
+     * (non-Javadoc)
+     * @see
+     * org.springframework.context.event.SimpleApplicationEventMulticaster#multicastEvent(org.springframework.context
+     * .ApplicationEvent)
+     */
+    @Override
+    public void multicastEvent(ApplicationEvent event)
+    {
+        if (event instanceof ContextRefreshedEvent && event.getSource() == this.context)
+        {
+            this.isApplicationStarted = true;
+            for (ApplicationEvent queuedEvent : this.queuedEvents)
+            {
+                super.multicastEvent(queuedEvent);
+            }
+            this.queuedEvents.clear();
+            super.multicastEvent(event);
+        }
+        else if (event instanceof ContextClosedEvent && event.getSource() == this.context)
+        {
+            this.isApplicationStarted = false;
+            super.multicastEvent(event);
+        }
+        else if (this.isApplicationStarted)
+        {
+            super.multicastEvent(event);
+        }
+        else
+        {
+            this.queuedEvents.add(event);
+        }
+    }
+}
diff --git a/source/java/org/alfresco/repo/management/SafeEventPublisher.java b/source/java/org/alfresco/repo/management/SafeEventPublisher.java
deleted file mode 100644
index 5d333bf543..0000000000
--- a/source/java/org/alfresco/repo/management/SafeEventPublisher.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright (C) 2005-2010 Alfresco Software Limited.
- *
- * This file is part of Alfresco
- *
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.alfresco.repo.management;
-
-import java.util.LinkedList;
-import java.util.List;
-
-import org.springframework.extensions.surf.util.AbstractLifecycleBean;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationEvent;
-import org.springframework.context.ApplicationEventPublisher;
-
-/**
- * An event publisher that is safe to use while the context is in the process of refreshing. It queues up events until
- * the context has refreshed, after which point events are published in real time.
- * 
- * @author dward
- */
-public class SafeEventPublisher extends AbstractLifecycleBean implements ApplicationEventPublisher
-{
-
-    /** Has the application started? */
-    private boolean isApplicationStarted;
-
-    /** The queued events. */
-    private List<ApplicationEvent> queuedEvents = new LinkedList<ApplicationEvent>();
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.extensions.surf.util.AbstractLifecycleBean#onBootstrap(org.springframework.context.ApplicationEvent)
-     */
-    @Override
-    protected void onBootstrap(ApplicationEvent event)
-    {
-        this.isApplicationStarted = true;
-        for (ApplicationEvent queuedEvent : this.queuedEvents)
-        {
-            publishEvent(queuedEvent);
-        }
-        this.queuedEvents.clear();
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see org.springframework.extensions.surf.util.AbstractLifecycleBean#onShutdown(org.springframework.context.ApplicationEvent)
-     */
-    @Override
-    protected void onShutdown(ApplicationEvent event)
-    {
-        this.isApplicationStarted = false;
-    }
-
-    /*
-     * (non-Javadoc)
-     * @see
-     * org.springframework.context.ApplicationEventPublisher#publishEvent(org.springframework.context.ApplicationEvent)
-     */
-    public void publishEvent(ApplicationEvent event)
-    {
-        ApplicationContext context = getApplicationContext();
-        if (this.isApplicationStarted)
-        {
-            context.publishEvent(event);
-        }
-        else
-        {
-            this.queuedEvents.add(event);
-        }
-    }
-
-}
diff --git a/source/java/org/alfresco/repo/model/filefolder/FileFolderPerformanceTester.java b/source/java/org/alfresco/repo/model/filefolder/FileFolderPerformanceTester.java
index fc377e3c62..6d2fb0295c 100644
--- a/source/java/org/alfresco/repo/model/filefolder/FileFolderPerformanceTester.java
+++ b/source/java/org/alfresco/repo/model/filefolder/FileFolderPerformanceTester.java
@@ -20,6 +20,7 @@ package org.alfresco.repo.model.filefolder;
 
 import java.io.File;
 import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
@@ -29,6 +30,8 @@ import junit.framework.TestCase;
 import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.model.ContentModel;
 import org.alfresco.repo.content.transform.AbstractContentTransformerTest;
+import org.alfresco.repo.dictionary.DictionaryDAO;
+import org.alfresco.repo.dictionary.M2Model;
 import org.alfresco.repo.security.authentication.AuthenticationComponent;
 import org.alfresco.repo.security.authentication.AuthenticationUtil;
 import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork;
@@ -406,7 +409,7 @@ public class FileFolderPerformanceTester extends TestCase
         }
     }
     
-    private static void run(ApplicationContext ctx, String ... args) throws Throwable
+    private static void run(final ApplicationContext ctx, String ... args) throws Throwable
     {
         ArgumentHelper argHelper = new ArgumentHelper(getUsage(), args);
         final int fileCount = argHelper.getIntegerValue("files", true, 1, 10000);
@@ -418,6 +421,7 @@ public class FileFolderPerformanceTester extends TestCase
         final MutableAuthenticationService authenticationService = serviceRegistry.getAuthenticationService();
         final PermissionService permissionService = serviceRegistry.getPermissionService();
         final NodeService nodeService = serviceRegistry.getNodeService();
+        final SearchService searchService = serviceRegistry.getSearchService();
         final TransactionService transactionService = serviceRegistry.getTransactionService();
         final FileFolderService fileFolderService = serviceRegistry.getFileFolderService();
         
@@ -438,23 +442,42 @@ public class FileFolderPerformanceTester extends TestCase
             public NodeRef execute() throws Throwable
             {
                 AuthenticationUtil.pushAuthentication();
+
+                DictionaryDAO dictionaryDao = (DictionaryDAO) ctx.getBean("dictionaryDAO");
+                M2Model model = M2Model.createModel("tempModel");
+                model.createNamespace("test", "t");
+                model.createNamespace("testx", "");
+                for (int m = 0; m < 30; m++)
+                {
+                    model.createAspect("t:aspect_" + m);
+                }
+                dictionaryDao.putModel(model);
+                
                 NodeRef folderNodeRef = null;
                 try
                 {
                     AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getSystemUserName());
                     if (selectedFolderNodeRef == null)
                     {
-                        // Create a new store
-                        StoreRef storeRef = nodeService.createStore(StoreRef.PROTOCOL_WORKSPACE, GUID.generate());
-                        NodeRef rootNodeRef = nodeService.getRootNode(storeRef);
-                        // Create a folder
-                        folderNodeRef = nodeService.createNode(
-                                rootNodeRef,
-                                ContentModel.ASSOC_CHILDREN,
-                                ContentModel.ASSOC_CHILDREN,
-                                ContentModel.TYPE_FOLDER,
-                                Collections.<QName, Serializable>singletonMap(ContentModel.PROP_NAME, "TOP FOLDER")
-                                ).getChildRef();
+                        // find the guest folder
+                        StoreRef storeRef = new StoreRef(StoreRef.PROTOCOL_WORKSPACE, "SpacesStore");
+                        ResultSet rs = searchService.query(storeRef, SearchService.LANGUAGE_XPATH, "/app:company_home");
+                        try
+                        {
+                            if (rs.length() == 0)
+                            {
+                                throw new AlfrescoRuntimeException("Didn't find Company Home");
+                            }
+                            NodeRef companyHomeNodeRef = rs.getNodeRef(0);
+                            folderNodeRef = fileFolderService.create(
+                                    companyHomeNodeRef,
+                                    "TOP_FOLDER_" + System.currentTimeMillis(),
+                                    ContentModel.TYPE_FOLDER).getNodeRef();
+                        }
+                        finally
+                        {
+                            rs.close();
+                        }
                         // Grant permissions
                         permissionService.setPermission(folderNodeRef, user, PermissionService.ALL_PERMISSIONS, true);
                     }
@@ -472,15 +495,33 @@ public class FileFolderPerformanceTester extends TestCase
                 }
                 if (selectedFolderNodeRef == null)
                 {
+                    List<String> largeCollection = new ArrayList<String>(1000);
+                    for (int i = 0; i < 50; i++)
+                    {
+                        largeCollection.add(String.format("Large-collection-value-%05d", i));
+                    }
+                    
                     // Create the files
                     for (int i = 0; i < fileCount; i++)
                     {
-                        fileFolderService.create(
+                        FileInfo fileInfo = fileFolderService.create(
                                 folderNodeRef,
                                 String.format("FILE-%4d", i),
                                 ContentModel.TYPE_CONTENT);
+                        NodeRef nodeRef = fileInfo.getNodeRef();
+                        nodeService.setProperty(
+                                nodeRef,
+                                QName.createQName("{test}mv"),
+                                (Serializable) largeCollection);
+                        for (int m = 0; m < 30; m++)
+                        {
+                            nodeService.addAspect(
+                                    nodeRef,
+                                    QName.createQName("{test}aspect_"+m), null);
+                        }
                     }
                     System.out.println("Created " + fileCount + " files in folder " + folderNodeRef);
+                    
                 }
                 // Done
                 return folderNodeRef;
diff --git a/source/java/org/alfresco/repo/model/filefolder/FileFolderServiceImpl.java b/source/java/org/alfresco/repo/model/filefolder/FileFolderServiceImpl.java
index fa742eff8d..0653d0724b 100644
--- a/source/java/org/alfresco/repo/model/filefolder/FileFolderServiceImpl.java
+++ b/source/java/org/alfresco/repo/model/filefolder/FileFolderServiceImpl.java
@@ -41,8 +41,10 @@ import org.alfresco.service.cmr.dictionary.DictionaryService;
 import org.alfresco.service.cmr.model.FileExistsException;
 import org.alfresco.service.cmr.model.FileFolderService;
 import org.alfresco.service.cmr.model.FileFolderServiceType;
+import org.alfresco.service.cmr.model.FileFolderUtil;
 import org.alfresco.service.cmr.model.FileInfo;
 import org.alfresco.service.cmr.model.FileNotFoundException;
+import org.alfresco.service.cmr.model.SubFolderFilter;
 import org.alfresco.service.cmr.repository.ChildAssociationRef;
 import org.alfresco.service.cmr.repository.ContentData;
 import org.alfresco.service.cmr.repository.ContentReader;
@@ -347,6 +349,24 @@ public class FileFolderServiceImpl implements FileFolderService
         return results;
     }
     
+    public List<FileInfo> listDeepFolders(NodeRef contextNodeRef,
+            SubFolderFilter filter)
+    {
+        List<NodeRef> nodeRefs = listSimpleDeep(contextNodeRef, true, false, filter);
+        
+        List<FileInfo> results = toFileInfo(nodeRefs);
+        
+        // done
+        if (logger.isDebugEnabled())
+        {
+            logger.debug("Deep search for files: \n" +
+                    "   context: " + contextNodeRef + "\n" +
+                    "   results: " + results);
+        }
+        return results;
+        
+    }
+    
     public NodeRef searchSimple(NodeRef contextNodeRef, String name)
     {
         NodeRef childNodeRef = nodeService.getChildByName(contextNodeRef, ContentModel.ASSOC_CONTAINS, name);
@@ -370,6 +390,7 @@ public class FileFolderServiceImpl implements FileFolderService
     }
 
     private static final String LUCENE_MULTI_CHAR_WILDCARD = "*";
+    
     /**
      * Full search with all options
      */
@@ -443,7 +464,7 @@ public class FileFolderServiceImpl implements FileFolderService
             // This is search for any name
             if(includeSubFolders)
             {
-               nodeRefs = listSimpleDeep(contextNodeRef, folderSearch, fileSearch);   
+               nodeRefs = listSimpleDeep(contextNodeRef, folderSearch, fileSearch, null);   
             }
             else
             {
@@ -552,20 +573,24 @@ public class FileFolderServiceImpl implements FileFolderService
     }
     
     /**
-     * A deep version of listSimple.   Which recursivly walks down the tree from a given starting point, returning 
-     * the node refs found along the way.
+     * A deep version of listSimple.   Which recursively walks down the tree from a given starting point, returning 
+     * the node refs of files or folders found along the way.
      * 
-     * MER: I've added this rather than changeing listSimple to minimise the risk of breaking 
-     * the existing code.   This is a quick performance improvent between using 
+     * MER: I've added this rather than changing listSimple to minimise the risk of breaking 
+     * the existing code.   This is a quick performance improvement between using 
      * XPath which is awful or adding new methods to the NodeService/DB   This is also a dangerous method in that it can return a 
      * lot of data and take a long time. 
      * 
+     * The folder filter is called for each sub-folder to determine whether to search in that sub-folder, should a subfolder be excluded 
+     * then all its chidren are excluded as well.
+     * 
      * @param contextNodeRef the starting point.
      * @param folders return nodes of type folders.
      * @param files return nodes of type files.
-     * @return list of node refs
+     * @param subfolder filter controls which folders to search.  If null then all subfolders are searched.
+     * @return list of node references
      */
-    private List<NodeRef> listSimpleDeep(NodeRef contextNodeRef, boolean folders, boolean files)
+    private List<NodeRef> listSimpleDeep(NodeRef contextNodeRef, boolean folders, boolean files, SubFolderFilter folderFilter)
     {
         Set<QName> folderTypeQNames = new HashSet<QName>(10);
         Set<QName> fileTypeQNames = new HashSet<QName>(10);
@@ -578,7 +603,7 @@ public class FileFolderServiceImpl implements FileFolderService
         folderTypeQNames.addAll(qnames);
         folderTypeQNames.add(ContentModel.TYPE_FOLDER);
         
-        // Remove 'system' folders
+        // Remove 'system' folders and all descendants
         Collection<QName> systemFolderQNames = dictionaryService.getSubTypes(ContentModel.TYPE_SYSTEM_FOLDER, true);
         folderTypeQNames.removeAll(systemFolderQNames);
         folderTypeQNames.remove(ContentModel.TYPE_SYSTEM_FOLDER);
@@ -617,10 +642,24 @@ public class FileFolderServiceImpl implements FileFolderService
             
             for (ChildAssociationRef folderRef : folderAssocRefs)
             {
-                // Add the folders in the currentDir
-                toSearch.push(folderRef.getChildRef());
+                // We have some child folders
+                boolean include = true;
+                if(folderFilter != null)
+                {
+                    include = folderFilter.isEnterSubfolder(folderRef);
+                    if(include)
+                    {
+                        // yes search in these subfolders
+                        toSearch.push(folderRef.getChildRef());
+                    }
+                }
+                else
+                {
+                    // No filter - Add the folders in the currentDir
+                    toSearch.push(folderRef.getChildRef());
+                }
                 
-                if(folders)
+                if(folders && include)
                 {
                     result.add(folderRef.getChildRef());
                 }
@@ -948,9 +987,38 @@ public class FileFolderServiceImpl implements FileFolderService
         }
     }
 
+    /**
+     * Checks for the presence of, and creates as necessary, the folder structure in the provided path.
+     * <p>
+     * An empty path list is not allowed as it would be impossible to necessarily return file info
+     * for the parent node - it might not be a folder node.
+     * @param parentNodeRef the node under which the path will be created
+     * @param pathElements the folder name path to create - may not be empty
+     * @param folderTypeQName the types of nodes to create.  This must be a valid subtype of
+     *      {@link org.alfresco.model.ContentModel#TYPE_FOLDER they folder type}.
+     * @return Returns the info of the last folder in the path.
+     * @deprecated Use FileFolderUtil.makeFolders rather than directly accessing this implementation class.
+     */
     public FileInfo makeFolders(NodeRef parentNodeRef, List<String> pathElements, QName folderTypeQName)
     {
-        return FileFolderServiceImpl.makeFolders(this, parentNodeRef, pathElements, folderTypeQName);
+        return FileFolderUtil.makeFolders(this, parentNodeRef, pathElements, folderTypeQName);
+    }
+    
+    /**
+     * Checks for the presence of, and creates as necessary, the folder structure in the provided path.
+     * <p>
+     * An empty path list is not allowed as it would be impossible to necessarily return file info
+     * for the parent node - it might not be a folder node.
+     * @param parentNodeRef the node under which the path will be created
+     * @param pathElements the folder name path to create - may not be empty
+     * @param folderTypeQName the types of nodes to create.  This must be a valid subtype of
+     *      {@link org.alfresco.model.ContentModel#TYPE_FOLDER they folder type}.
+     * @return Returns the info of the last folder in the path.
+     * @deprecated Use FileFolderUtil.makeFolders rather than directly accessing this implementation class.
+     */
+    public static FileInfo makeFolders(FileFolderService service, NodeRef parentNodeRef, List<String> pathElements, QName folderTypeQName)
+    {
+        return FileFolderUtil.makeFolders(service, parentNodeRef, pathElements, folderTypeQName);
     }
 
     public List<FileInfo> getNamePath(NodeRef rootNodeRef, NodeRef nodeRef) throws FileNotFoundException
@@ -1082,82 +1150,7 @@ public class FileFolderServiceImpl implements FileFolderService
         }
         return contentService.getWriter(nodeRef, ContentModel.PROP_CONTENT, true);
     }
-    
-    /**
-     * Helper method to create folders.
-     * 
-     * This uses the provided service for all auditing and permission checks. 
-     * 
-     * @param service
-     * @param parentNodeRef
-     * @param pathElements
-     * @param folderTypeQName
-     * @return FileInfo for the bottom node in pathElements.
-     */
-    public static FileInfo makeFolders(FileFolderService service, NodeRef parentNodeRef, List<String> pathElements, QName folderTypeQName)
-    {
-        if (pathElements.size() == 0)
-        {
-            throw new IllegalArgumentException("Path element list is empty");
-        }
         
-        // make sure that the folder is correct
-        boolean isFolder = service.getType(folderTypeQName) == FileFolderServiceType.FOLDER;
-        if (!isFolder)
-        {
-            throw new IllegalArgumentException("Type is invalid to make folders with: " + folderTypeQName);
-        }
-        
-        NodeRef currentParentRef = parentNodeRef;
-        // just loop and create if necessary
-        for (String pathElement : pathElements)
-        {
-            // does it exist?
-            // Navigation should not check permissions
-            NodeRef nodeRef = AuthenticationUtil.runAs(new SearchAsSystem(service, currentParentRef, pathElement), AuthenticationUtil.getSystemUserName());
-
-            if (nodeRef == null)
-            {
-                // not present - make it
-                // If this uses the public service it will check create permissions
-                FileInfo createdFileInfo = service.create(currentParentRef, pathElement, folderTypeQName);
-                currentParentRef = createdFileInfo.getNodeRef();
-            }
-            else
-            {
-                // it exists
-                currentParentRef = nodeRef;
-            }
-        }
-        // done
-        // Used to call toFileInfo((currentParentRef, true);
-        // If this uses the public service this will check the final read access
-        FileInfo fileInfo = service.getFileInfo(currentParentRef);
-        
-        // Should we check the type?
-        return fileInfo;
-    }
-    
-    private static class SearchAsSystem implements RunAsWork<NodeRef>
-    {
-        FileFolderService service;
-        NodeRef node;
-        String name;
-
-        SearchAsSystem( FileFolderService service, NodeRef node, String name)
-        {
-            this.service = service;
-            this.node = node;
-            this.name = name;
-        }
-        
-        public NodeRef doWork() throws Exception
-        {
-            return service.searchSimple(node, name);
-        }
-        
-    }
-    
     private String getExtension(String name)
     {
         String result = "";
diff --git a/source/java/org/alfresco/repo/module/ModuleComponentHelper.java b/source/java/org/alfresco/repo/module/ModuleComponentHelper.java
index af16e58a17..04e7e86343 100644
--- a/source/java/org/alfresco/repo/module/ModuleComponentHelper.java
+++ b/source/java/org/alfresco/repo/module/ModuleComponentHelper.java
@@ -257,7 +257,7 @@ public class ModuleComponentHelper
 		                        return null;
 		                    }
 		                };
-		                transactionService.getRetryingTransactionHelper().doInTransaction(startModuleWork);
+                        transactionService.getRetryingTransactionHelper().doInTransaction(startModuleWork, transactionService.isReadOnly());
 		            }
 		            
 		            // Check for missing modules.
diff --git a/source/java/org/alfresco/repo/node/db/hibernate/HibernateNodeDaoServiceImpl.java b/source/java/org/alfresco/repo/node/db/hibernate/HibernateNodeDaoServiceImpl.java
index 4b2dd101c1..5b323565d6 100644
--- a/source/java/org/alfresco/repo/node/db/hibernate/HibernateNodeDaoServiceImpl.java
+++ b/source/java/org/alfresco/repo/node/db/hibernate/HibernateNodeDaoServiceImpl.java
@@ -118,6 +118,7 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.hibernate.CacheMode;
 import org.hibernate.Criteria;
+import org.hibernate.FetchMode;
 import org.hibernate.FlushMode;
 import org.hibernate.HibernateException;
 import org.hibernate.LockMode;
@@ -741,7 +742,7 @@ public class HibernateNodeDaoServiceImpl
         parentAssocsCache.remove(rootNode.getId());
         
         // Assign permissions to the root node
-        SimpleAccessControlListProperties properties = DMPermissionsDaoComponentImpl.getDefaultProperties();
+        SimpleAccessControlListProperties properties = aclDaoComponent.getDefaultProperties();
         Long id = aclDaoComponent.createAccessControlList(properties);
         DbAccessControlList acl = aclDaoComponent.getDbAccessControlList(id);
         rootNode.setAccessControlList(acl);
@@ -3085,16 +3086,54 @@ public class HibernateNodeDaoServiceImpl
      */
     public void cacheNodes(List<NodeRef> nodeRefs)
     {
-        if (nodeRefs.size() < 2)
+        /*
+         * ALF-2712: Performance degradation from 3.1.0 to 3.1.2
+         * ALF-2784: Degradation of performance between 3.1.1 and 3.2x (observed in JSF)
+         * 
+         * There is an obvious cost associated with querying the database to pull back nodes,
+         * and there is additional cost associated with putting the resultant entries into the
+         * caches.  It is NO MORE expensive to check the cache than it is to put an entry into it
+         * - and probably cheaper considering cache replication - so we start checking nodes to see
+         * if they have entries before passing them over for batch loading.
+         * 
+         * However, when running against a cold cache or doing a first-time query against some
+         * part of the repo, we will be checking for entries in the cache and consistently getting
+         * no results.  To avoid unnecessary checking when the cache is PROBABLY cold, we
+         * examine the ratio of hits/misses at regular intervals.
+         */
+        if (nodeRefs.size() < 10)
         {
-            // See ALF-2712: Performance degradation from 3.1.0 to 3.1.2
-            // We only cache where the are multiple results
+            // We only cache where the number of results is potentially
+            // a problem for the N+1 loading that might result.
             return;
         }
+        int foundCacheEntryCount = 0;
+        int missingCacheEntryCount = 0;
+        boolean forceBatch = false;
+
         // Group the nodes by store so that we don't *have* to eagerly join to store to get query performance
         Map<StoreRef, List<String>> uuidsByStore = new HashMap<StoreRef, List<String>>(3);
         for (NodeRef nodeRef : nodeRefs)
         {
+            if (!forceBatch)
+            {
+                // Is this node in the cache?
+                if (this.storeAndNodeIdCache.contains(nodeRef))
+                {
+                    foundCacheEntryCount++;                             // Don't add it to the batch
+                    continue;
+                }
+                else
+                {
+                    missingCacheEntryCount++;                           // Fall through and add it to the batch
+                }
+                if (foundCacheEntryCount + missingCacheEntryCount % 100 == 0)
+                {
+                    // We force the batch if the number of hits drops below the number of misses
+                    forceBatch = foundCacheEntryCount < missingCacheEntryCount;
+                }
+            }
+
             StoreRef storeRef = nodeRef.getStoreRef();
             List<String> uuids = (List<String>) uuidsByStore.get(storeRef);
             if (uuids == null)
@@ -3151,10 +3190,22 @@ public class HibernateNodeDaoServiceImpl
     @SuppressWarnings("unchecked")
     private void cacheNodesNoBatch(Store store, List<String> uuids)
     {
+        // Get nodes and properties
         Criteria criteria = getSession().createCriteria(NodeImpl.class, "node");
         criteria.setResultTransformer(Criteria.ROOT_ENTITY);
         criteria.add(Restrictions.eq("store.id", store.getId()));
         criteria.add(Restrictions.in("uuid", uuids));
+        criteria.setFetchMode("aspects", FetchMode.SELECT);                 // Don't join to aspects
+        criteria.setCacheMode(CacheMode.PUT);
+        criteria.setFlushMode(FlushMode.MANUAL);
+        criteria.list();
+
+        // Get nodes and aspects
+        criteria = getSession().createCriteria(NodeImpl.class, "node");
+        criteria.setResultTransformer(Criteria.ROOT_ENTITY);
+        criteria.add(Restrictions.eq("store.id", store.getId()));
+        criteria.add(Restrictions.in("uuid", uuids));
+        criteria.setFetchMode("properties", FetchMode.SELECT);              // Don't join to properties
         criteria.setCacheMode(CacheMode.PUT);
         criteria.setFlushMode(FlushMode.MANUAL);
 
@@ -3984,9 +4035,19 @@ public class HibernateNodeDaoServiceImpl
             final StoreRef storeRef,
             final ObjectArrayQueryCallback resultsCallback)
     {
-        final Long contentTypeQNameEntityId = qnameDAO.getOrCreateQName(ContentModel.TYPE_CONTENT).getFirst();
-        final Long ownerPropQNameEntityId = qnameDAO.getOrCreateQName(ContentModel.PROP_OWNER).getFirst();
-        final Long contentPropQNameEntityId = qnameDAO.getOrCreateQName(ContentModel.PROP_CONTENT).getFirst();
+        Pair<Long, QName> contentTypeQNamePair = qnameDAO.getQName(ContentModel.TYPE_CONTENT);
+        Pair<Long, QName> contentPropQNamePair = qnameDAO.getQName(ContentModel.PROP_CONTENT);
+        // Shortcut
+        if (contentTypeQNamePair == null || contentPropQNamePair == null)
+        {
+            return;
+        }
+        final Long contentTypeQNameEntityId = contentTypeQNamePair.getFirst();
+        final Long contentPropQNameEntityId = contentPropQNamePair.getFirst();
+        // Note, we do a left join on owner, so it may be null
+        Pair<Long, QName> ownerPropQNamePair = qnameDAO.getQName(ContentModel.PROP_OWNER);
+        final Long ownerPropQNameEntityId = 
+            ownerPropQNamePair == null ? new Long(-1L) : ownerPropQNamePair.getFirst();
 
         // Query for the 'old' style content properties stored in 'string_value'
         HibernateCallback callbackOld = new HibernateCallback()
@@ -4082,19 +4143,28 @@ public class HibernateNodeDaoServiceImpl
             final StoreRef storeRef,
             final ObjectArrayQueryCallback resultsCallback)
     {
-        final Pair<Long, QName> sizeCurrentPropQNamePair = qnameDAO.getOrCreateQName(ContentModel.PROP_SIZE_CURRENT);
-        final Pair<Long, QName> personTypeQNamePair = qnameDAO.getOrCreateQName(ContentModel.TYPE_PERSON);
+        final Pair<Long, QName> sizeCurrentPropQNamePair = qnameDAO.getQName(ContentModel.PROP_SIZE_CURRENT);
+        final Pair<Long, QName> personTypeQNamePair = qnameDAO.getQName(ContentModel.TYPE_PERSON);
+        if (personTypeQNamePair == null)
+        {
+            return;             // Shortcut as we join on this
+        }
         
         HibernateCallback callback = new HibernateCallback()
         {
             public Object doInHibernate(Session session)
             {
+                Long personTypeQNameId = personTypeQNamePair.getFirst();
+                // We LEFT JOIN on this
+                Long sizeCurrentPropQNameId =
+                    sizeCurrentPropQNamePair == null ? new Long(-1L) : sizeCurrentPropQNamePair.getFirst();
+                
                 Query query = session
                     .getNamedQuery(HibernateNodeDaoServiceImpl.QUERY_GET_USERS_WITHOUT_USAGE_PROP)
                   .setString("storeProtocol", storeRef.getProtocol())
                   .setString("storeIdentifier", storeRef.getIdentifier())
-                    .setParameter("sizeCurrentPropQNameID", sizeCurrentPropQNamePair.getFirst()) // cm:sizeCurrent
-                    .setParameter("personTypeQNameID", personTypeQNamePair.getFirst()) // cm:person
+                    .setParameter("sizeCurrentPropQNameID", sizeCurrentPropQNameId) // cm:sizeCurrent
+                    .setParameter("personTypeQNameID", personTypeQNameId) // cm:person
                     .setParameter("isDeleted", false);
                   ;
                 DirtySessionMethodInterceptor.setQueryFlushMode(session, query);
@@ -4129,9 +4199,13 @@ public class HibernateNodeDaoServiceImpl
             final StoreRef storeRef,
             final ObjectArrayQueryCallback resultsCallback)
     {
-        final Pair<Long, QName> usernamePropQNamePair = qnameDAO.getOrCreateQName(ContentModel.PROP_USERNAME);
-        final Pair<Long, QName> sizeCurrentPropQNamePair = qnameDAO.getOrCreateQName(ContentModel.PROP_SIZE_CURRENT);
-        final Pair<Long, QName> personTypeQNamePair = qnameDAO.getOrCreateQName(ContentModel.TYPE_PERSON);
+        final Pair<Long, QName> personTypeQNamePair = qnameDAO.getQName(ContentModel.TYPE_PERSON);
+        final Pair<Long, QName> usernamePropQNamePair = qnameDAO.getQName(ContentModel.PROP_USERNAME);
+        final Pair<Long, QName> sizeCurrentPropQNamePair = qnameDAO.getQName(ContentModel.PROP_SIZE_CURRENT);
+        if (personTypeQNamePair == null || usernamePropQNamePair == null || sizeCurrentPropQNamePair == null)
+        {
+            return;             // All joins
+        }
         
         HibernateCallback callback = new HibernateCallback()
         {
@@ -4139,8 +4213,8 @@ public class HibernateNodeDaoServiceImpl
             {
                 Query query = session
                     .getNamedQuery(HibernateNodeDaoServiceImpl.QUERY_GET_USERS_WITHOUT_USAGE)
-                  .setString("storeProtocol", storeRef.getProtocol())
-                  .setString("storeIdentifier", storeRef.getIdentifier())
+                    .setString("storeProtocol", storeRef.getProtocol())
+                    .setString("storeIdentifier", storeRef.getIdentifier())
                     .setParameter("usernamePropQNameID", usernamePropQNamePair.getFirst()) // cm:username
                     .setParameter("sizeCurrentPropQNameID", sizeCurrentPropQNamePair.getFirst()) // cm:sizeCurrent
                     .setParameter("personTypeQNameID", personTypeQNamePair.getFirst()) // cm:person
@@ -4180,9 +4254,13 @@ public class HibernateNodeDaoServiceImpl
             final StoreRef storeRef,
             final ObjectArrayQueryCallback resultsCallback)
     {
-        final Long personTypeQNameEntityId = qnameDAO.getOrCreateQName(ContentModel.TYPE_PERSON).getFirst();
-        final Long usernamePropQNameEntityId = qnameDAO.getOrCreateQName(ContentModel.PROP_USERNAME).getFirst();
-        final Long sizeCurrentPropQNameEntityId = qnameDAO.getOrCreateQName(ContentModel.PROP_SIZE_CURRENT).getFirst();
+        final Pair<Long, QName> personTypeQNamePair = qnameDAO.getQName(ContentModel.TYPE_PERSON);
+        final Pair<Long, QName> usernamePropQNamePair = qnameDAO.getQName(ContentModel.PROP_USERNAME);
+        final Pair<Long, QName> sizeCurrentPropQNamePair = qnameDAO.getQName(ContentModel.PROP_SIZE_CURRENT);
+        if (personTypeQNamePair == null || usernamePropQNamePair == null || sizeCurrentPropQNamePair == null)
+        {
+            return;             // All joins
+        }
         
         HibernateCallback callback = new HibernateCallback()
         {
@@ -4192,9 +4270,9 @@ public class HibernateNodeDaoServiceImpl
                     .getNamedQuery(HibernateNodeDaoServiceImpl.QUERY_GET_USERS_WITH_USAGE)
                     .setString("storeProtocol", storeRef.getProtocol())
                     .setString("storeIdentifier", storeRef.getIdentifier())
-                    .setParameter("usernamePropQNameID", usernamePropQNameEntityId) // cm:username
-                    .setParameter("sizeCurrentPropQNameID", sizeCurrentPropQNameEntityId) // cm:sizeCurrent
-                    .setParameter("personTypeQNameID", personTypeQNameEntityId) // cm:person
+                    .setParameter("usernamePropQNameID", usernamePropQNamePair.getFirst()) // cm:username
+                    .setParameter("sizeCurrentPropQNameID", sizeCurrentPropQNamePair.getFirst()) // cm:sizeCurrent
+                    .setParameter("personTypeQNameID", personTypeQNamePair.getFirst()) // cm:person
                     ;
                 DirtySessionMethodInterceptor.setQueryFlushMode(session, query);
                 return query.scroll(ScrollMode.FORWARD_ONLY);
diff --git a/source/java/org/alfresco/repo/search/SearchTestSuite.java b/source/java/org/alfresco/repo/search/SearchTestSuite.java
new file mode 100644
index 0000000000..3065ef0dae
--- /dev/null
+++ b/source/java/org/alfresco/repo/search/SearchTestSuite.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright (C) 2005-2010 Alfresco Software Limited.
+ *
+ * This file is part of Alfresco
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.alfresco.repo.search;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import org.alfresco.repo.search.impl.lucene.ADMLuceneCategoryTest;
+import org.alfresco.repo.search.impl.lucene.ADMLuceneTest;
+import org.alfresco.repo.search.impl.lucene.ALF947Test;
+import org.alfresco.repo.search.impl.lucene.LuceneIndexBackupComponentTest;
+import org.alfresco.repo.search.impl.lucene.MultiReaderTest;
+import org.alfresco.repo.search.impl.lucene.analysis.NumericEncodingTest;
+import org.alfresco.repo.search.impl.lucene.index.IndexInfoTest;
+import org.alfresco.repo.search.impl.parsers.CMISTest;
+import org.alfresco.repo.search.impl.parsers.CMIS_FTSTest;
+import org.alfresco.repo.search.impl.parsers.FTSTest;
+
+/**
+ * @author Andy Hind
+ *
+ */
+public class SearchTestSuite extends TestSuite
+{
+
+    /**
+     * Creates the test suite
+     * 
+     * @return  the test suite
+     */
+    public static Test suite() 
+    {
+        TestSuite suite = new TestSuite();
+        suite.addTestSuite(MLAnaysisModeExpansionTest.class);
+        suite.addTestSuite(QueryRegisterComponentTest.class);
+        suite.addTestSuite(SearcherComponentTest.class);
+        suite.addTestSuite(SearchServiceTest.class);
+        suite.addTestSuite(ADMLuceneCategoryTest.class);
+        suite.addTestSuite(ADMLuceneTest.class);
+        suite.addTestSuite(ALF947Test.class);
+        suite.addTestSuite(LuceneIndexBackupComponentTest.class);
+        suite.addTestSuite(MultiReaderTest.class);
+        suite.addTestSuite(NumericEncodingTest.class);
+        suite.addTestSuite(IndexInfoTest.class);
+        suite.addTestSuite(CMIS_FTSTest.class);
+        suite.addTestSuite(CMISTest.class);
+        suite.addTestSuite(FTSTest.class);
+    
+        
+        
+       
+        return suite;
+    }
+}
diff --git a/source/java/org/alfresco/repo/search/impl/lucene/ADMLuceneTest.java b/source/java/org/alfresco/repo/search/impl/lucene/ADMLuceneTest.java
index d77464109e..cc98b8a53e 100644
--- a/source/java/org/alfresco/repo/search/impl/lucene/ADMLuceneTest.java
+++ b/source/java/org/alfresco/repo/search/impl/lucene/ADMLuceneTest.java
@@ -1289,7 +1289,7 @@ public class ADMLuceneTest extends TestCase implements DictionaryListener
         luceneFTS.resume();
         testTX.commit();
 
-        for (int i = 0; i < 100; i++)
+        for (int i = 0; i < 50; i++)
         {
             testTX = transactionService.getUserTransaction();
             testTX.begin();
@@ -2183,7 +2183,7 @@ public class ADMLuceneTest extends TestCase implements DictionaryListener
             public Object execute() throws Throwable
             {
                 SessionSizeResourceManager.setDisableInTransaction();
-                for (int i = 0; i < 100; i++)
+                for (int i = 0; i < 100; i+=10)
                 {
                     HashSet<ChildAssociationRef> refs = new HashSet<ChildAssociationRef>();
                     for (int j = 0; j < i; j++)
diff --git a/source/java/org/alfresco/repo/search/impl/parsers/CMISLexer.java b/source/java/org/alfresco/repo/search/impl/parsers/CMISLexer.java
index d9a8594c2b..3aaf809cb7 100644
--- a/source/java/org/alfresco/repo/search/impl/parsers/CMISLexer.java
+++ b/source/java/org/alfresco/repo/search/impl/parsers/CMISLexer.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.2 Sep 23, 2009 12:02:23 W:\\alfresco\\HEAD\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g 2010-04-26 13:41:28
+// $ANTLR 3.2 Sep 23, 2009 12:02:23 W:\\alfresco\\HEAD\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g 2010-05-01 13:03:44
 
     package org.alfresco.repo.search.impl.parsers;
     import org.alfresco.cmis.CMISQueryException;
diff --git a/source/java/org/alfresco/repo/search/impl/parsers/CMISParser.java b/source/java/org/alfresco/repo/search/impl/parsers/CMISParser.java
index c644400e9e..cf2f0e0b6b 100644
--- a/source/java/org/alfresco/repo/search/impl/parsers/CMISParser.java
+++ b/source/java/org/alfresco/repo/search/impl/parsers/CMISParser.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.2 Sep 23, 2009 12:02:23 W:\\alfresco\\HEAD\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g 2010-04-26 13:41:27
+// $ANTLR 3.2 Sep 23, 2009 12:02:23 W:\\alfresco\\HEAD\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS.g 2010-05-01 13:03:44
 
     package org.alfresco.repo.search.impl.parsers;
     import org.alfresco.cmis.CMISQueryException;
@@ -380,7 +380,7 @@ public class CMISParser extends Parser {
 
 
             // AST REWRITE
-            // elements: selectList, orderByClause, whereClause, fromClause
+            // elements: fromClause, selectList, orderByClause, whereClause
             // token labels: 
             // rule labels: retval
             // token list labels: 
@@ -1134,7 +1134,7 @@ public class CMISParser extends Parser {
 
 
                     // AST REWRITE
-                    // elements: functionArgument, cmisFunctionName, RPAREN, LPAREN
+                    // elements: cmisFunctionName, functionArgument, LPAREN, RPAREN
                     // token labels: 
                     // rule labels: retval, cmisFunctionName
                     // token list labels: 
@@ -1217,7 +1217,7 @@ public class CMISParser extends Parser {
 
 
                     // AST REWRITE
-                    // elements: functionArgument, LPAREN, functionName, RPAREN
+                    // elements: RPAREN, functionArgument, functionName, LPAREN
                     // token labels: 
                     // rule labels: retval, functionName
                     // token list labels: 
@@ -1333,7 +1333,7 @@ public class CMISParser extends Parser {
 
 
                     // AST REWRITE
-                    // elements: qualifier, columnName
+                    // elements: columnName, qualifier
                     // token labels: 
                     // rule labels: retval
                     // token list labels: 
@@ -1949,7 +1949,7 @@ public class CMISParser extends Parser {
 
 
             // AST REWRITE
-            // elements: tableName, correlationName
+            // elements: correlationName, tableName
             // token labels: 
             // rule labels: retval
             // token list labels: 
@@ -2081,7 +2081,7 @@ public class CMISParser extends Parser {
 
 
             // AST REWRITE
-            // elements: joinType, tableReference, JOIN, joinSpecification
+            // elements: joinSpecification, JOIN, joinType, tableReference
             // token labels: 
             // rule labels: retval
             // token list labels: 
@@ -2555,7 +2555,7 @@ public class CMISParser extends Parser {
 
 
             // AST REWRITE
-            // elements: EQUALS, ON, lhs, rhs
+            // elements: ON, rhs, lhs, EQUALS
             // token labels: 
             // rule labels: retval, rhs, lhs
             // token list labels: 
@@ -3400,7 +3400,7 @@ public class CMISParser extends Parser {
 
 
             // AST REWRITE
-            // elements: literalOrParameterName, valueExpression, compOp
+            // elements: compOp, valueExpression, literalOrParameterName
             // token labels: 
             // rule labels: retval
             // token list labels: 
@@ -3828,7 +3828,7 @@ public class CMISParser extends Parser {
 
 
             // AST REWRITE
-            // elements: NOT, inValueList, columnReference
+            // elements: columnReference, inValueList, NOT
             // token labels: 
             // rule labels: retval
             // token list labels: 
@@ -4073,7 +4073,7 @@ public class CMISParser extends Parser {
 
 
             // AST REWRITE
-            // elements: columnReference, characterStringLiteral, NOT
+            // elements: characterStringLiteral, NOT, columnReference
             // token labels: 
             // rule labels: retval
             // token list labels: 
@@ -4335,7 +4335,7 @@ public class CMISParser extends Parser {
 
 
             // AST REWRITE
-            // elements: literalOrParameterName, ANY, columnReference, compOp
+            // elements: compOp, literalOrParameterName, ANY, columnReference
             // token labels: 
             // rule labels: retval
             // token list labels: 
@@ -4471,7 +4471,7 @@ public class CMISParser extends Parser {
 
 
             // AST REWRITE
-            // elements: columnReference, NOT, inValueList, ANY
+            // elements: NOT, columnReference, ANY, inValueList
             // token labels: 
             // rule labels: retval
             // token list labels: 
@@ -4609,7 +4609,7 @@ public class CMISParser extends Parser {
 
 
             // AST REWRITE
-            // elements: qualifier, textSearchExpression
+            // elements: textSearchExpression, qualifier
             // token labels: 
             // rule labels: retval
             // token list labels: 
@@ -4890,7 +4890,7 @@ public class CMISParser extends Parser {
 
 
             // AST REWRITE
-            // elements: folderId, qualifier
+            // elements: qualifier, folderId
             // token labels: 
             // rule labels: retval
             // token list labels: 
diff --git a/source/java/org/alfresco/repo/search/impl/parsers/CMIS_FTS.g b/source/java/org/alfresco/repo/search/impl/parsers/CMIS_FTS.g
index 1389439b80..196c8724fb 100644
--- a/source/java/org/alfresco/repo/search/impl/parsers/CMIS_FTS.g
+++ b/source/java/org/alfresco/repo/search/impl/parsers/CMIS_FTS.g
@@ -36,43 +36,12 @@ options
 
 tokens
 {
-        FTS;
         DISJUNCTION;
         CONJUNCTION;
-        NEGATION;
         TERM;
-        EXACT_TERM;
         PHRASE;
-        SYNONYM;
-        RANGE;
-        PROXIMITY;
         DEFAULT;
-        MANDATORY;
-        OPTIONAL;
         EXCLUDE;
-        FIELD_DISJUNCTION;
-        FIELD_CONJUNCTION;
-        FIELD_NEGATION;
-        FIELD_GROUP;
-        FIELD_DEFAULT;
-        FIELD_MANDATORY;
-        FIELD_OPTIONAL;
-        FIELD_EXCLUDE;
-        FG_TERM;
-        FG_EXACT_TERM;
-        FG_PHRASE;
-        FG_SYNONYM;
-        FG_PROXIMITY;
-        FG_RANGE;
-        FIELD_REF;
-        INCLUSIVE;
-        EXCLUSIVE;
-        QUALIFIER;
-        PREFIX;
-        NAME_SPACE;
-        BOOST;
-        FUZZY;
-        TEMPLATE;
 }
 /*
  * Make sure the lexer and parser are generated in the correct package
@@ -403,9 +372,11 @@ OR
         :
         (
                 'O'
+                | 'o'
         )
         (
                 'R'
+                | 'r'
         )
         ;
 
diff --git a/source/java/org/alfresco/repo/search/impl/parsers/CMIS_FTS.tokens b/source/java/org/alfresco/repo/search/impl/parsers/CMIS_FTS.tokens
index 14fee36c12..f15209ed56 100644
--- a/source/java/org/alfresco/repo/search/impl/parsers/CMIS_FTS.tokens
+++ b/source/java/org/alfresco/repo/search/impl/parsers/CMIS_FTS.tokens
@@ -1,45 +1,14 @@
-TERM=8
-PREFIX=36
-FG_PROXIMITY=30
-FG_TERM=26
-EXACT_TERM=9
-FUZZY=39
-FIELD_DISJUNCTION=18
-MANDATORY=15
-FG_EXACT_TERM=27
-FIELD_EXCLUDE=25
-EXCLUSIVE=34
-NAME_SPACE=37
-BOOST=38
-START_WORD=47
-FIELD_DEFAULT=22
-FIELD_OPTIONAL=24
-F_ESC=45
-SYNONYM=11
-EXCLUDE=17
-QUALIFIER=35
-CONJUNCTION=6
-FIELD_GROUP=21
-DEFAULT=14
-IN_WORD=48
-RANGE=12
-MINUS=41
-PROXIMITY=13
-FIELD_REF=32
-PHRASE=10
-FTSWORD=42
-OPTIONAL=16
-DISJUNCTION=5
-FTS=4
-WS=46
-FG_SYNONYM=29
-NEGATION=7
-TEMPLATE=40
-FTSPHRASE=43
-FIELD_CONJUNCTION=19
-INCLUSIVE=33
-OR=44
-FIELD_MANDATORY=23
-FG_RANGE=31
-FG_PHRASE=28
-FIELD_NEGATION=20
+TERM=6
+START_WORD=16
+DISJUNCTION=4
+WS=15
+FTSPHRASE=12
+CONJUNCTION=5
+OR=13
+DEFAULT=8
+IN_WORD=17
+MINUS=10
+F_ESC=14
+FTSWORD=11
+PHRASE=7
+EXCLUDE=9
diff --git a/source/java/org/alfresco/repo/search/impl/parsers/CMIS_FTSLexer.java b/source/java/org/alfresco/repo/search/impl/parsers/CMIS_FTSLexer.java
index 891e92b512..cf3f338d12 100644
--- a/source/java/org/alfresco/repo/search/impl/parsers/CMIS_FTSLexer.java
+++ b/source/java/org/alfresco/repo/search/impl/parsers/CMIS_FTSLexer.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.2 Sep 23, 2009 12:02:23 W:\\alfresco\\HEAD\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g 2010-04-26 15:09:27
+// $ANTLR 3.2 Sep 23, 2009 12:02:23 W:\\alfresco\\BRANCHES\\DEV\\V3.3-BUG-FIX\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g 2010-05-17 15:10:38
 
 package org.alfresco.repo.search.impl.parsers;
 import org.alfresco.cmis.CMISQueryException;
@@ -10,52 +10,21 @@ import java.util.List;
 import java.util.ArrayList;
 
 public class CMIS_FTSLexer extends Lexer {
-    public static final int TERM=8;
-    public static final int PREFIX=36;
-    public static final int FG_PROXIMITY=30;
-    public static final int FG_TERM=26;
-    public static final int EXACT_TERM=9;
-    public static final int FUZZY=39;
-    public static final int FIELD_DISJUNCTION=18;
-    public static final int FG_EXACT_TERM=27;
-    public static final int MANDATORY=15;
-    public static final int EXCLUSIVE=34;
-    public static final int FIELD_EXCLUDE=25;
+    public static final int TERM=6;
+    public static final int START_WORD=16;
+    public static final int DISJUNCTION=4;
+    public static final int WS=15;
+    public static final int FTSPHRASE=12;
+    public static final int CONJUNCTION=5;
+    public static final int DEFAULT=8;
+    public static final int OR=13;
+    public static final int IN_WORD=17;
+    public static final int MINUS=10;
     public static final int EOF=-1;
-    public static final int NAME_SPACE=37;
-    public static final int BOOST=38;
-    public static final int START_WORD=47;
-    public static final int FIELD_DEFAULT=22;
-    public static final int FIELD_OPTIONAL=24;
-    public static final int F_ESC=45;
-    public static final int SYNONYM=11;
-    public static final int EXCLUDE=17;
-    public static final int QUALIFIER=35;
-    public static final int CONJUNCTION=6;
-    public static final int FIELD_GROUP=21;
-    public static final int DEFAULT=14;
-    public static final int IN_WORD=48;
-    public static final int RANGE=12;
-    public static final int MINUS=41;
-    public static final int PROXIMITY=13;
-    public static final int FIELD_REF=32;
-    public static final int PHRASE=10;
-    public static final int FTSWORD=42;
-    public static final int OPTIONAL=16;
-    public static final int DISJUNCTION=5;
-    public static final int FTS=4;
-    public static final int WS=46;
-    public static final int FG_SYNONYM=29;
-    public static final int NEGATION=7;
-    public static final int TEMPLATE=40;
-    public static final int FTSPHRASE=43;
-    public static final int FIELD_CONJUNCTION=19;
-    public static final int INCLUSIVE=33;
-    public static final int OR=44;
-    public static final int FIELD_MANDATORY=23;
-    public static final int FG_RANGE=31;
-    public static final int FG_PHRASE=28;
-    public static final int FIELD_NEGATION=20;
+    public static final int F_ESC=14;
+    public static final int PHRASE=7;
+    public static final int FTSWORD=11;
+    public static final int EXCLUDE=9;
 
     List tokens = new ArrayList();
     public void emit(Token token) {
@@ -122,18 +91,18 @@ public class CMIS_FTSLexer extends Lexer {
         super(input,state);
 
     }
-    public String getGrammarFileName() { return "W:\\alfresco\\HEAD\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g"; }
+    public String getGrammarFileName() { return "W:\\alfresco\\BRANCHES\\DEV\\V3.3-BUG-FIX\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g"; }
 
     // $ANTLR start "FTSPHRASE"
     public final void mFTSPHRASE() throws RecognitionException {
         try {
             int _type = FTSPHRASE;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\alfresco\\HEAD\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:377:9: ( '\\'' ( F_ESC | ~ ( '\\\\' | '\\'' ) )* '\\'' )
-            // W:\\alfresco\\HEAD\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:378:9: '\\'' ( F_ESC | ~ ( '\\\\' | '\\'' ) )* '\\''
+            // W:\\alfresco\\BRANCHES\\DEV\\V3.3-BUG-FIX\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:346:9: ( '\\'' ( F_ESC | ~ ( '\\\\' | '\\'' ) )* '\\'' )
+            // W:\\alfresco\\BRANCHES\\DEV\\V3.3-BUG-FIX\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:347:9: '\\'' ( F_ESC | ~ ( '\\\\' | '\\'' ) )* '\\''
             {
             match('\''); 
-            // W:\\alfresco\\HEAD\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:379:9: ( F_ESC | ~ ( '\\\\' | '\\'' ) )*
+            // W:\\alfresco\\BRANCHES\\DEV\\V3.3-BUG-FIX\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:348:9: ( F_ESC | ~ ( '\\\\' | '\\'' ) )*
             loop1:
             do {
                 int alt1=3;
@@ -149,14 +118,14 @@ public class CMIS_FTSLexer extends Lexer {
 
                 switch (alt1) {
             	case 1 :
-            	    // W:\\alfresco\\HEAD\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:380:17: F_ESC
+            	    // W:\\alfresco\\BRANCHES\\DEV\\V3.3-BUG-FIX\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:349:17: F_ESC
             	    {
             	    mF_ESC(); 
 
             	    }
             	    break;
             	case 2 :
-            	    // W:\\alfresco\\HEAD\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:382:17: ~ ( '\\\\' | '\\'' )
+            	    // W:\\alfresco\\BRANCHES\\DEV\\V3.3-BUG-FIX\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:351:17: ~ ( '\\\\' | '\\'' )
             	    {
             	    if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
             	        input.consume();
@@ -191,8 +160,8 @@ public class CMIS_FTSLexer extends Lexer {
     // $ANTLR start "F_ESC"
     public final void mF_ESC() throws RecognitionException {
         try {
-            // W:\\alfresco\\HEAD\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:393:9: ( '\\\\' ( '\\\\' | '\\'' ) )
-            // W:\\alfresco\\HEAD\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:394:9: '\\\\' ( '\\\\' | '\\'' )
+            // W:\\alfresco\\BRANCHES\\DEV\\V3.3-BUG-FIX\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:362:9: ( '\\\\' ( '\\\\' | '\\'' ) )
+            // W:\\alfresco\\BRANCHES\\DEV\\V3.3-BUG-FIX\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:363:9: '\\\\' ( '\\\\' | '\\'' )
             {
             match('\\'); 
             if ( input.LA(1)=='\''||input.LA(1)=='\\' ) {
@@ -218,22 +187,26 @@ public class CMIS_FTSLexer extends Lexer {
         try {
             int _type = OR;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\alfresco\\HEAD\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:403:9: ( ( 'O' ) ( 'R' ) )
-            // W:\\alfresco\\HEAD\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:404:9: ( 'O' ) ( 'R' )
+            // W:\\alfresco\\BRANCHES\\DEV\\V3.3-BUG-FIX\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:372:9: ( ( 'O' | 'o' ) ( 'R' | 'r' ) )
+            // W:\\alfresco\\BRANCHES\\DEV\\V3.3-BUG-FIX\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:373:9: ( 'O' | 'o' ) ( 'R' | 'r' )
             {
-            // W:\\alfresco\\HEAD\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:404:9: ( 'O' )
-            // W:\\alfresco\\HEAD\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:405:17: 'O'
-            {
-            match('O'); 
+            if ( input.LA(1)=='O'||input.LA(1)=='o' ) {
+                input.consume();
 
             }
+            else {
+                MismatchedSetException mse = new MismatchedSetException(null,input);
+                recover(mse);
+                throw mse;}
 
-            // W:\\alfresco\\HEAD\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:407:9: ( 'R' )
-            // W:\\alfresco\\HEAD\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:408:17: 'R'
-            {
-            match('R'); 
+            if ( input.LA(1)=='R'||input.LA(1)=='r' ) {
+                input.consume();
 
             }
+            else {
+                MismatchedSetException mse = new MismatchedSetException(null,input);
+                recover(mse);
+                throw mse;}
 
 
             }
@@ -251,8 +224,8 @@ public class CMIS_FTSLexer extends Lexer {
         try {
             int _type = MINUS;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\alfresco\\HEAD\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:413:9: ( '-' )
-            // W:\\alfresco\\HEAD\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:414:9: '-'
+            // W:\\alfresco\\BRANCHES\\DEV\\V3.3-BUG-FIX\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:384:9: ( '-' )
+            // W:\\alfresco\\BRANCHES\\DEV\\V3.3-BUG-FIX\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:385:9: '-'
             {
             match('-'); 
 
@@ -271,10 +244,10 @@ public class CMIS_FTSLexer extends Lexer {
         try {
             int _type = WS;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\alfresco\\HEAD\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:424:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
-            // W:\\alfresco\\HEAD\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:425:9: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            // W:\\alfresco\\BRANCHES\\DEV\\V3.3-BUG-FIX\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:395:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
+            // W:\\alfresco\\BRANCHES\\DEV\\V3.3-BUG-FIX\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:396:9: ( ' ' | '\\t' | '\\r' | '\\n' )+
             {
-            // W:\\alfresco\\HEAD\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:425:9: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            // W:\\alfresco\\BRANCHES\\DEV\\V3.3-BUG-FIX\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:396:9: ( ' ' | '\\t' | '\\r' | '\\n' )+
             int cnt2=0;
             loop2:
             do {
@@ -288,7 +261,7 @@ public class CMIS_FTSLexer extends Lexer {
 
                 switch (alt2) {
             	case 1 :
-            	    // W:\\alfresco\\HEAD\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:
+            	    // W:\\alfresco\\BRANCHES\\DEV\\V3.3-BUG-FIX\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:
             	    {
             	    if ( (input.LA(1)>='\t' && input.LA(1)<='\n')||input.LA(1)=='\r'||input.LA(1)==' ' ) {
             	        input.consume();
@@ -329,11 +302,11 @@ public class CMIS_FTSLexer extends Lexer {
         try {
             int _type = FTSWORD;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // W:\\alfresco\\HEAD\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:436:9: ( START_WORD ( IN_WORD )* )
-            // W:\\alfresco\\HEAD\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:437:9: START_WORD ( IN_WORD )*
+            // W:\\alfresco\\BRANCHES\\DEV\\V3.3-BUG-FIX\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:407:9: ( START_WORD ( IN_WORD )* )
+            // W:\\alfresco\\BRANCHES\\DEV\\V3.3-BUG-FIX\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:408:9: START_WORD ( IN_WORD )*
             {
             mSTART_WORD(); 
-            // W:\\alfresco\\HEAD\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:437:20: ( IN_WORD )*
+            // W:\\alfresco\\BRANCHES\\DEV\\V3.3-BUG-FIX\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:408:20: ( IN_WORD )*
             loop3:
             do {
                 int alt3=2;
@@ -346,7 +319,7 @@ public class CMIS_FTSLexer extends Lexer {
 
                 switch (alt3) {
             	case 1 :
-            	    // W:\\alfresco\\HEAD\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:437:20: IN_WORD
+            	    // W:\\alfresco\\BRANCHES\\DEV\\V3.3-BUG-FIX\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:408:20: IN_WORD
             	    {
             	    mIN_WORD(); 
 
@@ -372,8 +345,8 @@ public class CMIS_FTSLexer extends Lexer {
     // $ANTLR start "START_WORD"
     public final void mSTART_WORD() throws RecognitionException {
         try {
-            // W:\\alfresco\\HEAD\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:442:9: (~ ( ' ' | '\\t' | '\\r' | '\\n' | '-' ) )
-            // W:\\alfresco\\HEAD\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:443:9: ~ ( ' ' | '\\t' | '\\r' | '\\n' | '-' )
+            // W:\\alfresco\\BRANCHES\\DEV\\V3.3-BUG-FIX\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:413:9: (~ ( ' ' | '\\t' | '\\r' | '\\n' | '-' ) )
+            // W:\\alfresco\\BRANCHES\\DEV\\V3.3-BUG-FIX\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:414:9: ~ ( ' ' | '\\t' | '\\r' | '\\n' | '-' )
             {
             if ( (input.LA(1)>='\u0000' && input.LA(1)<='\b')||(input.LA(1)>='\u000B' && input.LA(1)<='\f')||(input.LA(1)>='\u000E' && input.LA(1)<='\u001F')||(input.LA(1)>='!' && input.LA(1)<=',')||(input.LA(1)>='.' && input.LA(1)<='\uFFFF') ) {
                 input.consume();
@@ -396,8 +369,8 @@ public class CMIS_FTSLexer extends Lexer {
     // $ANTLR start "IN_WORD"
     public final void mIN_WORD() throws RecognitionException {
         try {
-            // W:\\alfresco\\HEAD\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:454:9: (~ ( ' ' | '\\t' | '\\r' | '\\n' ) )
-            // W:\\alfresco\\HEAD\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:455:9: ~ ( ' ' | '\\t' | '\\r' | '\\n' )
+            // W:\\alfresco\\BRANCHES\\DEV\\V3.3-BUG-FIX\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:425:9: (~ ( ' ' | '\\t' | '\\r' | '\\n' ) )
+            // W:\\alfresco\\BRANCHES\\DEV\\V3.3-BUG-FIX\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:426:9: ~ ( ' ' | '\\t' | '\\r' | '\\n' )
             {
             if ( (input.LA(1)>='\u0000' && input.LA(1)<='\b')||(input.LA(1)>='\u000B' && input.LA(1)<='\f')||(input.LA(1)>='\u000E' && input.LA(1)<='\u001F')||(input.LA(1)>='!' && input.LA(1)<='\uFFFF') ) {
                 input.consume();
@@ -418,40 +391,40 @@ public class CMIS_FTSLexer extends Lexer {
     // $ANTLR end "IN_WORD"
 
     public void mTokens() throws RecognitionException {
-        // W:\\alfresco\\HEAD\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:1:8: ( FTSPHRASE | OR | MINUS | WS | FTSWORD )
+        // W:\\alfresco\\BRANCHES\\DEV\\V3.3-BUG-FIX\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:1:8: ( FTSPHRASE | OR | MINUS | WS | FTSWORD )
         int alt4=5;
         alt4 = dfa4.predict(input);
         switch (alt4) {
             case 1 :
-                // W:\\alfresco\\HEAD\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:1:10: FTSPHRASE
+                // W:\\alfresco\\BRANCHES\\DEV\\V3.3-BUG-FIX\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:1:10: FTSPHRASE
                 {
                 mFTSPHRASE(); 
 
                 }
                 break;
             case 2 :
-                // W:\\alfresco\\HEAD\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:1:20: OR
+                // W:\\alfresco\\BRANCHES\\DEV\\V3.3-BUG-FIX\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:1:20: OR
                 {
                 mOR(); 
 
                 }
                 break;
             case 3 :
-                // W:\\alfresco\\HEAD\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:1:23: MINUS
+                // W:\\alfresco\\BRANCHES\\DEV\\V3.3-BUG-FIX\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:1:23: MINUS
                 {
                 mMINUS(); 
 
                 }
                 break;
             case 4 :
-                // W:\\alfresco\\HEAD\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:1:29: WS
+                // W:\\alfresco\\BRANCHES\\DEV\\V3.3-BUG-FIX\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:1:29: WS
                 {
                 mWS(); 
 
                 }
                 break;
             case 5 :
-                // W:\\alfresco\\HEAD\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:1:32: FTSWORD
+                // W:\\alfresco\\BRANCHES\\DEV\\V3.3-BUG-FIX\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:1:32: FTSWORD
                 {
                 mFTSWORD(); 
 
@@ -475,13 +448,14 @@ public class CMIS_FTSLexer extends Lexer {
     static final String DFA4_acceptS =
         "\3\uffff\1\3\1\4\2\5\3\uffff\1\1\1\uffff\1\5\1\uffff\1\1\1\2";
     static final String DFA4_specialS =
-        "\1\7\1\2\1\0\4\uffff\1\5\1\1\1\3\1\uffff\1\4\1\uffff\1\6\2\uffff}>";
+        "\1\6\1\5\1\4\4\uffff\1\1\1\0\1\7\1\uffff\1\2\1\uffff\1\3\2\uffff}>";
     static final String[] DFA4_transitionS = {
-            "\11\5\2\4\2\5\1\4\22\5\1\4\6\5\1\1\5\5\1\3\41\5\1\2\uffb0\5",
+            "\11\5\2\4\2\5\1\4\22\5\1\4\6\5\1\1\5\5\1\3\41\5\1\2\37\5\1"+
+            "\2\uff90\5",
             "\11\10\2\12\2\10\1\12\22\10\1\12\6\10\1\11\64\10\1\7\uffa3"+
             "\10",
-            "\11\14\2\uffff\2\14\1\uffff\22\14\1\uffff\61\14\1\13\uffad"+
-            "\14",
+            "\11\14\2\uffff\2\14\1\uffff\22\14\1\uffff\61\14\1\13\37\14"+
+            "\1\13\uff8d\14",
             "",
             "",
             "",
@@ -537,18 +511,6 @@ public class CMIS_FTSLexer extends Lexer {
         	int _s = s;
             switch ( s ) {
                     case 0 : 
-                        int LA4_2 = input.LA(1);
-
-                        s = -1;
-                        if ( (LA4_2=='R') ) {s = 11;}
-
-                        else if ( ((LA4_2>='\u0000' && LA4_2<='\b')||(LA4_2>='\u000B' && LA4_2<='\f')||(LA4_2>='\u000E' && LA4_2<='\u001F')||(LA4_2>='!' && LA4_2<='Q')||(LA4_2>='S' && LA4_2<='\uFFFF')) ) {s = 12;}
-
-                        else s = 6;
-
-                        if ( s>=0 ) return s;
-                        break;
-                    case 1 : 
                         int LA4_8 = input.LA(1);
 
                         s = -1;
@@ -564,43 +526,7 @@ public class CMIS_FTSLexer extends Lexer {
 
                         if ( s>=0 ) return s;
                         break;
-                    case 2 : 
-                        int LA4_1 = input.LA(1);
-
-                        s = -1;
-                        if ( (LA4_1=='\\') ) {s = 7;}
-
-                        else if ( ((LA4_1>='\u0000' && LA4_1<='\b')||(LA4_1>='\u000B' && LA4_1<='\f')||(LA4_1>='\u000E' && LA4_1<='\u001F')||(LA4_1>='!' && LA4_1<='&')||(LA4_1>='(' && LA4_1<='[')||(LA4_1>=']' && LA4_1<='\uFFFF')) ) {s = 8;}
-
-                        else if ( (LA4_1=='\'') ) {s = 9;}
-
-                        else if ( ((LA4_1>='\t' && LA4_1<='\n')||LA4_1=='\r'||LA4_1==' ') ) {s = 10;}
-
-                        else s = 6;
-
-                        if ( s>=0 ) return s;
-                        break;
-                    case 3 : 
-                        int LA4_9 = input.LA(1);
-
-                        s = -1;
-                        if ( ((LA4_9>='\u0000' && LA4_9<='\b')||(LA4_9>='\u000B' && LA4_9<='\f')||(LA4_9>='\u000E' && LA4_9<='\u001F')||(LA4_9>='!' && LA4_9<='\uFFFF')) ) {s = 12;}
-
-                        else s = 14;
-
-                        if ( s>=0 ) return s;
-                        break;
-                    case 4 : 
-                        int LA4_11 = input.LA(1);
-
-                        s = -1;
-                        if ( ((LA4_11>='\u0000' && LA4_11<='\b')||(LA4_11>='\u000B' && LA4_11<='\f')||(LA4_11>='\u000E' && LA4_11<='\u001F')||(LA4_11>='!' && LA4_11<='\uFFFF')) ) {s = 12;}
-
-                        else s = 15;
-
-                        if ( s>=0 ) return s;
-                        break;
-                    case 5 : 
+                    case 1 : 
                         int LA4_7 = input.LA(1);
 
                         s = -1;
@@ -612,7 +538,17 @@ public class CMIS_FTSLexer extends Lexer {
 
                         if ( s>=0 ) return s;
                         break;
-                    case 6 : 
+                    case 2 : 
+                        int LA4_11 = input.LA(1);
+
+                        s = -1;
+                        if ( ((LA4_11>='\u0000' && LA4_11<='\b')||(LA4_11>='\u000B' && LA4_11<='\f')||(LA4_11>='\u000E' && LA4_11<='\u001F')||(LA4_11>='!' && LA4_11<='\uFFFF')) ) {s = 12;}
+
+                        else s = 15;
+
+                        if ( s>=0 ) return s;
+                        break;
+                    case 3 : 
                         int LA4_13 = input.LA(1);
 
                         s = -1;
@@ -628,19 +564,57 @@ public class CMIS_FTSLexer extends Lexer {
 
                         if ( s>=0 ) return s;
                         break;
-                    case 7 : 
+                    case 4 : 
+                        int LA4_2 = input.LA(1);
+
+                        s = -1;
+                        if ( (LA4_2=='R'||LA4_2=='r') ) {s = 11;}
+
+                        else if ( ((LA4_2>='\u0000' && LA4_2<='\b')||(LA4_2>='\u000B' && LA4_2<='\f')||(LA4_2>='\u000E' && LA4_2<='\u001F')||(LA4_2>='!' && LA4_2<='Q')||(LA4_2>='S' && LA4_2<='q')||(LA4_2>='s' && LA4_2<='\uFFFF')) ) {s = 12;}
+
+                        else s = 6;
+
+                        if ( s>=0 ) return s;
+                        break;
+                    case 5 : 
+                        int LA4_1 = input.LA(1);
+
+                        s = -1;
+                        if ( (LA4_1=='\\') ) {s = 7;}
+
+                        else if ( ((LA4_1>='\u0000' && LA4_1<='\b')||(LA4_1>='\u000B' && LA4_1<='\f')||(LA4_1>='\u000E' && LA4_1<='\u001F')||(LA4_1>='!' && LA4_1<='&')||(LA4_1>='(' && LA4_1<='[')||(LA4_1>=']' && LA4_1<='\uFFFF')) ) {s = 8;}
+
+                        else if ( (LA4_1=='\'') ) {s = 9;}
+
+                        else if ( ((LA4_1>='\t' && LA4_1<='\n')||LA4_1=='\r'||LA4_1==' ') ) {s = 10;}
+
+                        else s = 6;
+
+                        if ( s>=0 ) return s;
+                        break;
+                    case 6 : 
                         int LA4_0 = input.LA(1);
 
                         s = -1;
                         if ( (LA4_0=='\'') ) {s = 1;}
 
-                        else if ( (LA4_0=='O') ) {s = 2;}
+                        else if ( (LA4_0=='O'||LA4_0=='o') ) {s = 2;}
 
                         else if ( (LA4_0=='-') ) {s = 3;}
 
                         else if ( ((LA4_0>='\t' && LA4_0<='\n')||LA4_0=='\r'||LA4_0==' ') ) {s = 4;}
 
-                        else if ( ((LA4_0>='\u0000' && LA4_0<='\b')||(LA4_0>='\u000B' && LA4_0<='\f')||(LA4_0>='\u000E' && LA4_0<='\u001F')||(LA4_0>='!' && LA4_0<='&')||(LA4_0>='(' && LA4_0<=',')||(LA4_0>='.' && LA4_0<='N')||(LA4_0>='P' && LA4_0<='\uFFFF')) ) {s = 5;}
+                        else if ( ((LA4_0>='\u0000' && LA4_0<='\b')||(LA4_0>='\u000B' && LA4_0<='\f')||(LA4_0>='\u000E' && LA4_0<='\u001F')||(LA4_0>='!' && LA4_0<='&')||(LA4_0>='(' && LA4_0<=',')||(LA4_0>='.' && LA4_0<='N')||(LA4_0>='P' && LA4_0<='n')||(LA4_0>='p' && LA4_0<='\uFFFF')) ) {s = 5;}
+
+                        if ( s>=0 ) return s;
+                        break;
+                    case 7 : 
+                        int LA4_9 = input.LA(1);
+
+                        s = -1;
+                        if ( ((LA4_9>='\u0000' && LA4_9<='\b')||(LA4_9>='\u000B' && LA4_9<='\f')||(LA4_9>='\u000E' && LA4_9<='\u001F')||(LA4_9>='!' && LA4_9<='\uFFFF')) ) {s = 12;}
+
+                        else s = 14;
 
                         if ( s>=0 ) return s;
                         break;
diff --git a/source/java/org/alfresco/repo/search/impl/parsers/CMIS_FTSParser.java b/source/java/org/alfresco/repo/search/impl/parsers/CMIS_FTSParser.java
index 6b04f00a16..44448a476d 100644
--- a/source/java/org/alfresco/repo/search/impl/parsers/CMIS_FTSParser.java
+++ b/source/java/org/alfresco/repo/search/impl/parsers/CMIS_FTSParser.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.2 Sep 23, 2009 12:02:23 W:\\alfresco\\HEAD\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g 2010-04-26 15:09:27
+// $ANTLR 3.2 Sep 23, 2009 12:02:23 W:\\alfresco\\BRANCHES\\DEV\\V3.3-BUG-FIX\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g 2010-05-17 15:10:38
 
 package org.alfresco.repo.search.impl.parsers;
 
@@ -13,54 +13,23 @@ import org.antlr.runtime.tree.*;
 
 public class CMIS_FTSParser extends Parser {
     public static final String[] tokenNames = new String[] {
-        "<invalid>", "<EOR>", "<DOWN>", "<UP>", "FTS", "DISJUNCTION", "CONJUNCTION", "NEGATION", "TERM", "EXACT_TERM", "PHRASE", "SYNONYM", "RANGE", "PROXIMITY", "DEFAULT", "MANDATORY", "OPTIONAL", "EXCLUDE", "FIELD_DISJUNCTION", "FIELD_CONJUNCTION", "FIELD_NEGATION", "FIELD_GROUP", "FIELD_DEFAULT", "FIELD_MANDATORY", "FIELD_OPTIONAL", "FIELD_EXCLUDE", "FG_TERM", "FG_EXACT_TERM", "FG_PHRASE", "FG_SYNONYM", "FG_PROXIMITY", "FG_RANGE", "FIELD_REF", "INCLUSIVE", "EXCLUSIVE", "QUALIFIER", "PREFIX", "NAME_SPACE", "BOOST", "FUZZY", "TEMPLATE", "MINUS", "FTSWORD", "FTSPHRASE", "OR", "F_ESC", "WS", "START_WORD", "IN_WORD"
+        "<invalid>", "<EOR>", "<DOWN>", "<UP>", "DISJUNCTION", "CONJUNCTION", "TERM", "PHRASE", "DEFAULT", "EXCLUDE", "MINUS", "FTSWORD", "FTSPHRASE", "OR", "F_ESC", "WS", "START_WORD", "IN_WORD"
     };
-    public static final int TERM=8;
-    public static final int PREFIX=36;
-    public static final int FG_PROXIMITY=30;
-    public static final int FG_TERM=26;
-    public static final int EXACT_TERM=9;
-    public static final int FUZZY=39;
-    public static final int FIELD_DISJUNCTION=18;
-    public static final int MANDATORY=15;
-    public static final int FG_EXACT_TERM=27;
-    public static final int FIELD_EXCLUDE=25;
-    public static final int EXCLUSIVE=34;
+    public static final int TERM=6;
+    public static final int START_WORD=16;
+    public static final int DISJUNCTION=4;
+    public static final int WS=15;
+    public static final int FTSPHRASE=12;
+    public static final int CONJUNCTION=5;
+    public static final int OR=13;
+    public static final int DEFAULT=8;
+    public static final int IN_WORD=17;
+    public static final int MINUS=10;
     public static final int EOF=-1;
-    public static final int NAME_SPACE=37;
-    public static final int BOOST=38;
-    public static final int START_WORD=47;
-    public static final int FIELD_DEFAULT=22;
-    public static final int FIELD_OPTIONAL=24;
-    public static final int F_ESC=45;
-    public static final int SYNONYM=11;
-    public static final int EXCLUDE=17;
-    public static final int QUALIFIER=35;
-    public static final int CONJUNCTION=6;
-    public static final int FIELD_GROUP=21;
-    public static final int DEFAULT=14;
-    public static final int IN_WORD=48;
-    public static final int RANGE=12;
-    public static final int MINUS=41;
-    public static final int PROXIMITY=13;
-    public static final int FIELD_REF=32;
-    public static final int PHRASE=10;
-    public static final int FTSWORD=42;
-    public static final int OPTIONAL=16;
-    public static final int DISJUNCTION=5;
-    public static final int FTS=4;
-    public static final int WS=46;
-    public static final int FG_SYNONYM=29;
-    public static final int NEGATION=7;
-    public static final int TEMPLATE=40;
-    public static final int FTSPHRASE=43;
-    public static final int FIELD_CONJUNCTION=19;
-    public static final int INCLUSIVE=33;
-    public static final int OR=44;
-    public static final int FIELD_MANDATORY=23;
-    public static final int FG_RANGE=31;
-    public static final int FG_PHRASE=28;
-    public static final int FIELD_NEGATION=20;
+    public static final int F_ESC=14;
+    public static final int FTSWORD=11;
+    public static final int PHRASE=7;
+    public static final int EXCLUDE=9;
 
     // delegates
     // delegators
@@ -84,7 +53,7 @@ public class CMIS_FTSParser extends Parser {
     }
 
     public String[] getTokenNames() { return CMIS_FTSParser.tokenNames; }
-    public String getGrammarFileName() { return "W:\\alfresco\\HEAD\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g"; }
+    public String getGrammarFileName() { return "W:\\alfresco\\BRANCHES\\DEV\\V3.3-BUG-FIX\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g"; }
 
 
         private Stack<String> paraphrases = new Stack<String>();
@@ -222,7 +191,7 @@ public class CMIS_FTSParser extends Parser {
     };
 
     // $ANTLR start "cmisFtsQuery"
-    // W:\\alfresco\\HEAD\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:309:1: cmisFtsQuery : ftsCmisDisjunction EOF -> ftsCmisDisjunction ;
+    // W:\\alfresco\\BRANCHES\\DEV\\V3.3-BUG-FIX\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:278:1: cmisFtsQuery : ftsCmisDisjunction EOF -> ftsCmisDisjunction ;
     public final CMIS_FTSParser.cmisFtsQuery_return cmisFtsQuery() throws RecognitionException {
         CMIS_FTSParser.cmisFtsQuery_return retval = new CMIS_FTSParser.cmisFtsQuery_return();
         retval.start = input.LT(1);
@@ -237,16 +206,16 @@ public class CMIS_FTSParser extends Parser {
         RewriteRuleTokenStream stream_EOF=new RewriteRuleTokenStream(adaptor,"token EOF");
         RewriteRuleSubtreeStream stream_ftsCmisDisjunction=new RewriteRuleSubtreeStream(adaptor,"rule ftsCmisDisjunction");
         try {
-            // W:\\alfresco\\HEAD\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:310:9: ( ftsCmisDisjunction EOF -> ftsCmisDisjunction )
-            // W:\\alfresco\\HEAD\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:311:9: ftsCmisDisjunction EOF
+            // W:\\alfresco\\BRANCHES\\DEV\\V3.3-BUG-FIX\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:279:9: ( ftsCmisDisjunction EOF -> ftsCmisDisjunction )
+            // W:\\alfresco\\BRANCHES\\DEV\\V3.3-BUG-FIX\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:280:9: ftsCmisDisjunction EOF
             {
-            pushFollow(FOLLOW_ftsCmisDisjunction_in_cmisFtsQuery535);
+            pushFollow(FOLLOW_ftsCmisDisjunction_in_cmisFtsQuery194);
             ftsCmisDisjunction1=ftsCmisDisjunction();
 
             state._fsp--;
 
             stream_ftsCmisDisjunction.add(ftsCmisDisjunction1.getTree());
-            EOF2=(Token)match(input,EOF,FOLLOW_EOF_in_cmisFtsQuery537);  
+            EOF2=(Token)match(input,EOF,FOLLOW_EOF_in_cmisFtsQuery196);  
             stream_EOF.add(EOF2);
 
 
@@ -262,7 +231,7 @@ public class CMIS_FTSParser extends Parser {
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 312:17: -> ftsCmisDisjunction
+            // 281:17: -> ftsCmisDisjunction
             {
                 adaptor.addChild(root_0, stream_ftsCmisDisjunction.nextTree());
 
@@ -294,7 +263,7 @@ public class CMIS_FTSParser extends Parser {
     };
 
     // $ANTLR start "ftsCmisDisjunction"
-    // W:\\alfresco\\HEAD\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:320:1: ftsCmisDisjunction : ftsCmisConjunction ( or ftsCmisConjunction )* -> ^( DISJUNCTION ( ftsCmisConjunction )+ ) ;
+    // W:\\alfresco\\BRANCHES\\DEV\\V3.3-BUG-FIX\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:289:1: ftsCmisDisjunction : ftsCmisConjunction ( or ftsCmisConjunction )* -> ^( DISJUNCTION ( ftsCmisConjunction )+ ) ;
     public final CMIS_FTSParser.ftsCmisDisjunction_return ftsCmisDisjunction() throws RecognitionException {
         CMIS_FTSParser.ftsCmisDisjunction_return retval = new CMIS_FTSParser.ftsCmisDisjunction_return();
         retval.start = input.LT(1);
@@ -311,16 +280,16 @@ public class CMIS_FTSParser extends Parser {
         RewriteRuleSubtreeStream stream_ftsCmisConjunction=new RewriteRuleSubtreeStream(adaptor,"rule ftsCmisConjunction");
         RewriteRuleSubtreeStream stream_or=new RewriteRuleSubtreeStream(adaptor,"rule or");
         try {
-            // W:\\alfresco\\HEAD\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:321:9: ( ftsCmisConjunction ( or ftsCmisConjunction )* -> ^( DISJUNCTION ( ftsCmisConjunction )+ ) )
-            // W:\\alfresco\\HEAD\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:322:9: ftsCmisConjunction ( or ftsCmisConjunction )*
+            // W:\\alfresco\\BRANCHES\\DEV\\V3.3-BUG-FIX\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:290:9: ( ftsCmisConjunction ( or ftsCmisConjunction )* -> ^( DISJUNCTION ( ftsCmisConjunction )+ ) )
+            // W:\\alfresco\\BRANCHES\\DEV\\V3.3-BUG-FIX\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:291:9: ftsCmisConjunction ( or ftsCmisConjunction )*
             {
-            pushFollow(FOLLOW_ftsCmisConjunction_in_ftsCmisDisjunction593);
+            pushFollow(FOLLOW_ftsCmisConjunction_in_ftsCmisDisjunction252);
             ftsCmisConjunction3=ftsCmisConjunction();
 
             state._fsp--;
 
             stream_ftsCmisConjunction.add(ftsCmisConjunction3.getTree());
-            // W:\\alfresco\\HEAD\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:322:28: ( or ftsCmisConjunction )*
+            // W:\\alfresco\\BRANCHES\\DEV\\V3.3-BUG-FIX\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:291:28: ( or ftsCmisConjunction )*
             loop1:
             do {
                 int alt1=2;
@@ -333,15 +302,15 @@ public class CMIS_FTSParser extends Parser {
 
                 switch (alt1) {
             	case 1 :
-            	    // W:\\alfresco\\HEAD\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:322:29: or ftsCmisConjunction
+            	    // W:\\alfresco\\BRANCHES\\DEV\\V3.3-BUG-FIX\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:291:29: or ftsCmisConjunction
             	    {
-            	    pushFollow(FOLLOW_or_in_ftsCmisDisjunction596);
+            	    pushFollow(FOLLOW_or_in_ftsCmisDisjunction255);
             	    or4=or();
 
             	    state._fsp--;
 
             	    stream_or.add(or4.getTree());
-            	    pushFollow(FOLLOW_ftsCmisConjunction_in_ftsCmisDisjunction598);
+            	    pushFollow(FOLLOW_ftsCmisConjunction_in_ftsCmisDisjunction257);
             	    ftsCmisConjunction5=ftsCmisConjunction();
 
             	    state._fsp--;
@@ -369,9 +338,9 @@ public class CMIS_FTSParser extends Parser {
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 323:17: -> ^( DISJUNCTION ( ftsCmisConjunction )+ )
+            // 292:17: -> ^( DISJUNCTION ( ftsCmisConjunction )+ )
             {
-                // W:\\alfresco\\HEAD\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:324:25: ^( DISJUNCTION ( ftsCmisConjunction )+ )
+                // W:\\alfresco\\BRANCHES\\DEV\\V3.3-BUG-FIX\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:293:25: ^( DISJUNCTION ( ftsCmisConjunction )+ )
                 {
                 Object root_1 = (Object)adaptor.nil();
                 root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(DISJUNCTION, "DISJUNCTION"), root_1);
@@ -416,7 +385,7 @@ public class CMIS_FTSParser extends Parser {
     };
 
     // $ANTLR start "ftsCmisConjunction"
-    // W:\\alfresco\\HEAD\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:327:1: ftsCmisConjunction : ( ftsCmisPrefixed )+ -> ^( CONJUNCTION ( ftsCmisPrefixed )+ ) ;
+    // W:\\alfresco\\BRANCHES\\DEV\\V3.3-BUG-FIX\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:296:1: ftsCmisConjunction : ( ftsCmisPrefixed )+ -> ^( CONJUNCTION ( ftsCmisPrefixed )+ ) ;
     public final CMIS_FTSParser.ftsCmisConjunction_return ftsCmisConjunction() throws RecognitionException {
         CMIS_FTSParser.ftsCmisConjunction_return retval = new CMIS_FTSParser.ftsCmisConjunction_return();
         retval.start = input.LT(1);
@@ -428,10 +397,10 @@ public class CMIS_FTSParser extends Parser {
 
         RewriteRuleSubtreeStream stream_ftsCmisPrefixed=new RewriteRuleSubtreeStream(adaptor,"rule ftsCmisPrefixed");
         try {
-            // W:\\alfresco\\HEAD\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:328:9: ( ( ftsCmisPrefixed )+ -> ^( CONJUNCTION ( ftsCmisPrefixed )+ ) )
-            // W:\\alfresco\\HEAD\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:329:9: ( ftsCmisPrefixed )+
+            // W:\\alfresco\\BRANCHES\\DEV\\V3.3-BUG-FIX\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:297:9: ( ( ftsCmisPrefixed )+ -> ^( CONJUNCTION ( ftsCmisPrefixed )+ ) )
+            // W:\\alfresco\\BRANCHES\\DEV\\V3.3-BUG-FIX\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:298:9: ( ftsCmisPrefixed )+
             {
-            // W:\\alfresco\\HEAD\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:329:9: ( ftsCmisPrefixed )+
+            // W:\\alfresco\\BRANCHES\\DEV\\V3.3-BUG-FIX\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:298:9: ( ftsCmisPrefixed )+
             int cnt2=0;
             loop2:
             do {
@@ -445,9 +414,9 @@ public class CMIS_FTSParser extends Parser {
 
                 switch (alt2) {
             	case 1 :
-            	    // W:\\alfresco\\HEAD\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:329:9: ftsCmisPrefixed
+            	    // W:\\alfresco\\BRANCHES\\DEV\\V3.3-BUG-FIX\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:298:9: ftsCmisPrefixed
             	    {
-            	    pushFollow(FOLLOW_ftsCmisPrefixed_in_ftsCmisConjunction682);
+            	    pushFollow(FOLLOW_ftsCmisPrefixed_in_ftsCmisConjunction341);
             	    ftsCmisPrefixed6=ftsCmisPrefixed();
 
             	    state._fsp--;
@@ -479,9 +448,9 @@ public class CMIS_FTSParser extends Parser {
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 330:17: -> ^( CONJUNCTION ( ftsCmisPrefixed )+ )
+            // 299:17: -> ^( CONJUNCTION ( ftsCmisPrefixed )+ )
             {
-                // W:\\alfresco\\HEAD\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:331:25: ^( CONJUNCTION ( ftsCmisPrefixed )+ )
+                // W:\\alfresco\\BRANCHES\\DEV\\V3.3-BUG-FIX\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:300:25: ^( CONJUNCTION ( ftsCmisPrefixed )+ )
                 {
                 Object root_1 = (Object)adaptor.nil();
                 root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(CONJUNCTION, "CONJUNCTION"), root_1);
@@ -526,7 +495,7 @@ public class CMIS_FTSParser extends Parser {
     };
 
     // $ANTLR start "ftsCmisPrefixed"
-    // W:\\alfresco\\HEAD\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:334:1: ftsCmisPrefixed : ( cmisTest -> ^( DEFAULT cmisTest ) | MINUS cmisTest -> ^( EXCLUDE cmisTest ) );
+    // W:\\alfresco\\BRANCHES\\DEV\\V3.3-BUG-FIX\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:303:1: ftsCmisPrefixed : ( cmisTest -> ^( DEFAULT cmisTest ) | MINUS cmisTest -> ^( EXCLUDE cmisTest ) );
     public final CMIS_FTSParser.ftsCmisPrefixed_return ftsCmisPrefixed() throws RecognitionException {
         CMIS_FTSParser.ftsCmisPrefixed_return retval = new CMIS_FTSParser.ftsCmisPrefixed_return();
         retval.start = input.LT(1);
@@ -543,7 +512,7 @@ public class CMIS_FTSParser extends Parser {
         RewriteRuleTokenStream stream_MINUS=new RewriteRuleTokenStream(adaptor,"token MINUS");
         RewriteRuleSubtreeStream stream_cmisTest=new RewriteRuleSubtreeStream(adaptor,"rule cmisTest");
         try {
-            // W:\\alfresco\\HEAD\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:335:9: ( cmisTest -> ^( DEFAULT cmisTest ) | MINUS cmisTest -> ^( EXCLUDE cmisTest ) )
+            // W:\\alfresco\\BRANCHES\\DEV\\V3.3-BUG-FIX\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:304:9: ( cmisTest -> ^( DEFAULT cmisTest ) | MINUS cmisTest -> ^( EXCLUDE cmisTest ) )
             int alt3=2;
             int LA3_0 = input.LA(1);
 
@@ -561,9 +530,9 @@ public class CMIS_FTSParser extends Parser {
             }
             switch (alt3) {
                 case 1 :
-                    // W:\\alfresco\\HEAD\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:336:9: cmisTest
+                    // W:\\alfresco\\BRANCHES\\DEV\\V3.3-BUG-FIX\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:305:9: cmisTest
                     {
-                    pushFollow(FOLLOW_cmisTest_in_ftsCmisPrefixed765);
+                    pushFollow(FOLLOW_cmisTest_in_ftsCmisPrefixed424);
                     cmisTest7=cmisTest();
 
                     state._fsp--;
@@ -582,9 +551,9 @@ public class CMIS_FTSParser extends Parser {
                     RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
-                    // 337:17: -> ^( DEFAULT cmisTest )
+                    // 306:17: -> ^( DEFAULT cmisTest )
                     {
-                        // W:\\alfresco\\HEAD\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:338:25: ^( DEFAULT cmisTest )
+                        // W:\\alfresco\\BRANCHES\\DEV\\V3.3-BUG-FIX\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:307:25: ^( DEFAULT cmisTest )
                         {
                         Object root_1 = (Object)adaptor.nil();
                         root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(DEFAULT, "DEFAULT"), root_1);
@@ -600,12 +569,12 @@ public class CMIS_FTSParser extends Parser {
                     }
                     break;
                 case 2 :
-                    // W:\\alfresco\\HEAD\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:339:11: MINUS cmisTest
+                    // W:\\alfresco\\BRANCHES\\DEV\\V3.3-BUG-FIX\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:308:11: MINUS cmisTest
                     {
-                    MINUS8=(Token)match(input,MINUS,FOLLOW_MINUS_in_ftsCmisPrefixed825);  
+                    MINUS8=(Token)match(input,MINUS,FOLLOW_MINUS_in_ftsCmisPrefixed484);  
                     stream_MINUS.add(MINUS8);
 
-                    pushFollow(FOLLOW_cmisTest_in_ftsCmisPrefixed827);
+                    pushFollow(FOLLOW_cmisTest_in_ftsCmisPrefixed486);
                     cmisTest9=cmisTest();
 
                     state._fsp--;
@@ -624,9 +593,9 @@ public class CMIS_FTSParser extends Parser {
                     RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
-                    // 340:17: -> ^( EXCLUDE cmisTest )
+                    // 309:17: -> ^( EXCLUDE cmisTest )
                     {
-                        // W:\\alfresco\\HEAD\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:341:25: ^( EXCLUDE cmisTest )
+                        // W:\\alfresco\\BRANCHES\\DEV\\V3.3-BUG-FIX\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:310:25: ^( EXCLUDE cmisTest )
                         {
                         Object root_1 = (Object)adaptor.nil();
                         root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(EXCLUDE, "EXCLUDE"), root_1);
@@ -666,7 +635,7 @@ public class CMIS_FTSParser extends Parser {
     };
 
     // $ANTLR start "cmisTest"
-    // W:\\alfresco\\HEAD\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:344:1: cmisTest : ( cmisTerm -> ^( TERM cmisTerm ) | cmisPhrase -> ^( PHRASE cmisPhrase ) );
+    // W:\\alfresco\\BRANCHES\\DEV\\V3.3-BUG-FIX\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:313:1: cmisTest : ( cmisTerm -> ^( TERM cmisTerm ) | cmisPhrase -> ^( PHRASE cmisPhrase ) );
     public final CMIS_FTSParser.cmisTest_return cmisTest() throws RecognitionException {
         CMIS_FTSParser.cmisTest_return retval = new CMIS_FTSParser.cmisTest_return();
         retval.start = input.LT(1);
@@ -681,7 +650,7 @@ public class CMIS_FTSParser extends Parser {
         RewriteRuleSubtreeStream stream_cmisPhrase=new RewriteRuleSubtreeStream(adaptor,"rule cmisPhrase");
         RewriteRuleSubtreeStream stream_cmisTerm=new RewriteRuleSubtreeStream(adaptor,"rule cmisTerm");
         try {
-            // W:\\alfresco\\HEAD\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:345:9: ( cmisTerm -> ^( TERM cmisTerm ) | cmisPhrase -> ^( PHRASE cmisPhrase ) )
+            // W:\\alfresco\\BRANCHES\\DEV\\V3.3-BUG-FIX\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:314:9: ( cmisTerm -> ^( TERM cmisTerm ) | cmisPhrase -> ^( PHRASE cmisPhrase ) )
             int alt4=2;
             int LA4_0 = input.LA(1);
 
@@ -699,9 +668,9 @@ public class CMIS_FTSParser extends Parser {
             }
             switch (alt4) {
                 case 1 :
-                    // W:\\alfresco\\HEAD\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:346:9: cmisTerm
+                    // W:\\alfresco\\BRANCHES\\DEV\\V3.3-BUG-FIX\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:315:9: cmisTerm
                     {
-                    pushFollow(FOLLOW_cmisTerm_in_cmisTest908);
+                    pushFollow(FOLLOW_cmisTerm_in_cmisTest567);
                     cmisTerm10=cmisTerm();
 
                     state._fsp--;
@@ -720,9 +689,9 @@ public class CMIS_FTSParser extends Parser {
                     RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
-                    // 347:17: -> ^( TERM cmisTerm )
+                    // 316:17: -> ^( TERM cmisTerm )
                     {
-                        // W:\\alfresco\\HEAD\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:348:25: ^( TERM cmisTerm )
+                        // W:\\alfresco\\BRANCHES\\DEV\\V3.3-BUG-FIX\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:317:25: ^( TERM cmisTerm )
                         {
                         Object root_1 = (Object)adaptor.nil();
                         root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(TERM, "TERM"), root_1);
@@ -738,9 +707,9 @@ public class CMIS_FTSParser extends Parser {
                     }
                     break;
                 case 2 :
-                    // W:\\alfresco\\HEAD\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:349:11: cmisPhrase
+                    // W:\\alfresco\\BRANCHES\\DEV\\V3.3-BUG-FIX\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:318:11: cmisPhrase
                     {
-                    pushFollow(FOLLOW_cmisPhrase_in_cmisTest968);
+                    pushFollow(FOLLOW_cmisPhrase_in_cmisTest627);
                     cmisPhrase11=cmisPhrase();
 
                     state._fsp--;
@@ -759,9 +728,9 @@ public class CMIS_FTSParser extends Parser {
                     RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
                     root_0 = (Object)adaptor.nil();
-                    // 350:17: -> ^( PHRASE cmisPhrase )
+                    // 319:17: -> ^( PHRASE cmisPhrase )
                     {
-                        // W:\\alfresco\\HEAD\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:351:25: ^( PHRASE cmisPhrase )
+                        // W:\\alfresco\\BRANCHES\\DEV\\V3.3-BUG-FIX\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:320:25: ^( PHRASE cmisPhrase )
                         {
                         Object root_1 = (Object)adaptor.nil();
                         root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(PHRASE, "PHRASE"), root_1);
@@ -801,7 +770,7 @@ public class CMIS_FTSParser extends Parser {
     };
 
     // $ANTLR start "cmisTerm"
-    // W:\\alfresco\\HEAD\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:355:1: cmisTerm : FTSWORD -> FTSWORD ;
+    // W:\\alfresco\\BRANCHES\\DEV\\V3.3-BUG-FIX\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:324:1: cmisTerm : FTSWORD -> FTSWORD ;
     public final CMIS_FTSParser.cmisTerm_return cmisTerm() throws RecognitionException {
         CMIS_FTSParser.cmisTerm_return retval = new CMIS_FTSParser.cmisTerm_return();
         retval.start = input.LT(1);
@@ -814,10 +783,10 @@ public class CMIS_FTSParser extends Parser {
         RewriteRuleTokenStream stream_FTSWORD=new RewriteRuleTokenStream(adaptor,"token FTSWORD");
 
         try {
-            // W:\\alfresco\\HEAD\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:356:9: ( FTSWORD -> FTSWORD )
-            // W:\\alfresco\\HEAD\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:357:9: FTSWORD
+            // W:\\alfresco\\BRANCHES\\DEV\\V3.3-BUG-FIX\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:325:9: ( FTSWORD -> FTSWORD )
+            // W:\\alfresco\\BRANCHES\\DEV\\V3.3-BUG-FIX\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:326:9: FTSWORD
             {
-            FTSWORD12=(Token)match(input,FTSWORD,FOLLOW_FTSWORD_in_cmisTerm1058);  
+            FTSWORD12=(Token)match(input,FTSWORD,FOLLOW_FTSWORD_in_cmisTerm717);  
             stream_FTSWORD.add(FTSWORD12);
 
 
@@ -833,7 +802,7 @@ public class CMIS_FTSParser extends Parser {
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 358:17: -> FTSWORD
+            // 327:17: -> FTSWORD
             {
                 adaptor.addChild(root_0, stream_FTSWORD.nextNode());
 
@@ -865,7 +834,7 @@ public class CMIS_FTSParser extends Parser {
     };
 
     // $ANTLR start "cmisPhrase"
-    // W:\\alfresco\\HEAD\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:361:1: cmisPhrase : FTSPHRASE -> FTSPHRASE ;
+    // W:\\alfresco\\BRANCHES\\DEV\\V3.3-BUG-FIX\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:330:1: cmisPhrase : FTSPHRASE -> FTSPHRASE ;
     public final CMIS_FTSParser.cmisPhrase_return cmisPhrase() throws RecognitionException {
         CMIS_FTSParser.cmisPhrase_return retval = new CMIS_FTSParser.cmisPhrase_return();
         retval.start = input.LT(1);
@@ -878,10 +847,10 @@ public class CMIS_FTSParser extends Parser {
         RewriteRuleTokenStream stream_FTSPHRASE=new RewriteRuleTokenStream(adaptor,"token FTSPHRASE");
 
         try {
-            // W:\\alfresco\\HEAD\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:362:9: ( FTSPHRASE -> FTSPHRASE )
-            // W:\\alfresco\\HEAD\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:363:9: FTSPHRASE
+            // W:\\alfresco\\BRANCHES\\DEV\\V3.3-BUG-FIX\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:331:9: ( FTSPHRASE -> FTSPHRASE )
+            // W:\\alfresco\\BRANCHES\\DEV\\V3.3-BUG-FIX\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:332:9: FTSPHRASE
             {
-            FTSPHRASE13=(Token)match(input,FTSPHRASE,FOLLOW_FTSPHRASE_in_cmisPhrase1111);  
+            FTSPHRASE13=(Token)match(input,FTSPHRASE,FOLLOW_FTSPHRASE_in_cmisPhrase770);  
             stream_FTSPHRASE.add(FTSPHRASE13);
 
 
@@ -897,7 +866,7 @@ public class CMIS_FTSParser extends Parser {
             RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null);
 
             root_0 = (Object)adaptor.nil();
-            // 364:17: -> FTSPHRASE
+            // 333:17: -> FTSPHRASE
             {
                 adaptor.addChild(root_0, stream_FTSPHRASE.nextNode());
 
@@ -929,7 +898,7 @@ public class CMIS_FTSParser extends Parser {
     };
 
     // $ANTLR start "or"
-    // W:\\alfresco\\HEAD\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:367:1: or : OR ;
+    // W:\\alfresco\\BRANCHES\\DEV\\V3.3-BUG-FIX\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:336:1: or : OR ;
     public final CMIS_FTSParser.or_return or() throws RecognitionException {
         CMIS_FTSParser.or_return retval = new CMIS_FTSParser.or_return();
         retval.start = input.LT(1);
@@ -941,12 +910,12 @@ public class CMIS_FTSParser extends Parser {
         Object OR14_tree=null;
 
         try {
-            // W:\\alfresco\\HEAD\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:368:9: ( OR )
-            // W:\\alfresco\\HEAD\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:369:9: OR
+            // W:\\alfresco\\BRANCHES\\DEV\\V3.3-BUG-FIX\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:337:9: ( OR )
+            // W:\\alfresco\\BRANCHES\\DEV\\V3.3-BUG-FIX\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\CMIS_FTS.g:338:9: OR
             {
             root_0 = (Object)adaptor.nil();
 
-            OR14=(Token)match(input,OR,FOLLOW_OR_in_or1164); 
+            OR14=(Token)match(input,OR,FOLLOW_OR_in_or823); 
             OR14_tree = (Object)adaptor.create(OR14);
             adaptor.addChild(root_0, OR14_tree);
 
@@ -975,19 +944,19 @@ public class CMIS_FTSParser extends Parser {
 
  
 
-    public static final BitSet FOLLOW_ftsCmisDisjunction_in_cmisFtsQuery535 = new BitSet(new long[]{0x0000000000000000L});
-    public static final BitSet FOLLOW_EOF_in_cmisFtsQuery537 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_ftsCmisConjunction_in_ftsCmisDisjunction593 = new BitSet(new long[]{0x0000100000000002L});
-    public static final BitSet FOLLOW_or_in_ftsCmisDisjunction596 = new BitSet(new long[]{0x00000E0000000000L});
-    public static final BitSet FOLLOW_ftsCmisConjunction_in_ftsCmisDisjunction598 = new BitSet(new long[]{0x0000100000000002L});
-    public static final BitSet FOLLOW_ftsCmisPrefixed_in_ftsCmisConjunction682 = new BitSet(new long[]{0x00000E0000000002L});
-    public static final BitSet FOLLOW_cmisTest_in_ftsCmisPrefixed765 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_MINUS_in_ftsCmisPrefixed825 = new BitSet(new long[]{0x00000C0000000000L});
-    public static final BitSet FOLLOW_cmisTest_in_ftsCmisPrefixed827 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_cmisTerm_in_cmisTest908 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_cmisPhrase_in_cmisTest968 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_FTSWORD_in_cmisTerm1058 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_FTSPHRASE_in_cmisPhrase1111 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_OR_in_or1164 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ftsCmisDisjunction_in_cmisFtsQuery194 = new BitSet(new long[]{0x0000000000000000L});
+    public static final BitSet FOLLOW_EOF_in_cmisFtsQuery196 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_ftsCmisConjunction_in_ftsCmisDisjunction252 = new BitSet(new long[]{0x0000000000002002L});
+    public static final BitSet FOLLOW_or_in_ftsCmisDisjunction255 = new BitSet(new long[]{0x0000000000001C00L});
+    public static final BitSet FOLLOW_ftsCmisConjunction_in_ftsCmisDisjunction257 = new BitSet(new long[]{0x0000000000002002L});
+    public static final BitSet FOLLOW_ftsCmisPrefixed_in_ftsCmisConjunction341 = new BitSet(new long[]{0x0000000000001C02L});
+    public static final BitSet FOLLOW_cmisTest_in_ftsCmisPrefixed424 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_MINUS_in_ftsCmisPrefixed484 = new BitSet(new long[]{0x0000000000001800L});
+    public static final BitSet FOLLOW_cmisTest_in_ftsCmisPrefixed486 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_cmisTerm_in_cmisTest567 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_cmisPhrase_in_cmisTest627 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_FTSWORD_in_cmisTerm717 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_FTSPHRASE_in_cmisPhrase770 = new BitSet(new long[]{0x0000000000000002L});
+    public static final BitSet FOLLOW_OR_in_or823 = new BitSet(new long[]{0x0000000000000002L});
 
 }
\ No newline at end of file
diff --git a/source/java/org/alfresco/repo/search/impl/parsers/FTSLexer.java b/source/java/org/alfresco/repo/search/impl/parsers/FTSLexer.java
index 822e60d1df..b71c43bd12 100644
--- a/source/java/org/alfresco/repo/search/impl/parsers/FTSLexer.java
+++ b/source/java/org/alfresco/repo/search/impl/parsers/FTSLexer.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.2 Sep 23, 2009 12:02:23 W:\\alfresco\\HEAD\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g 2010-04-26 13:41:22
+// $ANTLR 3.2 Sep 23, 2009 12:02:23 W:\\alfresco\\HEAD\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g 2010-05-01 13:03:39
 
 package org.alfresco.repo.search.impl.parsers;
 import org.alfresco.cmis.CMISQueryException;
diff --git a/source/java/org/alfresco/repo/search/impl/parsers/FTSParser.java b/source/java/org/alfresco/repo/search/impl/parsers/FTSParser.java
index 3340dd8ba0..7049eab5f0 100644
--- a/source/java/org/alfresco/repo/search/impl/parsers/FTSParser.java
+++ b/source/java/org/alfresco/repo/search/impl/parsers/FTSParser.java
@@ -1,4 +1,4 @@
-// $ANTLR 3.2 Sep 23, 2009 12:02:23 W:\\alfresco\\HEAD\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g 2010-04-26 13:41:21
+// $ANTLR 3.2 Sep 23, 2009 12:02:23 W:\\alfresco\\HEAD\\root\\projects\\repository\\source\\java\\org\\alfresco\\repo\\search\\impl\\parsers\\FTS.g 2010-05-01 13:03:38
 
 package org.alfresco.repo.search.impl.parsers;
 
@@ -1380,7 +1380,7 @@ public class FTSParser extends Parser {
 
 
                     // AST REWRITE
-                    // elements: boost, ftsTest
+                    // elements: ftsTest, boost
                     // token labels: 
                     // rule labels: retval
                     // token list labels: 
@@ -1929,7 +1929,7 @@ public class FTSParser extends Parser {
 
 
                     // AST REWRITE
-                    // elements: ftsTerm, fuzzy
+                    // elements: fuzzy, ftsTerm
                     // token labels: 
                     // rule labels: retval
                     // token list labels: 
@@ -1994,7 +1994,7 @@ public class FTSParser extends Parser {
 
 
                     // AST REWRITE
-                    // elements: fuzzy, ftsExactTerm
+                    // elements: ftsExactTerm, fuzzy
                     // token labels: 
                     // rule labels: retval
                     // token list labels: 
@@ -2059,7 +2059,7 @@ public class FTSParser extends Parser {
 
 
                     // AST REWRITE
-                    // elements: slop, ftsPhrase
+                    // elements: ftsPhrase, slop
                     // token labels: 
                     // rule labels: retval
                     // token list labels: 
@@ -2124,7 +2124,7 @@ public class FTSParser extends Parser {
 
 
                     // AST REWRITE
-                    // elements: fuzzy, ftsSynonym
+                    // elements: ftsSynonym, fuzzy
                     // token labels: 
                     // rule labels: retval
                     // token list labels: 
@@ -3261,7 +3261,7 @@ public class FTSParser extends Parser {
 
 
             // AST REWRITE
-            // elements: fieldReference, FTSPHRASE
+            // elements: FTSPHRASE, fieldReference
             // token labels: 
             // rule labels: retval
             // token list labels: 
@@ -3527,7 +3527,7 @@ public class FTSParser extends Parser {
 
 
             // AST REWRITE
-            // elements: fieldReference, ftsFieldGroupRange
+            // elements: ftsFieldGroupRange, fieldReference
             // token labels: 
             // rule labels: retval
             // token list labels: 
@@ -4647,7 +4647,7 @@ public class FTSParser extends Parser {
 
 
                     // AST REWRITE
-                    // elements: boost, ftsFieldGroupTest
+                    // elements: ftsFieldGroupTest, boost
                     // token labels: 
                     // rule labels: retval
                     // token list labels: 
@@ -5848,7 +5848,7 @@ public class FTSParser extends Parser {
 
 
                     // AST REWRITE
-                    // elements: range_right, ftsRangeWord, ftsRangeWord, range_left
+                    // elements: range_right, ftsRangeWord, range_left, ftsRangeWord
                     // token labels: 
                     // rule labels: retval
                     // token list labels: 
@@ -6220,7 +6220,7 @@ public class FTSParser extends Parser {
 
 
             // AST REWRITE
-            // elements: identifier, prefix, uri
+            // elements: prefix, uri, identifier
             // token labels: 
             // rule labels: retval
             // token list labels: 
@@ -6369,7 +6369,7 @@ public class FTSParser extends Parser {
 
 
             // AST REWRITE
-            // elements: identifier, prefix, uri
+            // elements: identifier, uri, prefix
             // token labels: 
             // rule labels: retval
             // token list labels: 
diff --git a/source/java/org/alfresco/repo/search/impl/parsers/cmis_fts_test.gunit b/source/java/org/alfresco/repo/search/impl/parsers/cmis_fts_test.gunit
index de5c483c84..3d05ee6f05 100644
--- a/source/java/org/alfresco/repo/search/impl/parsers/cmis_fts_test.gunit
+++ b/source/java/org/alfresco/repo/search/impl/parsers/cmis_fts_test.gunit
@@ -63,9 +63,9 @@ FTSPHRASE:
 
 OR:
 "OR" OK
-"or" FAIL
-"Or" FAIL
-"oR" FAIL
+"or" OK
+"Or" OK
+"oR" OK
 
 MINUS:
 "-" OK
diff --git a/source/java/org/alfresco/repo/security/SecurityTestSuite.java b/source/java/org/alfresco/repo/security/SecurityTestSuite.java
new file mode 100644
index 0000000000..b637a37086
--- /dev/null
+++ b/source/java/org/alfresco/repo/security/SecurityTestSuite.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright (C) 2005-2010 Alfresco Software Limited.
+ *
+ * This file is part of Alfresco
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.alfresco.repo.security;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import org.alfresco.repo.ownable.impl.OwnableServiceTest;
+import org.alfresco.repo.security.authentication.AuthenticationBootstrapTest;
+import org.alfresco.repo.security.authentication.AuthenticationTest;
+import org.alfresco.repo.security.authentication.ChainingAuthenticationServiceTest;
+import org.alfresco.repo.security.authentication.NameBasedUserNameGeneratorTest;
+import org.alfresco.repo.security.authority.AuthorityServiceTest;
+import org.alfresco.repo.security.authority.DuplicateAuthorityTest;
+import org.alfresco.repo.security.authority.ExtendedPermissionServiceTest;
+import org.alfresco.repo.security.authority.SimpleAuthorityServiceTest;
+import org.alfresco.repo.security.permissions.dynamic.LockOwnerDynamicAuthorityTest;
+import org.alfresco.repo.security.permissions.impl.AclDaoComponentTest;
+import org.alfresco.repo.security.permissions.impl.PermissionServiceTest;
+import org.alfresco.repo.security.permissions.impl.acegi.ACLEntryAfterInvocationTest;
+import org.alfresco.repo.security.permissions.impl.acegi.ACLEntryVoterTest;
+import org.alfresco.repo.security.permissions.impl.acegi.FilteringResultSetTest;
+import org.alfresco.repo.security.permissions.impl.model.PermissionModelTest;
+import org.alfresco.repo.security.person.PersonTest;
+
+/**
+ * @author Andy Hind
+ *
+ */
+public class SecurityTestSuite extends TestSuite
+{
+
+    /**
+     * Creates the test suite
+     * 
+     * @return  the test suite
+     */
+    public static Test suite() 
+    {
+        TestSuite suite = new TestSuite();
+        suite.addTestSuite(AuthenticationBootstrapTest.class);
+        suite.addTestSuite(AuthenticationTest.class);
+        suite.addTestSuite(ChainingAuthenticationServiceTest.class);
+        suite.addTestSuite(NameBasedUserNameGeneratorTest.class);
+        suite.addTestSuite(AuthorityServiceTest.class);
+        suite.addTestSuite(DuplicateAuthorityTest.class);
+        suite.addTestSuite(ExtendedPermissionServiceTest.class);
+        suite.addTestSuite(SimpleAuthorityServiceTest.class);
+        suite.addTestSuite(LockOwnerDynamicAuthorityTest.class);
+        suite.addTestSuite(AclDaoComponentTest.class);
+        suite.addTestSuite(PermissionServiceTest.class);
+        suite.addTestSuite(ACLEntryAfterInvocationTest.class);
+        suite.addTestSuite(ACLEntryVoterTest.class);
+        suite.addTestSuite(FilteringResultSetTest.class);
+        suite.addTestSuite(PermissionModelTest.class);
+        suite.addTestSuite(PersonTest.class);
+        // Note  org.alfresco.repo.security.sync.ChainingUserRegistrySynchronizerTest has its own context and runs on its own 
+        // suite.addTestSuite(ChainingUserRegistrySynchronizerTest.class);
+        suite.addTestSuite(OwnableServiceTest.class);    
+       
+        return suite;
+    }
+}
diff --git a/source/java/org/alfresco/repo/security/authentication/AuthenticationTest.java b/source/java/org/alfresco/repo/security/authentication/AuthenticationTest.java
index baab37819f..d206a42bb1 100644
--- a/source/java/org/alfresco/repo/security/authentication/AuthenticationTest.java
+++ b/source/java/org/alfresco/repo/security/authentication/AuthenticationTest.java
@@ -26,6 +26,7 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
+import javax.transaction.Status;
 import javax.transaction.UserTransaction;
 
 import junit.framework.TestCase;
@@ -205,8 +206,11 @@ public class AuthenticationTest extends TestCase
     @Override
     protected void tearDown() throws Exception
     {
-        authenticationComponentImpl.clearCurrentSecurityContext();
-        userTransaction.rollback();
+        if ((userTransaction.getStatus() == Status.STATUS_ACTIVE) || (userTransaction.getStatus() == Status.STATUS_MARKED_ROLLBACK))
+        {
+            userTransaction.rollback();
+        }
+        AuthenticationUtil.clearCurrentSecurityContext();
         super.tearDown();
     }
 
diff --git a/source/java/org/alfresco/repo/security/authority/AuthorityServiceTest.java b/source/java/org/alfresco/repo/security/authority/AuthorityServiceTest.java
index 4ec92b705f..689531aab8 100644
--- a/source/java/org/alfresco/repo/security/authority/AuthorityServiceTest.java
+++ b/source/java/org/alfresco/repo/security/authority/AuthorityServiceTest.java
@@ -25,6 +25,7 @@ import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
+import javax.transaction.Status;
 import javax.transaction.UserTransaction;
 
 import junit.framework.TestCase;
@@ -150,8 +151,11 @@ public class AuthorityServiceTest extends TestCase
     @Override
     protected void tearDown() throws Exception
     {
-        authenticationComponentImpl.clearCurrentSecurityContext();
-        tx.rollback();
+        if ((tx.getStatus() == Status.STATUS_ACTIVE) || (tx.getStatus() == Status.STATUS_MARKED_ROLLBACK))
+        {
+            tx.rollback();
+        }
+        AuthenticationUtil.clearCurrentSecurityContext();
         super.tearDown();
     }
 
@@ -585,6 +589,7 @@ public class AuthorityServiceTest extends TestCase
         assertEquals(7, pubAuthorityService.getAllAuthorities(AuthorityType.GROUP).size());
         assertEquals(4, pubAuthorityService.getAllRootAuthorities(AuthorityType.GROUP).size());
 
+        //System.out.println("Users: "+ pubAuthorityService.getAllAuthorities(AuthorityType.USER));
         checkAuthorityCollectionSize(3, pubAuthorityService.getAllAuthorities(AuthorityType.USER), AuthorityType.USER);
         pubAuthorityService.addAuthority(auth5, "andy");
         assertEquals(7, pubAuthorityService.getAllAuthorities(AuthorityType.GROUP).size());
diff --git a/source/java/org/alfresco/repo/security/authority/SimpleAuthorityServiceTest.java b/source/java/org/alfresco/repo/security/authority/SimpleAuthorityServiceTest.java
index 7b522a9dbb..a9e8c97513 100644
--- a/source/java/org/alfresco/repo/security/authority/SimpleAuthorityServiceTest.java
+++ b/source/java/org/alfresco/repo/security/authority/SimpleAuthorityServiceTest.java
@@ -18,6 +18,7 @@
  */
 package org.alfresco.repo.security.authority;
 
+import javax.transaction.Status;
 import javax.transaction.UserTransaction;
 
 import junit.framework.TestCase;
@@ -94,8 +95,11 @@ public class SimpleAuthorityServiceTest extends TestCase
     @Override
     protected void tearDown() throws Exception
     {
+        if ((tx.getStatus() == Status.STATUS_ACTIVE) || (tx.getStatus() == Status.STATUS_MARKED_ROLLBACK))
+        {
+            tx.rollback();
+        }
         AuthenticationUtil.clearCurrentSecurityContext();
-        tx.rollback();
         super.tearDown();
     }
 
diff --git a/source/java/org/alfresco/repo/security/permissions/dynamic/LockOwnerDynamicAuthorityTest.java b/source/java/org/alfresco/repo/security/permissions/dynamic/LockOwnerDynamicAuthorityTest.java
index 2343df0b78..8c42fa97e6 100644
--- a/source/java/org/alfresco/repo/security/permissions/dynamic/LockOwnerDynamicAuthorityTest.java
+++ b/source/java/org/alfresco/repo/security/permissions/dynamic/LockOwnerDynamicAuthorityTest.java
@@ -21,12 +21,14 @@ package org.alfresco.repo.security.permissions.dynamic;
 import java.io.Serializable;
 import java.util.Map;
 
+import javax.transaction.Status;
 import javax.transaction.UserTransaction;
 
 import junit.framework.TestCase;
 
 import org.alfresco.model.ContentModel;
 import org.alfresco.repo.security.authentication.AuthenticationComponent;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
 import org.alfresco.repo.security.authentication.MutableAuthenticationDao;
 import org.alfresco.service.ServiceRegistry;
 import org.alfresco.service.cmr.coci.CheckOutCheckInService;
@@ -142,8 +144,11 @@ public class LockOwnerDynamicAuthorityTest extends TestCase
     @Override
     protected void tearDown() throws Exception
     {
-        authenticationComponent.clearCurrentSecurityContext();
-        userTransaction.rollback();
+        if ((userTransaction.getStatus() == Status.STATUS_ACTIVE) || (userTransaction.getStatus() == Status.STATUS_MARKED_ROLLBACK))
+        {
+            userTransaction.rollback();
+        }
+        AuthenticationUtil.clearCurrentSecurityContext();
         super.tearDown();
     }
 
diff --git a/source/java/org/alfresco/repo/security/permissions/impl/AbstractPermissionTest.java b/source/java/org/alfresco/repo/security/permissions/impl/AbstractPermissionTest.java
index b1ff55c05d..ace264a57f 100644
--- a/source/java/org/alfresco/repo/security/permissions/impl/AbstractPermissionTest.java
+++ b/source/java/org/alfresco/repo/security/permissions/impl/AbstractPermissionTest.java
@@ -22,6 +22,11 @@ import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Map;
 
+import javax.transaction.Status;
+import javax.transaction.UserTransaction;
+
+import junit.framework.TestCase;
+
 import org.alfresco.model.ContentModel;
 import org.alfresco.repo.node.db.NodeDaoService;
 import org.alfresco.repo.security.authentication.AuthenticationComponent;
@@ -42,12 +47,15 @@ import org.alfresco.service.cmr.security.PersonService;
 import org.alfresco.service.namespace.NamespacePrefixResolver;
 import org.alfresco.service.namespace.NamespaceService;
 import org.alfresco.service.namespace.QName;
-import org.alfresco.util.BaseSpringTest;
+import org.alfresco.service.transaction.TransactionService;
+import org.alfresco.util.ApplicationContextHelper;
+import org.springframework.context.ApplicationContext;
 import org.springframework.orm.hibernate3.LocalSessionFactoryBean;
 
-public class AbstractPermissionTest extends BaseSpringTest
+public class AbstractPermissionTest extends TestCase
 {
-
+    private static ApplicationContext applicationContext = ApplicationContextHelper.getApplicationContext();
+    
     protected static final String ROLE_AUTHENTICATED = "ROLE_AUTHENTICATED";
 
     protected NodeService nodeService;
@@ -86,13 +94,17 @@ public class AbstractPermissionTest extends BaseSpringTest
 
     protected RetryingTransactionHelper retryingTransactionHelper;
 
+    private TransactionService transactionService;
+
+    private UserTransaction testTX;
+
     public AbstractPermissionTest()
     {
         super();
         // TODO Auto-generated constructor stub
     }
 
-    protected void onSetUpInTransaction() throws Exception
+    public void setUp() throws Exception
     {
         nodeService = (NodeService) applicationContext.getBean("nodeService");
         dictionaryService = (DictionaryService) applicationContext.getBean(ServiceRegistry.DICTIONARY_SERVICE
@@ -115,6 +127,11 @@ public class AbstractPermissionTest extends BaseSpringTest
         
         retryingTransactionHelper = (RetryingTransactionHelper) applicationContext.getBean("retryingTransactionHelper");
         
+        transactionService = (TransactionService) applicationContext.getBean("transactionComponent");
+        
+        testTX = transactionService.getUserTransaction();
+        testTX.begin();
+        
         
         StoreRef storeRef = nodeService.createStore(StoreRef.PROTOCOL_WORKSPACE, "Test_" + System.nanoTime());
         rootNodeRef = nodeService.getRootNode(storeRef);
@@ -153,20 +170,19 @@ public class AbstractPermissionTest extends BaseSpringTest
         authenticationComponent.clearCurrentSecurityContext();
     }
 
-    protected void onTearDownInTransaction() throws Exception
+    @Override
+    protected void tearDown() throws Exception
     {
-        try
+
+        if ((testTX.getStatus() == Status.STATUS_ACTIVE) || (testTX.getStatus() == Status.STATUS_MARKED_ROLLBACK))
         {
-            flushAndClear();
+            testTX.rollback();
         }
-        catch (Throwable e)
-        {
-            // don't absorb the exception
-            e.printStackTrace();
-        }
-        super.onTearDownInTransaction();
+        AuthenticationUtil.clearCurrentSecurityContext();
+        super.tearDown();
     }
 
+
     protected void runAs(String userName)
     {
         authenticationService.authenticate(userName, userName.toCharArray());
diff --git a/source/java/org/alfresco/repo/security/permissions/impl/AclDaoComponent.java b/source/java/org/alfresco/repo/security/permissions/impl/AclDaoComponent.java
index 4884d53604..481212420b 100644
--- a/source/java/org/alfresco/repo/security/permissions/impl/AclDaoComponent.java
+++ b/source/java/org/alfresco/repo/security/permissions/impl/AclDaoComponent.java
@@ -28,6 +28,7 @@ import org.alfresco.repo.security.permissions.ACLCopyMode;
 import org.alfresco.repo.security.permissions.AccessControlEntry;
 import org.alfresco.repo.security.permissions.AccessControlList;
 import org.alfresco.repo.security.permissions.AccessControlListProperties;
+import org.alfresco.repo.security.permissions.SimpleAccessControlListProperties;
 import org.alfresco.repo.transaction.TransactionalDao;
 
 /**
@@ -253,4 +254,10 @@ public interface AclDaoComponent extends TransactionalDao
      */
     @DirtySessionAnnotation(markDirty=false)
     Long getNewInStore();
+
+    /**
+     * @return
+     */
+    @DirtySessionAnnotation(markDirty=false)
+    SimpleAccessControlListProperties getDefaultProperties();
 }
diff --git a/source/java/org/alfresco/repo/security/permissions/impl/AclDaoComponentTest.java b/source/java/org/alfresco/repo/security/permissions/impl/AclDaoComponentTest.java
index ca14699a44..569ccea070 100644
--- a/source/java/org/alfresco/repo/security/permissions/impl/AclDaoComponentTest.java
+++ b/source/java/org/alfresco/repo/security/permissions/impl/AclDaoComponentTest.java
@@ -170,7 +170,7 @@ public class AclDaoComponentTest extends TestCase
     protected void tearDown() throws Exception
     {
 
-        if (testTX.getStatus() == Status.STATUS_ACTIVE)
+        if ((testTX.getStatus() == Status.STATUS_ACTIVE) || (testTX.getStatus() == Status.STATUS_MARKED_ROLLBACK))
         {
             testTX.rollback();
         }
diff --git a/source/java/org/alfresco/repo/security/permissions/impl/PermissionServiceTest.java b/source/java/org/alfresco/repo/security/permissions/impl/PermissionServiceTest.java
index bba0349a13..c36ab32fa7 100644
--- a/source/java/org/alfresco/repo/security/permissions/impl/PermissionServiceTest.java
+++ b/source/java/org/alfresco/repo/security/permissions/impl/PermissionServiceTest.java
@@ -29,6 +29,7 @@ import net.sf.acegisecurity.GrantedAuthority;
 import org.alfresco.model.ContentModel;
 import org.alfresco.repo.model.filefolder.FileFolderServiceImpl;
 import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.security.permissions.ACLType;
 import org.alfresco.repo.security.permissions.AccessControlEntry;
 import org.alfresco.repo.security.permissions.AccessDeniedException;
 import org.alfresco.repo.security.permissions.PermissionEntry;
@@ -82,7 +83,13 @@ public class PermissionServiceTest extends AbstractPermissionTest
         assertTrue(permissionService.hasPermission(test, PermissionService.CONTRIBUTOR) == AccessStatus.DENIED);
         
         runAs("admin");
-        nodeService.moveNode(test, two, ContentModel.ASSOC_CHILDREN, QName.createQName("{namespace}test"));
+        ChildAssociationRef newAssoc = nodeService.moveNode(test, two, ContentModel.ASSOC_CHILDREN, QName.createQName("{namespace}test"));
+        assertTrue(nodeService.exists(test));
+        assertTrue(nodeService.exists(one));
+        assertTrue(nodeService.exists(two));
+        nodeDaoService.getNodePair(test);
+        nodeDaoService.getNodePair(one);
+        nodeDaoService.getNodePair(two);
         assertEquals(two, nodeService.getPrimaryParent(test).getParentRef());
         
         runAs("andy");
@@ -208,9 +215,9 @@ public class PermissionServiceTest extends AbstractPermissionTest
     }
 
     @Override
-    protected void onSetUpInTransaction() throws Exception
+    public void setUp() throws Exception
     {
-        super.onSetUpInTransaction();
+        super.setUp();
         denyAndyAll = new SimplePermissionEntry(rootNodeRef, permissionService.getAllPermissionReference(), "andy", AccessStatus.DENIED);
         allowAndyAll = new SimplePermissionEntry(rootNodeRef, permissionService.getAllPermissionReference(), "andy", AccessStatus.ALLOWED);
         denyAndyRead = new SimplePermissionEntry(rootNodeRef, getPermission(PermissionService.READ), "andy", AccessStatus.DENIED);
@@ -222,46 +229,92 @@ public class PermissionServiceTest extends AbstractPermissionTest
 
     public void testDelete()
     {
-        runAs(AuthenticationUtil.getAdminUserName());
+        if(aclDaoComponent.getDefaultProperties().getAclType() == ACLType.DEFINING)
+        {
+            runAs(AuthenticationUtil.getAdminUserName());
 
-        NodeRef n1 = nodeService.createNode(rootNodeRef, ContentModel.ASSOC_CHILDREN, QName.createQName("{namespace}one"), ContentModel.TYPE_FOLDER).getChildRef();
-        NodeRef n2 = nodeService.createNode(n1, ContentModel.ASSOC_CONTAINS, QName.createQName("{namespace}two"), ContentModel.TYPE_FOLDER).getChildRef();
+            NodeRef n1 = nodeService.createNode(rootNodeRef, ContentModel.ASSOC_CHILDREN, QName.createQName("{namespace}one"), ContentModel.TYPE_FOLDER).getChildRef();
+            NodeRef n2 = nodeService.createNode(n1, ContentModel.ASSOC_CONTAINS, QName.createQName("{namespace}two"), ContentModel.TYPE_FOLDER).getChildRef();
 
-        assertEquals(0, permissionService.getAllSetPermissions(n1).size());
-        assertEquals(0, permissionService.getAllSetPermissions(n2).size());
+            assertEquals(0, permissionService.getAllSetPermissions(n1).size());
+            assertEquals(0, permissionService.getAllSetPermissions(n2).size());
 
-        permissionService.deletePermissions(n1);
-        permissionService.deletePermissions(n2);
+            permissionService.deletePermissions(n1);
+            permissionService.deletePermissions(n2);
 
-        permissionService.setPermission(new SimplePermissionEntry(n1, getPermission(PermissionService.READ), "andy", AccessStatus.ALLOWED));
+            permissionService.setPermission(new SimplePermissionEntry(n1, getPermission(PermissionService.READ), "andy", AccessStatus.ALLOWED));
 
-        assertEquals(1, permissionService.getAllSetPermissions(n1).size());
-        assertEquals(1, permissionService.getAllSetPermissions(n2).size());
+            assertEquals(1, permissionService.getAllSetPermissions(n1).size());
+            assertEquals(1, permissionService.getAllSetPermissions(n2).size());
 
-        permissionService.deletePermissions(n2);
+            permissionService.deletePermissions(n2);
 
-        assertEquals(1, permissionService.getAllSetPermissions(n1).size());
-        assertEquals(1, permissionService.getAllSetPermissions(n2).size());
+            assertEquals(1, permissionService.getAllSetPermissions(n1).size());
+            assertEquals(1, permissionService.getAllSetPermissions(n2).size());
 
-        permissionService.setPermission(new SimplePermissionEntry(n2, getPermission(PermissionService.WRITE), "andy", AccessStatus.ALLOWED));
+            permissionService.setPermission(new SimplePermissionEntry(n2, getPermission(PermissionService.WRITE), "andy", AccessStatus.ALLOWED));
 
-        assertEquals(1, permissionService.getAllSetPermissions(n1).size());
-        assertEquals(2, permissionService.getAllSetPermissions(n2).size());
+            assertEquals(1, permissionService.getAllSetPermissions(n1).size());
+            assertEquals(2, permissionService.getAllSetPermissions(n2).size());
 
-        permissionService.deletePermissions(n2);
+            permissionService.deletePermissions(n2);
 
-        assertEquals(1, permissionService.getAllSetPermissions(n1).size());
-        assertEquals(1, permissionService.getAllSetPermissions(n2).size());
+            assertEquals(1, permissionService.getAllSetPermissions(n1).size());
+            assertEquals(1, permissionService.getAllSetPermissions(n2).size());
 
-        permissionService.setPermission(new SimplePermissionEntry(n2, getPermission(PermissionService.WRITE), "andy", AccessStatus.ALLOWED));
+            permissionService.setPermission(new SimplePermissionEntry(n2, getPermission(PermissionService.WRITE), "andy", AccessStatus.ALLOWED));
 
-        assertEquals(1, permissionService.getAllSetPermissions(n1).size());
-        assertEquals(2, permissionService.getAllSetPermissions(n2).size());
+            assertEquals(1, permissionService.getAllSetPermissions(n1).size());
+            assertEquals(2, permissionService.getAllSetPermissions(n2).size());
 
-        permissionService.deletePermissions(n1);
+            permissionService.deletePermissions(n1);
 
-        assertEquals(0, permissionService.getAllSetPermissions(n1).size());
-        assertEquals(1, permissionService.getAllSetPermissions(n2).size());
+            assertEquals(0, permissionService.getAllSetPermissions(n1).size());
+            assertEquals(1, permissionService.getAllSetPermissions(n2).size());
+        }
+        else
+        {
+            runAs(AuthenticationUtil.getAdminUserName());
+
+            NodeRef n1 = nodeService.createNode(rootNodeRef, ContentModel.ASSOC_CHILDREN, QName.createQName("{namespace}one"), ContentModel.TYPE_FOLDER).getChildRef();
+            NodeRef n2 = nodeService.createNode(n1, ContentModel.ASSOC_CONTAINS, QName.createQName("{namespace}two"), ContentModel.TYPE_FOLDER).getChildRef();
+
+            assertEquals(0, permissionService.getAllSetPermissions(n1).size());
+            assertEquals(0, permissionService.getAllSetPermissions(n2).size());
+
+            permissionService.deletePermissions(n1);
+            permissionService.deletePermissions(n2);
+
+            permissionService.setPermission(new SimplePermissionEntry(n1, getPermission(PermissionService.READ), "andy", AccessStatus.ALLOWED));
+
+            assertEquals(1, permissionService.getAllSetPermissions(n1).size());
+            assertEquals(0, permissionService.getAllSetPermissions(n2).size());
+
+            permissionService.deletePermissions(n2);
+
+            assertEquals(1, permissionService.getAllSetPermissions(n1).size());
+            assertEquals(0, permissionService.getAllSetPermissions(n2).size());
+
+            permissionService.setPermission(new SimplePermissionEntry(n2, getPermission(PermissionService.WRITE), "andy", AccessStatus.ALLOWED));
+
+            assertEquals(1, permissionService.getAllSetPermissions(n1).size());
+            assertEquals(1, permissionService.getAllSetPermissions(n2).size());
+
+            permissionService.deletePermissions(n2);
+
+            assertEquals(1, permissionService.getAllSetPermissions(n1).size());
+            assertEquals(0, permissionService.getAllSetPermissions(n2).size());
+
+            permissionService.setPermission(new SimplePermissionEntry(n2, getPermission(PermissionService.WRITE), "andy", AccessStatus.ALLOWED));
+
+            assertEquals(1, permissionService.getAllSetPermissions(n1).size());
+            assertEquals(1, permissionService.getAllSetPermissions(n2).size());
+
+            permissionService.deletePermissions(n1);
+
+            assertEquals(0, permissionService.getAllSetPermissions(n1).size());
+            assertEquals(1, permissionService.getAllSetPermissions(n2).size());
+        }
     }
 
     /**
@@ -269,82 +322,132 @@ public class PermissionServiceTest extends AbstractPermissionTest
      */
     public void testPositionInformation()
     {
-        runAs(AuthenticationUtil.getAdminUserName());
-        NodeRef one = nodeService.createNode(rootNodeRef, ContentModel.ASSOC_CHILDREN, QName.createQName("{namespace}one"), ContentModel.TYPE_FOLDER).getChildRef();
-        NodeRef two = nodeService.createNode(one, ContentModel.ASSOC_CHILDREN, QName.createQName("{namespace}two"), ContentModel.TYPE_FOLDER).getChildRef();
-        NodeRef three = nodeService.createNode(two, ContentModel.ASSOC_CHILDREN, QName.createQName("{namespace}three"), ContentModel.TYPE_FOLDER).getChildRef();
-        NodeRef four = nodeService.createNode(three, ContentModel.ASSOC_CHILDREN, QName.createQName("{namespace}three"), ContentModel.TYPE_FOLDER).getChildRef();
-        permissionService.setPermission(one, "andy", PermissionService.ALL_PERMISSIONS, true);
-        permissionService.setPermission(two, "bob", PermissionService.ALL_PERMISSIONS, true);
-        permissionService.setPermission(three, "carol", PermissionService.ALL_PERMISSIONS, true);
-
-        Set<AccessPermission> set = permissionService.getAllSetPermissions(one);
-        assertEquals(1, set.size());
-        for (AccessPermission ap : set)
+        if(aclDaoComponent.getDefaultProperties().getAclType() == ACLType.DEFINING)
         {
-            if (ap.getAuthority().equals("andy"))
+            runAs(AuthenticationUtil.getAdminUserName());
+            NodeRef one = nodeService.createNode(rootNodeRef, ContentModel.ASSOC_CHILDREN, QName.createQName("{namespace}one"), ContentModel.TYPE_FOLDER).getChildRef();
+            NodeRef two = nodeService.createNode(one, ContentModel.ASSOC_CHILDREN, QName.createQName("{namespace}two"), ContentModel.TYPE_FOLDER).getChildRef();
+            NodeRef three = nodeService.createNode(two, ContentModel.ASSOC_CHILDREN, QName.createQName("{namespace}three"), ContentModel.TYPE_FOLDER).getChildRef();
+            NodeRef four = nodeService.createNode(three, ContentModel.ASSOC_CHILDREN, QName.createQName("{namespace}three"), ContentModel.TYPE_FOLDER).getChildRef();
+            permissionService.setPermission(one, "andy", PermissionService.ALL_PERMISSIONS, true);
+            permissionService.setPermission(two, "bob", PermissionService.ALL_PERMISSIONS, true);
+            permissionService.setPermission(three, "carol", PermissionService.ALL_PERMISSIONS, true);
+
+            Set<AccessPermission> set = permissionService.getAllSetPermissions(one);
+            assertEquals(1, set.size());
+            for (AccessPermission ap : set)
             {
-                assertFalse(ap.isInherited());
-                assertEquals(0, ap.getPosition());
+                if (ap.getAuthority().equals("andy"))
+                {
+                    assertFalse(ap.isInherited());
+                    assertEquals(0, ap.getPosition());
+                }
+            }
+
+            set = permissionService.getAllSetPermissions(two);
+            assertEquals(2, set.size());
+            for (AccessPermission ap : set)
+            {
+                if (ap.getAuthority().equals("andy"))
+                {
+                    assertTrue(ap.isInherited());
+                    assertEquals(2, ap.getPosition());
+                }
+                if (ap.getAuthority().equals("bob"))
+                {
+                    assertFalse(ap.isInherited());
+                    assertEquals(0, ap.getPosition());
+                }
+            }
+
+            set = permissionService.getAllSetPermissions(three);
+            assertEquals(3, set.size());
+            for (AccessPermission ap : set)
+            {
+                if (ap.getAuthority().equals("andy"))
+                {
+                    assertTrue(ap.isInherited());
+                    assertEquals(4, ap.getPosition());
+                }
+                if (ap.getAuthority().equals("bob"))
+                {
+                    assertTrue(ap.isInherited());
+                    assertEquals(2, ap.getPosition());
+                }
+                if (ap.getAuthority().equals("carol"))
+                {
+                    assertFalse(ap.isInherited());
+                    assertEquals(0, ap.getPosition());
+                }
+            }
+
+            set = permissionService.getAllSetPermissions(four);
+            assertEquals(3, set.size());
+            for (AccessPermission ap : set)
+            {
+                if (ap.getAuthority().equals("andy"))
+                {
+                    assertTrue(ap.isInherited());
+                    assertEquals(5, ap.getPosition());
+                }
+                if (ap.getAuthority().equals("bob"))
+                {
+                    assertTrue(ap.isInherited());
+                    assertEquals(3, ap.getPosition());
+                }
+                if (ap.getAuthority().equals("carol"))
+                {
+                    assertTrue(ap.isInherited());
+                    assertEquals(1, ap.getPosition());
+                }
             }
         }
-
-        set = permissionService.getAllSetPermissions(two);
-        assertEquals(2, set.size());
-        for (AccessPermission ap : set)
+        else
         {
-            if (ap.getAuthority().equals("andy"))
-            {
-                assertTrue(ap.isInherited());
-                assertEquals(2, ap.getPosition());
-            }
-            if (ap.getAuthority().equals("bob"))
-            {
-                assertFalse(ap.isInherited());
-                assertEquals(0, ap.getPosition());
-            }
-        }
+            runAs(AuthenticationUtil.getAdminUserName());
+            NodeRef one = nodeService.createNode(rootNodeRef, ContentModel.ASSOC_CHILDREN, QName.createQName("{namespace}one"), ContentModel.TYPE_FOLDER).getChildRef();
+            NodeRef two = nodeService.createNode(one, ContentModel.ASSOC_CHILDREN, QName.createQName("{namespace}two"), ContentModel.TYPE_FOLDER).getChildRef();
+            NodeRef three = nodeService.createNode(two, ContentModel.ASSOC_CHILDREN, QName.createQName("{namespace}three"), ContentModel.TYPE_FOLDER).getChildRef();
+            NodeRef four = nodeService.createNode(three, ContentModel.ASSOC_CHILDREN, QName.createQName("{namespace}three"), ContentModel.TYPE_FOLDER).getChildRef();
+            permissionService.setPermission(one, "andy", PermissionService.ALL_PERMISSIONS, true);
+            permissionService.setPermission(two, "bob", PermissionService.ALL_PERMISSIONS, true);
+            permissionService.setPermission(three, "carol", PermissionService.ALL_PERMISSIONS, true);
 
-        set = permissionService.getAllSetPermissions(three);
-        assertEquals(3, set.size());
-        for (AccessPermission ap : set)
-        {
-            if (ap.getAuthority().equals("andy"))
+            Set<AccessPermission> set = permissionService.getAllSetPermissions(one);
+            assertEquals(1, set.size());
+            for (AccessPermission ap : set)
             {
-                assertTrue(ap.isInherited());
-                assertEquals(4, ap.getPosition());
+                if (ap.getAuthority().equals("andy"))
+                {
+                    assertFalse(ap.isInherited());
+                    assertEquals(0, ap.getPosition());
+                }
             }
-            if (ap.getAuthority().equals("bob"))
-            {
-                assertTrue(ap.isInherited());
-                assertEquals(2, ap.getPosition());
-            }
-            if (ap.getAuthority().equals("carol"))
-            {
-                assertFalse(ap.isInherited());
-                assertEquals(0, ap.getPosition());
-            }
-        }
 
-        set = permissionService.getAllSetPermissions(four);
-        assertEquals(3, set.size());
-        for (AccessPermission ap : set)
-        {
-            if (ap.getAuthority().equals("andy"))
+            set = permissionService.getAllSetPermissions(two);
+            assertEquals(1, set.size());
+            for (AccessPermission ap : set)
             {
-                assertTrue(ap.isInherited());
-                assertEquals(5, ap.getPosition());
+                if (ap.getAuthority().equals("bob"))
+                {
+                    assertFalse(ap.isInherited());
+                    assertEquals(0, ap.getPosition());
+                }
             }
-            if (ap.getAuthority().equals("bob"))
+
+            set = permissionService.getAllSetPermissions(three);
+            assertEquals(1, set.size());
+            for (AccessPermission ap : set)
             {
-                assertTrue(ap.isInherited());
-                assertEquals(3, ap.getPosition());
-            }
-            if (ap.getAuthority().equals("carol"))
-            {
-                assertTrue(ap.isInherited());
-                assertEquals(1, ap.getPosition());
+                if (ap.getAuthority().equals("carol"))
+                {
+                    assertFalse(ap.isInherited());
+                    assertEquals(0, ap.getPosition());
+                }
             }
+
+            set = permissionService.getAllSetPermissions(four);
+            assertEquals(0, set.size());
         }
 
     }
@@ -839,6 +942,7 @@ public class PermissionServiceTest extends AbstractPermissionTest
         // testUnset();
     }
 
+    @SuppressWarnings("unused")
     private void printPermissions(NodeRef nodeRef, String path)
     {
         Long id = nodeDaoService.getNodePair(nodeRef).getFirst();
@@ -1613,16 +1717,16 @@ public class PermissionServiceTest extends AbstractPermissionTest
         long start;
         long end;
         long time = 0;
-        for (int i = 0; i < 1000; i++)
-        {
-            getSession().flush();
-            // getSession().clear();
-            start = System.nanoTime();
-            assertTrue(permissionService.hasPermission(n10, getPermission(PermissionService.READ)) == AccessStatus.ALLOWED);
-            end = System.nanoTime();
-            time += (end - start);
-        }
-        System.out.println("Time is " + (time / 1000000000.0));
+//        for (int i = 0; i < 1000; i++)
+//        {
+//            getSession().flush();
+//            // getSession().clear();
+//            start = System.nanoTime();
+//            assertTrue(permissionService.hasPermission(n10, getPermission(PermissionService.READ)) == AccessStatus.ALLOWED);
+//            end = System.nanoTime();
+//            time += (end - start);
+//        }
+//        System.out.println("Time is " + (time / 1000000000.0));
         // assertTrue((time / 1000000000.0) < 60.0);
 
         time = 0;
diff --git a/source/java/org/alfresco/repo/security/permissions/impl/PermissionsDaoComponent.java b/source/java/org/alfresco/repo/security/permissions/impl/PermissionsDaoComponent.java
index 70c8a38bc3..0352fa7099 100644
--- a/source/java/org/alfresco/repo/security/permissions/impl/PermissionsDaoComponent.java
+++ b/source/java/org/alfresco/repo/security/permissions/impl/PermissionsDaoComponent.java
@@ -18,16 +18,12 @@
  */
 package org.alfresco.repo.security.permissions.impl;
 
-import java.util.Map;
-import java.util.Set;
-
 import org.alfresco.repo.security.permissions.AccessControlListProperties;
 import org.alfresco.repo.security.permissions.NodePermissionEntry;
 import org.alfresco.repo.security.permissions.PermissionEntry;
 import org.alfresco.repo.security.permissions.PermissionReference;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.StoreRef;
-import org.alfresco.service.cmr.security.AccessPermission;
 
 /**
  * The API for accessing persisted Alfresco permissions.
diff --git a/source/java/org/alfresco/repo/security/permissions/impl/acegi/ACLEntryAfterInvocationProvider.java b/source/java/org/alfresco/repo/security/permissions/impl/acegi/ACLEntryAfterInvocationProvider.java
index 5958baa32b..837798d53e 100644
--- a/source/java/org/alfresco/repo/security/permissions/impl/acegi/ACLEntryAfterInvocationProvider.java
+++ b/source/java/org/alfresco/repo/security/permissions/impl/acegi/ACLEntryAfterInvocationProvider.java
@@ -548,8 +548,9 @@ public class ACLEntryAfterInvocationProvider implements AfterInvocationProvider,
                 {
                     filteringResultSet.setIncluded(i, true);
                 }
-                filteringResultSet.setResultSetMetaData(new SimpleResultSetMetaData(LimitBy.FINAL_SIZE, PermissionEvaluationMode.EAGER, returnedObject.getResultSetMetaData()
+                filteringResultSet.setResultSetMetaData(new SimpleResultSetMetaData(returnedObject.getResultSetMetaData().getLimitedBy(), PermissionEvaluationMode.EAGER, returnedObject.getResultSetMetaData()
                         .getSearchParameters()));
+                return filteringResultSet;
             }
             else
             {
@@ -557,15 +558,17 @@ public class ACLEntryAfterInvocationProvider implements AfterInvocationProvider,
                 {
                     filteringResultSet.setIncluded(i, true);
                 }
-                filteringResultSet.setResultSetMetaData(new SimpleResultSetMetaData(LimitBy.UNLIMITED, PermissionEvaluationMode.EAGER, returnedObject.getResultSetMetaData()
+                filteringResultSet.setResultSetMetaData(new SimpleResultSetMetaData(returnedObject.getResultSetMetaData().getLimitedBy(), PermissionEvaluationMode.EAGER, returnedObject.getResultSetMetaData()
                         .getSearchParameters()));
+                return filteringResultSet;
             }
+            
         }
 
         // record the start time
         long startTimeMillis = System.currentTimeMillis();
         // set the default, unlimited resultset type
-        filteringResultSet.setResultSetMetaData(new SimpleResultSetMetaData(LimitBy.UNLIMITED, PermissionEvaluationMode.EAGER, returnedObject.getResultSetMetaData()
+        filteringResultSet.setResultSetMetaData(new SimpleResultSetMetaData(returnedObject.getResultSetMetaData().getLimitedBy(), PermissionEvaluationMode.EAGER, returnedObject.getResultSetMetaData()
                 .getSearchParameters()));
 
         for (int i = 0; i < returnedObject.length(); i++)
diff --git a/source/java/org/alfresco/repo/security/person/PersonTest.java b/source/java/org/alfresco/repo/security/person/PersonTest.java
index 4641235a60..4d0a460517 100644
--- a/source/java/org/alfresco/repo/security/person/PersonTest.java
+++ b/source/java/org/alfresco/repo/security/person/PersonTest.java
@@ -28,9 +28,14 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
+import javax.transaction.Status;
+import javax.transaction.UserTransaction;
+
 import junit.framework.Assert;
+import junit.framework.TestCase;
 
 import org.alfresco.model.ContentModel;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
 import org.alfresco.repo.transaction.RetryingTransactionHelper;
 import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
 import org.alfresco.service.cmr.repository.ChildAssociationRef;
@@ -44,13 +49,16 @@ import org.alfresco.service.cmr.security.PermissionService;
 import org.alfresco.service.cmr.security.PersonService;
 import org.alfresco.service.namespace.QName;
 import org.alfresco.service.transaction.TransactionService;
-import org.alfresco.util.BaseSpringTest;
+import org.alfresco.util.ApplicationContextHelper;
 import org.alfresco.util.EqualsHelper;
 import org.alfresco.util.GUID;
 import org.alfresco.util.PropertyMap;
+import org.springframework.context.ApplicationContext;
 
-public class PersonTest extends BaseSpringTest
+public class PersonTest extends TestCase
 {
+    private static ApplicationContext applicationContext = ApplicationContextHelper.getApplicationContext();
+    
     private TransactionService transactionService;
 
     private PersonService personService;
@@ -63,13 +71,15 @@ public class PersonTest extends BaseSpringTest
 
     private AuthorityService authorityService;
 
+    private UserTransaction testTX;
+
     public PersonTest()
     {
         super();
         // TODO Auto-generated constructor stub
     }
 
-    protected void onSetUpInTransaction() throws Exception
+    public void setUp() throws Exception
     {
         transactionService = (TransactionService) applicationContext.getBean("transactionService");
         personService = (PersonService) applicationContext.getBean("personService");
@@ -77,27 +87,41 @@ public class PersonTest extends BaseSpringTest
         permissionService = (PermissionService) applicationContext.getBean("permissionService");
         authorityService = (AuthorityService) applicationContext.getBean("authorityService");
 
+        
+        testTX = transactionService.getUserTransaction();
+        testTX.begin();
+        
         StoreRef storeRef = nodeService.createStore(StoreRef.PROTOCOL_WORKSPACE, "Test_" + System.currentTimeMillis());
         rootNodeRef = nodeService.getRootNode(storeRef);
 
         for (NodeRef nodeRef : personService.getAllPeople())
         {
             String uid = DefaultTypeConverter.INSTANCE.convert(String.class, nodeService.getProperty(nodeRef, ContentModel.PROP_USERNAME));
-            if (!uid.equals("admin"))
+            if (!uid.equals("admin") && !uid.equals("guest") )
             {
                 nodeService.deleteNode(nodeRef);
             }
         }
 
         personService.setCreateMissingPeople(true);
+        
+        testTX.commit();
+        testTX = transactionService.getUserTransaction();
+        testTX.begin();
     }
 
-    protected void onTearDownInTransaction() throws Exception
+    @Override
+    protected void tearDown() throws Exception
     {
-        super.onTearDownInTransaction();
-    }
 
-    public void xtestLazyHomeFolderCreation()
+        if ((testTX.getStatus() == Status.STATUS_ACTIVE) || (testTX.getStatus() == Status.STATUS_MARKED_ROLLBACK))
+        {
+            testTX.rollback();
+        }
+        AuthenticationUtil.clearCurrentSecurityContext();
+        super.tearDown();
+    }
+    public void xtestLazyHomeFolderCreation() throws Exception
     {
         String firstName = "" + System.currentTimeMillis();
         String lastName = String.format("%05d", -1);
@@ -116,9 +140,9 @@ public class PersonTest extends BaseSpringTest
             throw new IllegalStateException("Home folder created eagerly");
         }
 
-        setComplete();
-        endTransaction();
-        startNewTransaction();
+        testTX.commit();
+        testTX = transactionService.getUserTransaction();
+        testTX.begin();
         
         RetryingTransactionHelper helper = transactionService.getRetryingTransactionHelper();
         helper.doInTransaction(new RetryingTransactionCallback<Void>()
@@ -241,24 +265,24 @@ public class PersonTest extends BaseSpringTest
         }
     }
 
-    public void testDeletePerson()
+    public void testDeletePerson() throws Exception
     {
         personService.getPerson("andy");
         NodeRef n1 = nodeService.createNode(rootNodeRef, ContentModel.ASSOC_CHILDREN, QName.createQName("{namespace}one"), ContentModel.TYPE_FOLDER).getChildRef();
         NodeRef n2 = nodeService.createNode(rootNodeRef, ContentModel.ASSOC_CHILDREN, QName.createQName("{namespace}two"), ContentModel.TYPE_FOLDER).getChildRef();
         permissionService.setPermission(n1, "andy", PermissionService.READ, true);
         permissionService.setPermission(n2, "andy", PermissionService.ALL_PERMISSIONS, true);
-        setComplete();
-        endTransaction();
-        startNewTransaction();
+        testTX.commit();
+        testTX = transactionService.getUserTransaction();
+        testTX.begin();
         nodeService.deleteNode(n1);
-        setComplete();
-        endTransaction();
-        startNewTransaction();
+        testTX.commit();
+        testTX = transactionService.getUserTransaction();
+        testTX.begin();
         personService.deletePerson("andy");
-        setComplete();
-        endTransaction();
-        startNewTransaction();
+        testTX.commit();
+        testTX = transactionService.getUserTransaction();
+        testTX.begin();
     }
 
     public void testCreateAndThenDelete()
@@ -375,7 +399,7 @@ public class PersonTest extends BaseSpringTest
 
         testProperties(personService.getPerson("andy"), "andy", "andy", "", "", "");
 
-        assertEquals(3, personService.getAllPeople().size());
+        assertEquals(4, personService.getAllPeople().size());
         assertTrue(personService.getAllPeople().contains(personService.getPerson("andy")));
         assertTrue(personService.getAllPeople().contains(personService.getPerson("derek")));
 
@@ -420,7 +444,7 @@ public class PersonTest extends BaseSpringTest
 
         testProperties(personService.getPerson("derek"), "derek", "Derek", "Hulley", "dh@dh", "alfresco");
 
-        assertEquals(2, personService.getAllPeople().size());
+        assertEquals(3, personService.getAllPeople().size());
         assertTrue(personService.getAllPeople().contains(personService.getPerson("derek")));
         assertEquals(1, personService.getPeopleFilteredByProperty(ContentModel.PROP_USERNAME, "derek").size());
         assertEquals(1, personService.getPeopleFilteredByProperty(ContentModel.PROP_EMAIL, "dh@dh").size());
@@ -430,7 +454,7 @@ public class PersonTest extends BaseSpringTest
         assertEquals(0, personService.getPeopleFilteredByProperty(ContentModel.PROP_ORGID, "microsoft").size());
 
         personService.deletePerson("derek");
-        assertEquals(1, personService.getAllPeople().size());
+        assertEquals(2, personService.getAllPeople().size());
         try
         {
             personService.getPerson("derek");
@@ -456,7 +480,7 @@ public class PersonTest extends BaseSpringTest
 
         testProperties(personService.getPerson("Derek"), "Derek", "Derek", "Hulley", "dh@dh", "alfresco");
 
-        assertEquals(2, personService.getAllPeople().size());
+        assertEquals(3, personService.getAllPeople().size());
         assertTrue(personService.getAllPeople().contains(personService.getPerson("Derek")));
         assertEquals(1, personService.getPeopleFilteredByProperty(ContentModel.PROP_USERNAME, "Derek").size());
         assertEquals(1, personService.getPeopleFilteredByProperty(ContentModel.PROP_EMAIL, "dh@dh").size());
@@ -469,7 +493,7 @@ public class PersonTest extends BaseSpringTest
         assertEquals(personService.personExists("DEREK"), EqualsHelper.nullSafeEquals(personService.getUserIdentifier("DEREK"), "Derek"));
 
         personService.deletePerson("Derek");
-        assertEquals(1, personService.getAllPeople().size());
+        assertEquals(2, personService.getAllPeople().size());
 
     }
 
@@ -555,8 +579,8 @@ public class PersonTest extends BaseSpringTest
     public void testReadOnlyTransactionHandling() throws Exception
     {
         // Kill the annoying Spring-managed txn
-        super.setComplete();
-        super.endTransaction();
+        testTX.commit();
+        
 
         boolean createMissingPeople = personService.createMissingPeople();
         assertTrue("Default should be to create missing people", createMissingPeople);
@@ -617,8 +641,7 @@ public class PersonTest extends BaseSpringTest
     private void forceSplitPersonCleanup() throws Exception
     {
         // Kill the annoying Spring-managed txn
-        super.setComplete();
-        super.endTransaction();
+        testTX.commit();
 
         boolean createMissingPeople = personService.createMissingPeople();
         assertTrue("Default should be to create missing people", createMissingPeople);
@@ -731,7 +754,7 @@ public class PersonTest extends BaseSpringTest
         }, true, true);        
     }
     
-    public void testSplitDuplicates()
+    public void testSplitDuplicates()  throws Exception
     {
         testProcessDuplicates(true);
 
@@ -744,16 +767,15 @@ public class PersonTest extends BaseSpringTest
         
     }
     
-    public void testDeleteDuplicates()
+    public void testDeleteDuplicates() throws Exception
     {
         testProcessDuplicates(false);        
     }
 
-    private void testProcessDuplicates(final boolean split)
+    private void testProcessDuplicates(final boolean split) throws Exception
     {
         // Kill the annoying Spring-managed txn
-        super.setComplete();
-        super.endTransaction();
+        testTX.commit();
 
         // Set the duplicate processing mode
         ((PersonServiceImpl) personService).setDuplicateMode(split ? "SPLIT" : "DELETE");
diff --git a/source/java/org/alfresco/repo/security/sync/ChainingUserRegistrySynchronizer.java b/source/java/org/alfresco/repo/security/sync/ChainingUserRegistrySynchronizer.java
index 3ee4087890..bd551fe460 100644
--- a/source/java/org/alfresco/repo/security/sync/ChainingUserRegistrySynchronizer.java
+++ b/source/java/org/alfresco/repo/security/sync/ChainingUserRegistrySynchronizer.java
@@ -136,9 +136,6 @@ public class ChainingUserRegistrySynchronizer extends AbstractLifecycleBean impl
     /** The transaction service. */
     private TransactionService transactionService;
 
-    /** The retrying transaction helper. */
-    private RetryingTransactionHelper retryingTransactionHelper;
-
     /** The rule service. */
     private RuleService ruleService;
 
@@ -227,7 +224,6 @@ public class ChainingUserRegistrySynchronizer extends AbstractLifecycleBean impl
     public void setTransactionService(TransactionService transactionService)
     {
         this.transactionService = transactionService;
-        this.retryingTransactionHelper = transactionService.getRetryingTransactionHelper();
     }
 
     /**
@@ -344,7 +340,7 @@ public class ChainingUserRegistrySynchronizer extends AbstractLifecycleBean impl
                 {
                     // If this is an automated sync on startup or scheduled sync, don't even wait around for the lock.
                     // Assume the sync will be completed on another node.
-                    lockToken = this.retryingTransactionHelper.doInTransaction(
+                    lockToken = this.transactionService.getRetryingTransactionHelper().doInTransaction(
                             new RetryingTransactionCallback<String>()
                             {
                                 public String execute() throws Throwable
@@ -426,15 +422,16 @@ public class ChainingUserRegistrySynchronizer extends AbstractLifecycleBean impl
             if (lockToken != null)
             {
                 final String token = lockToken;
-                this.retryingTransactionHelper.doInTransaction(new RetryingTransactionCallback<Object>()
-                {
-                    public Object execute() throws Throwable
-                    {
-                        ChainingUserRegistrySynchronizer.this.jobLockService.releaseLock(token,
-                                ChainingUserRegistrySynchronizer.LOCK_QNAME);
-                        return null;
-                    }
-                }, false, splitTxns);
+                this.transactionService.getRetryingTransactionHelper().doInTransaction(
+                        new RetryingTransactionCallback<Object>()
+                        {
+                            public Object execute() throws Throwable
+                            {
+                                ChainingUserRegistrySynchronizer.this.jobLockService.releaseLock(token,
+                                        ChainingUserRegistrySynchronizer.LOCK_QNAME);
+                                return null;
+                            }
+                        }, false, splitTxns);
             }
         }
     }
@@ -539,14 +536,10 @@ public class ChainingUserRegistrySynchronizer extends AbstractLifecycleBean impl
 
         // First, analyze the group structure. Create maps of authorities to their parents for associations to create
         // and delete. Also deal with 'overlaps' with other zones in the authentication chain.
-        final BatchProcessor<NodeDescription> groupProcessor = new BatchProcessor<NodeDescription>(
-                zone + " Group Analysis",
-                this.retryingTransactionHelper,
-                userRegistry.getGroups(lastModified),
-                this.workerThreads, 20,
-                this.applicationEventPublisher,
-                ChainingUserRegistrySynchronizer.logger,
-                this.loggingInterval);
+        final BatchProcessor<NodeDescription> groupProcessor = new BatchProcessor<NodeDescription>(zone
+                + " Group Analysis", this.transactionService.getRetryingTransactionHelper(), userRegistry
+                .getGroups(lastModified), this.workerThreads, 20, this.applicationEventPublisher,
+                ChainingUserRegistrySynchronizer.logger, this.loggingInterval);
         class Analyzer implements BatchProcessWorker<NodeDescription>
         {
             private final Set<String> allZoneAuthorities = new TreeSet<String>();
@@ -555,7 +548,7 @@ public class ChainingUserRegistrySynchronizer extends AbstractLifecycleBean impl
             private final Map<String, Set<String>> groupAssocsToDelete = new TreeMap<String, Set<String>>();
             private final Set<String> authoritiesMaintained = new TreeSet<String>();
             private Set<String> deletionCandidates;
-            
+
             private long latestTime;
 
             public Analyzer(final long latestTime)
@@ -567,7 +560,7 @@ public class ChainingUserRegistrySynchronizer extends AbstractLifecycleBean impl
             {
                 return this.latestTime;
             }
-            
+
             public Set<String> getDeletionCandidates()
             {
                 return this.deletionCandidates;
@@ -581,7 +574,7 @@ public class ChainingUserRegistrySynchronizer extends AbstractLifecycleBean impl
             public void beforeProcess() throws Throwable
             {
                 // Disable rules
-                ruleService.disableRules();
+                ChainingUserRegistrySynchronizer.this.ruleService.disableRules();
                 // Authentication
                 AuthenticationUtil.setRunAsUser(AuthenticationUtil.getSystemUserName());
             }
@@ -589,7 +582,7 @@ public class ChainingUserRegistrySynchronizer extends AbstractLifecycleBean impl
             public void afterProcess() throws Throwable
             {
                 // Enable rules
-                ruleService.enableRules();
+                ChainingUserRegistrySynchronizer.this.ruleService.enableRules();
                 // Clear authentication
                 AuthenticationUtil.clearCurrentSecurityContext();
             }
@@ -749,47 +742,48 @@ public class ChainingUserRegistrySynchronizer extends AbstractLifecycleBean impl
                     parents.add(groupName);
                 }
             }
-            
+
             public void processGroups(UserRegistry userRegistry, boolean allowDeletions, boolean splitTxns)
             {
                 // If we got back some groups, we have to cross reference them with the set of known authorities
-                if (allowDeletions || !groupAssocsToCreate.isEmpty())
+                if (allowDeletions || !this.groupAssocsToCreate.isEmpty())
                 {
                     // Add in current set of known authorities
-                    allZoneAuthorities.addAll(ChainingUserRegistrySynchronizer.this.retryingTransactionHelper.doInTransaction(
-                            new RetryingTransactionCallback<Set<String>>()
-                            {
-                                public Set<String> execute() throws Throwable
-                                {
-                                    return ChainingUserRegistrySynchronizer.this.authorityService.getAllAuthoritiesInZone(
-                                            zoneId, null);
-                                }
-                            }, true, splitTxns));
-
+                    this.allZoneAuthorities.addAll(ChainingUserRegistrySynchronizer.this.transactionService
+                            .getRetryingTransactionHelper().doInTransaction(
+                                    new RetryingTransactionCallback<Set<String>>()
+                                    {
+                                        public Set<String> execute() throws Throwable
+                                        {
+                                            return ChainingUserRegistrySynchronizer.this.authorityService
+                                                    .getAllAuthoritiesInZone(zoneId, null);
+                                        }
+                                    }, true, splitTxns));
 
                     // Prune our set of authorities according to deletions
                     if (allowDeletions)
                     {
-                        deletionCandidates = new TreeSet<String>(allZoneAuthorities);
-                        userRegistry.processDeletions(deletionCandidates);
-                        allZoneAuthorities.removeAll(deletionCandidates);
-                        groupAssocsToCreate.keySet().removeAll(deletionCandidates);
-                        groupAssocsToDelete.keySet().removeAll(deletionCandidates);
+                        this.deletionCandidates = new TreeSet<String>(this.allZoneAuthorities);
+                        userRegistry.processDeletions(this.deletionCandidates);
+                        this.allZoneAuthorities.removeAll(this.deletionCandidates);
+                        this.groupAssocsToCreate.keySet().removeAll(this.deletionCandidates);
+                        this.groupAssocsToDelete.keySet().removeAll(this.deletionCandidates);
                     }
 
-                    if (!groupAssocsToCreate.isEmpty())
+                    if (!this.groupAssocsToCreate.isEmpty())
                     {
-                        // Sort the group associations in depth-first order (root groups first) and filter out non-existent parents
+                        // Sort the group associations in depth-first order (root groups first) and filter out
+                        // non-existent parents
                         Map<String, Set<String>> sortedGroupAssociations = new LinkedHashMap<String, Set<String>>(
-                                groupAssocsToCreate.size() * 2);
+                                this.groupAssocsToCreate.size() * 2);
                         List<String> authorityPath = new ArrayList<String>(5);
-                        for (String authority : groupAssocsToCreate.keySet())
+                        for (String authority : this.groupAssocsToCreate.keySet())
                         {
-                            if (allZoneAuthorities.contains(authority))
+                            if (this.allZoneAuthorities.contains(authority))
                             {
                                 authorityPath.add(authority);
-                                visitGroupAssociations(authorityPath, allZoneAuthorities, groupAssocsToCreate,
-                                        sortedGroupAssociations);
+                                visitGroupAssociations(authorityPath, this.allZoneAuthorities,
+                                        this.groupAssocsToCreate, sortedGroupAssociations);
                                 authorityPath.clear();
                             }
                         }
@@ -797,7 +791,7 @@ public class ChainingUserRegistrySynchronizer extends AbstractLifecycleBean impl
                         // Add the groups and their parent associations in depth-first order
                         BatchProcessor<Map.Entry<String, Set<String>>> groupCreator = new BatchProcessor<Map.Entry<String, Set<String>>>(
                                 zone + " Group Creation and Association",
-                                ChainingUserRegistrySynchronizer.this.retryingTransactionHelper,
+                                ChainingUserRegistrySynchronizer.this.transactionService.getRetryingTransactionHelper(),
                                 sortedGroupAssociations.entrySet(),
                                 ChainingUserRegistrySynchronizer.this.workerThreads, 20,
                                 ChainingUserRegistrySynchronizer.this.applicationEventPublisher,
@@ -813,7 +807,7 @@ public class ChainingUserRegistrySynchronizer extends AbstractLifecycleBean impl
                             public void beforeProcess() throws Throwable
                             {
                                 // Disable rules
-                                ruleService.disableRules();
+                                ChainingUserRegistrySynchronizer.this.ruleService.disableRules();
                                 // Authentication
                                 AuthenticationUtil.setRunAsUser(AuthenticationUtil.getSystemUserName());
                             }
@@ -821,7 +815,7 @@ public class ChainingUserRegistrySynchronizer extends AbstractLifecycleBean impl
                             public void afterProcess() throws Throwable
                             {
                                 // Enable rules
-                                ruleService.enableRules();
+                                ChainingUserRegistrySynchronizer.this.ruleService.enableRules();
                                 // Clear authentication
                                 AuthenticationUtil.clearCurrentSecurityContext();
                             }
@@ -830,41 +824,41 @@ public class ChainingUserRegistrySynchronizer extends AbstractLifecycleBean impl
                             {
                                 String child = entry.getKey();
 
-                                String groupDisplayName = groupsToCreate.get(child);
+                                String groupDisplayName = Analyzer.this.groupsToCreate.get(child);
                                 if (groupDisplayName != null)
                                 {
                                     String groupShortName = ChainingUserRegistrySynchronizer.this.authorityService
                                             .getShortName(child);
                                     if (ChainingUserRegistrySynchronizer.logger.isDebugEnabled())
                                     {
-                                        ChainingUserRegistrySynchronizer.logger
-                                                .debug("Creating group '" + groupShortName + "'");
+                                        ChainingUserRegistrySynchronizer.logger.debug("Creating group '"
+                                                + groupShortName + "'");
                                     }
                                     // create the group
-                                    ChainingUserRegistrySynchronizer.this.authorityService.createAuthority(AuthorityType
-                                            .getAuthorityType(child), groupShortName, groupDisplayName, zoneSet);
+                                    ChainingUserRegistrySynchronizer.this.authorityService.createAuthority(
+                                            AuthorityType.getAuthorityType(child), groupShortName, groupDisplayName,
+                                            zoneSet);
                                 }
                                 maintainAssociations(child);
                             }
                         }, splitTxns);
                     }
-                }                
+                }
             }
 
             public void finalizeAssociations(UserRegistry userRegistry, boolean splitTxns)
             {
                 // Remove all the associations we have already dealt with
-                groupAssocsToCreate.keySet().removeAll(authoritiesMaintained);
-                
-                // Filter out associations to authorities that simply can't exist
-                groupAssocsToCreate.keySet().retainAll(allZoneAuthorities);
+                this.groupAssocsToCreate.keySet().removeAll(this.authoritiesMaintained);
 
-                if (!groupAssocsToCreate.isEmpty())
+                // Filter out associations to authorities that simply can't exist
+                this.groupAssocsToCreate.keySet().retainAll(this.allZoneAuthorities);
+
+                if (!this.groupAssocsToCreate.isEmpty())
                 {
                     BatchProcessor<Map.Entry<String, Set<String>>> groupCreator = new BatchProcessor<Map.Entry<String, Set<String>>>(
-                            zone + " Authority Association",
-                            ChainingUserRegistrySynchronizer.this.retryingTransactionHelper,
-                            groupAssocsToCreate.entrySet(),
+                            zone + " Authority Association", ChainingUserRegistrySynchronizer.this.transactionService
+                                    .getRetryingTransactionHelper(), this.groupAssocsToCreate.entrySet(),
                             ChainingUserRegistrySynchronizer.this.workerThreads, 20,
                             ChainingUserRegistrySynchronizer.this.applicationEventPublisher,
                             ChainingUserRegistrySynchronizer.logger,
@@ -879,7 +873,7 @@ public class ChainingUserRegistrySynchronizer extends AbstractLifecycleBean impl
                         public void beforeProcess() throws Throwable
                         {
                             // Disable rules
-                            ruleService.disableRules();
+                            ChainingUserRegistrySynchronizer.this.ruleService.disableRules();
                             // Authentication
                             AuthenticationUtil.setRunAsUser(AuthenticationUtil.getSystemUserName());
                         }
@@ -887,7 +881,7 @@ public class ChainingUserRegistrySynchronizer extends AbstractLifecycleBean impl
                         public void afterProcess() throws Throwable
                         {
                             // Enable rules
-                            ruleService.enableRules();
+                            ChainingUserRegistrySynchronizer.this.ruleService.enableRules();
                             // Clear authentication
                             AuthenticationUtil.clearCurrentSecurityContext();
                         }
@@ -897,7 +891,7 @@ public class ChainingUserRegistrySynchronizer extends AbstractLifecycleBean impl
                             maintainAssociations(entry.getKey());
                         }
                     }, splitTxns);
-                }                
+                }
             }
 
             private void maintainAssociations(String authorityName) throws BatchUpdateException
@@ -947,7 +941,7 @@ public class ChainingUserRegistrySynchronizer extends AbstractLifecycleBean impl
                         ChainingUserRegistrySynchronizer.this.authorityService.removeAuthority(parent, authorityName);
                     }
                 }
-                
+
                 // Remember that this authority's associations have been maintained
                 synchronized (this)
                 {
@@ -958,7 +952,7 @@ public class ChainingUserRegistrySynchronizer extends AbstractLifecycleBean impl
 
         final Analyzer groupAnalyzer = new Analyzer(lastModifiedMillis);
         int groupProcessedCount = groupProcessor.process(groupAnalyzer, splitTxns);
-        
+
         groupAnalyzer.processGroups(userRegistry, allowDeletions, splitTxns);
 
         // Process persons and their parent associations
@@ -978,14 +972,10 @@ public class ChainingUserRegistrySynchronizer extends AbstractLifecycleBean impl
                         + DateFormat.getDateTimeInstance().format(lastModified) + " from user registry '" + zone + "'");
             }
         }
-        final BatchProcessor<NodeDescription> personProcessor = new BatchProcessor<NodeDescription>(
-                zone + " User Creation and Association",
-                this.retryingTransactionHelper,
-                userRegistry.getPersons(lastModified),
-                this.workerThreads, 10,
-                this.applicationEventPublisher,
-                ChainingUserRegistrySynchronizer.logger,
-                this.loggingInterval);
+        final BatchProcessor<NodeDescription> personProcessor = new BatchProcessor<NodeDescription>(zone
+                + " User Creation and Association", this.transactionService.getRetryingTransactionHelper(),
+                userRegistry.getPersons(lastModified), this.workerThreads, 10, this.applicationEventPublisher,
+                ChainingUserRegistrySynchronizer.logger, this.loggingInterval);
         class PersonWorker implements BatchProcessWorker<NodeDescription>
         {
             private long latestTime;
@@ -1008,7 +998,7 @@ public class ChainingUserRegistrySynchronizer extends AbstractLifecycleBean impl
             public void beforeProcess() throws Throwable
             {
                 // Disable rules
-                ruleService.disableRules();
+                ChainingUserRegistrySynchronizer.this.ruleService.disableRules();
                 // Authentication
                 AuthenticationUtil.setRunAsUser(AuthenticationUtil.getSystemUserName());
             }
@@ -1016,7 +1006,7 @@ public class ChainingUserRegistrySynchronizer extends AbstractLifecycleBean impl
             public void afterProcess() throws Throwable
             {
                 // Enable rules
-                ruleService.enableRules();
+                ChainingUserRegistrySynchronizer.this.ruleService.enableRules();
                 // Clear authentication
                 AuthenticationUtil.clearCurrentSecurityContext();
             }
@@ -1108,7 +1098,7 @@ public class ChainingUserRegistrySynchronizer extends AbstractLifecycleBean impl
 
         PersonWorker persons = new PersonWorker(lastModifiedMillis);
         int personProcessedCount = personProcessor.process(persons, splitTxns);
-        
+
         // Process those associations to persons who themselves have not been updated
         groupAnalyzer.finalizeAssociations(userRegistry, splitTxns);
 
@@ -1130,13 +1120,9 @@ public class ChainingUserRegistrySynchronizer extends AbstractLifecycleBean impl
         if (allowDeletions)
         {
             BatchProcessor<String> authorityDeletionProcessor = new BatchProcessor<String>(
-                    zone + " Authority Deletion",
-                    this.retryingTransactionHelper,
-                    groupAnalyzer.getDeletionCandidates(),
-                    this.workerThreads, 10,
-                    this.applicationEventPublisher,
-                    ChainingUserRegistrySynchronizer.logger,
-                    this.loggingInterval);
+                    zone + " Authority Deletion", this.transactionService.getRetryingTransactionHelper(), groupAnalyzer
+                            .getDeletionCandidates(), this.workerThreads, 10, this.applicationEventPublisher,
+                    ChainingUserRegistrySynchronizer.logger, this.loggingInterval);
             class AuthorityDeleter implements BatchProcessWorker<String>
             {
                 private int personProcessedCount;
@@ -1160,7 +1146,7 @@ public class ChainingUserRegistrySynchronizer extends AbstractLifecycleBean impl
                 public void beforeProcess() throws Throwable
                 {
                     // Disable rules
-                    ruleService.disableRules();
+                    ChainingUserRegistrySynchronizer.this.ruleService.disableRules();
                     // Authentication
                     AuthenticationUtil.setRunAsUser(AuthenticationUtil.getSystemUserName());
                 }
@@ -1168,7 +1154,7 @@ public class ChainingUserRegistrySynchronizer extends AbstractLifecycleBean impl
                 public void afterProcess() throws Throwable
                 {
                     // Enable rules
-                    ruleService.enableRules();
+                    ChainingUserRegistrySynchronizer.this.ruleService.enableRules();
                     // Clear authentication
                     AuthenticationUtil.clearCurrentSecurityContext();
                 }
@@ -1251,7 +1237,7 @@ public class ChainingUserRegistrySynchronizer extends AbstractLifecycleBean impl
                 Iterator<String> i = associations.iterator();
                 while (i.hasNext())
                 {
-                    String parentAuthority = i.next();                    
+                    String parentAuthority = i.next();
 
                     // Prevent cyclic paths
                     if (authorityPath.contains(parentAuthority))
@@ -1259,8 +1245,8 @@ public class ChainingUserRegistrySynchronizer extends AbstractLifecycleBean impl
                         if (ChainingUserRegistrySynchronizer.logger.isWarnEnabled())
                         {
                             ChainingUserRegistrySynchronizer.logger.warn("Detected cyclic dependencies in group '"
-                                    + ChainingUserRegistrySynchronizer.this.authorityService.getShortName(parentAuthority)
-                                    + "'");
+                                    + ChainingUserRegistrySynchronizer.this.authorityService
+                                            .getShortName(parentAuthority) + "'");
                         }
                         i.remove();
                     }
@@ -1292,16 +1278,18 @@ public class ChainingUserRegistrySynchronizer extends AbstractLifecycleBean impl
      */
     private long getMostRecentUpdateTime(final String label, final String zoneId, boolean splitTxns)
     {
-        return this.retryingTransactionHelper.doInTransaction(new RetryingTransactionCallback<Long>()
-        {
+        return this.transactionService.getRetryingTransactionHelper().doInTransaction(
+                new RetryingTransactionCallback<Long>()
+                {
 
-            public Long execute() throws Throwable
-            {
-                Attribute attribute = ChainingUserRegistrySynchronizer.this.attributeService
-                        .getAttribute(ChainingUserRegistrySynchronizer.ROOT_ATTRIBUTE_PATH + '/' + label + '/' + zoneId);
-                return attribute == null ? -1 : attribute.getLongValue();
-            }
-        }, true, splitTxns);
+                    public Long execute() throws Throwable
+                    {
+                        Attribute attribute = ChainingUserRegistrySynchronizer.this.attributeService
+                                .getAttribute(ChainingUserRegistrySynchronizer.ROOT_ATTRIBUTE_PATH + '/' + label + '/'
+                                        + zoneId);
+                        return attribute == null ? -1 : attribute.getLongValue();
+                    }
+                }, true, splitTxns);
     }
 
     /**
@@ -1322,7 +1310,7 @@ public class ChainingUserRegistrySynchronizer extends AbstractLifecycleBean impl
             boolean splitTxns)
     {
         final String path = ChainingUserRegistrySynchronizer.ROOT_ATTRIBUTE_PATH + '/' + label;
-        this.retryingTransactionHelper.doInTransaction(
+        this.transactionService.getRetryingTransactionHelper().doInTransaction(
                 new RetryingTransactionHelper.RetryingTransactionCallback<Object>()
                 {
 
@@ -1366,7 +1354,8 @@ public class ChainingUserRegistrySynchronizer extends AbstractLifecycleBean impl
 
     /*
      * (non-Javadoc)
-     * @see org.springframework.extensions.surf.util.AbstractLifecycleBean#onBootstrap(org.springframework.context.ApplicationEvent)
+     * @seeorg.springframework.extensions.surf.util.AbstractLifecycleBean#onBootstrap(org.springframework.context.
+     * ApplicationEvent)
      */
     @Override
     protected void onBootstrap(ApplicationEvent event)
@@ -1396,7 +1385,8 @@ public class ChainingUserRegistrySynchronizer extends AbstractLifecycleBean impl
 
     /*
      * (non-Javadoc)
-     * @see org.springframework.extensions.surf.util.AbstractLifecycleBean#onShutdown(org.springframework.context.ApplicationEvent)
+     * @seeorg.springframework.extensions.surf.util.AbstractLifecycleBean#onShutdown(org.springframework.context.
+     * ApplicationEvent)
      */
     @Override
     protected void onShutdown(ApplicationEvent event)
diff --git a/source/java/org/alfresco/repo/transfer/RepoPrimaryManifestProcessorImpl.java b/source/java/org/alfresco/repo/transfer/RepoPrimaryManifestProcessorImpl.java
index 39d4d1468f..48994b7707 100644
--- a/source/java/org/alfresco/repo/transfer/RepoPrimaryManifestProcessorImpl.java
+++ b/source/java/org/alfresco/repo/transfer/RepoPrimaryManifestProcessorImpl.java
@@ -212,6 +212,10 @@ public class RepoPrimaryManifestProcessorImpl extends AbstractManifestProcessorB
                 {
                     log.info("Successfully restored node as " + restoredNodeRef + "  - retrying transferred node");
                 }
+                //Check to see if the node we've just restored is the parent of any orphans
+                checkOrphans(restoredNodeRef);
+                //Process the received node information again now that we've restored it
+                //(should be handled as an update now)
                 processTransferManifestNode(node);
                 return;
             }
@@ -293,7 +297,12 @@ public class RepoPrimaryManifestProcessorImpl extends AbstractManifestProcessorB
 
         // Is the node that we've just added the parent of any orphans that
         // we've found earlier?
-        List<ChildAssociationRef> orphansToClaim = orphans.get(newNode.getChildRef());
+        checkOrphans(newNode.getChildRef());
+    }
+
+    private void checkOrphans(NodeRef parentNode)
+    {
+        List<ChildAssociationRef> orphansToClaim = orphans.get(parentNode);
         if (orphansToClaim != null)
         {
             // Yes, it is...
@@ -305,7 +314,7 @@ public class RepoPrimaryManifestProcessorImpl extends AbstractManifestProcessorB
             }
             // We can now remove the record of these orphans, as their parent
             // has been found
-            orphans.remove(newNode.getChildRef());
+            orphans.remove(parentNode);
         }
     }
 
diff --git a/source/java/org/alfresco/repo/transfer/RepoTransferReceiverImplTest.java b/source/java/org/alfresco/repo/transfer/RepoTransferReceiverImplTest.java
index a85edbc099..9e8d858546 100644
--- a/source/java/org/alfresco/repo/transfer/RepoTransferReceiverImplTest.java
+++ b/source/java/org/alfresco/repo/transfer/RepoTransferReceiverImplTest.java
@@ -575,6 +575,154 @@ public class RepoTransferReceiverImplTest extends BaseAlfrescoSpringTest
         }
     }
 
+    /**
+     * Test for fault raised as ALF-2772
+     * (https://issues.alfresco.com/jira/browse/ALF-2772) When transferring
+     * nodes it shouldn't matter the order in which they appear in the snapshot.
+     * That is to say, it shouldn't matter if a child node is listed before its
+     * parent node.
+     * 
+     * Typically this is true, but in the special case where the parent node is
+     * being restored from the target's archive store then there is a fault. The
+     * process should be:
+     * 
+     * 1. Process child node 
+     * 2. Fail to find parent node 
+     * 3. Place child node in temporary location and mark as an orphan 
+     * 4. Process parent node 
+     * 5. Create node to correspond to parent node 
+     * 6. "Re-parent" orphaned child node with parent node
+     * 
+     * However, in the case where the parent node is found in the target's
+     * archive store, the process is actually:
+     * 
+     * 1. Process child node 
+     * 2. Fail to find parent node 
+     * 3. Place child node in temporary location and mark as an orphan 
+     * 4. Process parent node 
+     * 5. Find corresponding parent node in archive store and restore it 
+     * 6. Update corresponding parent node
+     * 
+     * Note that, in this case, we are not re-parenting the orphan as we should be.
+     * 
+     * @throws Exception
+     */
+    public void testJira_ALF_2772() throws Exception
+    {
+        setDefaultRollback(true);
+        startNewTransaction();
+        String transferId = receiver.start();
+
+        TransferManifestNormalNode node1 = createContentNode(transferId);
+        TransferManifestNormalNode node2 = createContentNode(transferId);
+        TransferManifestNormalNode node11 = createFolderNode(transferId);
+
+        associatePeers(node1, node2);
+        moveNode(node2, node11);
+
+        TransferManifestDeletedNode deletedNode11 = createDeletedNode(node11);
+
+        endTransaction();
+
+        List<TransferManifestNode> nodes = new ArrayList<TransferManifestNode>();
+        
+        
+        //First we'll just send a folder node
+        nodes.add(node11);
+        
+        this.setDefaultRollback(false);
+        startNewTransaction();
+        try
+        {
+            String snapshot = createSnapshot(nodes);
+            log.debug(snapshot);
+            receiver.saveSnapshot(transferId, new StringInputStream(snapshot, "UTF-8"));
+
+            for (TransferManifestNode node : nodes)
+            {
+                receiver.saveContent(transferId, node.getUuid(), new ByteArrayInputStream(dummyContentBytes));
+            }
+            receiver.commit(transferId);
+
+            for (TransferManifestNode node : nodes)
+            {
+                assertTrue(nodeService.exists(node.getNodeRef()));
+            }
+        }
+        finally
+        {
+            receiver.end(transferId);
+            endTransaction();
+        }
+
+
+        //Now we delete the folder
+        startNewTransaction();
+        try
+        {
+            transferId = receiver.start();
+            String snapshot = createSnapshot(Arrays.asList(new TransferManifestNode[] { deletedNode11 }));
+            log.debug(snapshot);
+            receiver.saveSnapshot(transferId, new StringInputStream(snapshot, "UTF-8"));
+            receiver.commit(transferId);
+        }
+        finally
+        {
+            receiver.end(transferId);
+            endTransaction();
+        }
+
+        startNewTransaction();
+        try
+        {
+            log.debug("Test success of transfer...");
+            TransferProgress progress = receiver.getProgressMonitor().getProgress(transferId);
+            assertEquals(TransferProgress.Status.COMPLETE, progress.getStatus());
+
+            assertTrue(nodeService.exists(deletedNode11.getNodeRef()));
+            assertTrue(nodeService.hasAspect(deletedNode11.getNodeRef(), ContentModel.ASPECT_ARCHIVED));
+            log.debug("Successfully tested existence of archive node: " + deletedNode11.getNodeRef());
+            
+            log.debug("Successfully tested existence of all archive nodes");
+            
+            log.debug("Testing existence of original node: " + node11.getNodeRef());
+            assertFalse(nodeService.exists(node11.getNodeRef()));
+
+            log.debug("Successfully tested non-existence of all original nodes");
+            
+            log.debug("Progress indication: " + progress.getCurrentPosition() + "/" + progress.getEndPosition());
+        }
+        finally
+        {
+            endTransaction();
+        }
+
+
+        //Finally we transfer node2 and node11 (in that order)
+        String errorMsgId = null;
+        startNewTransaction();
+        try
+        {
+            transferId = receiver.start();
+            String snapshot = createSnapshot(Arrays.asList(new TransferManifestNode[] { node2, node11 }));
+            log.debug(snapshot);
+            receiver.saveSnapshot(transferId, new StringInputStream(snapshot, "UTF-8"));
+            receiver.saveContent(transferId, node2.getUuid(), new ByteArrayInputStream(dummyContentBytes));
+            receiver.commit(transferId);
+        }
+        catch (Exception ex)
+        {
+            fail("Test of ALF-2772 failed: " + ex.getMessage());
+        }
+        finally
+        {
+            receiver.end(transferId);
+            endTransaction();
+        }
+
+    }
+    
+    
     public void testAsyncCommit() throws Exception
     {
         log.info("testAsyncCommit");
diff --git a/source/java/org/alfresco/repo/version/MigrationCleanupJob.java b/source/java/org/alfresco/repo/version/MigrationCleanupJob.java
index 69038c520b..d2ce98cb1b 100644
--- a/source/java/org/alfresco/repo/version/MigrationCleanupJob.java
+++ b/source/java/org/alfresco/repo/version/MigrationCleanupJob.java
@@ -41,15 +41,43 @@ public class MigrationCleanupJob implements Job
     
     private static final String KEY_VERSION_MIGRATOR = "versionMigrator";
     private static final String KEY_TENANT_ADMIN_SERVICE = "tenantAdminService";
-    
-    private static final String KEY_BATCHSIZE = "batchSize";
+    private static final String KEY_BATCH_SIZE = "batchSize";
+    private static final String KEY_THREAD_COUNT = "threadCount";
+    private static final String KEY_ONLY_USE_DEPRECATED_V1 = "onlyUseDeprecatedV1";
     
     private int batchSize = 1;
+    private int threadCount = 2;
+    
+    private boolean useDeprecatedV1 = false;
     
     public void execute(JobExecutionContext context) throws JobExecutionException
     { 
         JobDataMap jobData = context.getJobDetail().getJobDataMap();
         
+        String onlyUseDeprecatedV1Str = (String)jobData.get(KEY_ONLY_USE_DEPRECATED_V1);
+        if (onlyUseDeprecatedV1Str != null)
+        {
+            try
+            {
+                useDeprecatedV1 = new Boolean(onlyUseDeprecatedV1Str);
+            }
+            catch (Exception e)
+            {
+                logger.warn("Invalid 'onlyUseDeprecatedV1' value, using default: " + useDeprecatedV1, e);
+            }
+        }
+        
+        if (useDeprecatedV1)
+        {
+            // skip cleanup
+            if (logger.isDebugEnabled())
+            {
+                logger.debug("Skipping migration cleanup since only using deprecated version1 store");
+            }
+            
+            return;
+        }
+        
         final VersionMigrator migrationCleanup = (VersionMigrator)jobData.get(KEY_VERSION_MIGRATOR);
         final TenantAdminService tenantAdminService = (TenantAdminService)jobData.get(KEY_TENANT_ADMIN_SERVICE);
         
@@ -58,7 +86,7 @@ public class MigrationCleanupJob implements Job
             throw new JobExecutionException("Missing job data: " + KEY_VERSION_MIGRATOR);
         }
         
-        String batchSizeStr = (String)jobData.get(KEY_BATCHSIZE);
+        String batchSizeStr = (String)jobData.get(KEY_BATCH_SIZE);
         if (batchSizeStr != null)
         {
             try
@@ -67,7 +95,7 @@ public class MigrationCleanupJob implements Job
             }
             catch (Exception e)
             {
-                logger.warn("Invalid batchsize, using default: " + batchSize, e);
+                logger.warn("Invalid 'batchSize' value, using default: " + batchSize, e);
             }
         }
         
@@ -78,21 +106,41 @@ public class MigrationCleanupJob implements Job
             throw new AlfrescoRuntimeException(errorMessage);
         }
         
-        // perform the cleanup of the old version store
-        migrationCleanup.executeCleanup(batchSize);
-        
-    	if ((tenantAdminService != null) && tenantAdminService.isEnabled())
+        String threadCountStr = (String)jobData.get(KEY_THREAD_COUNT);
+        if (threadCountStr != null)
         {
-        	List<Tenant> tenants = tenantAdminService.getAllTenants();	                            	
+            try
+            {
+                threadCount = new Integer(threadCountStr);
+            }
+            catch (Exception e)
+            {
+                logger.warn("Invalid 'threadCount' value, using default: " + threadCount, e);
+            }
+        }
+        
+        if (threadCount < 1)
+        {
+            String errorMessage = "threadCount ("+threadCount+") cannot be less than 1";
+            logger.error(errorMessage);
+            throw new AlfrescoRuntimeException(errorMessage);
+        }
+        
+        // perform the cleanup of the old version store
+        migrationCleanup.executeCleanup(batchSize, threadCount);
+        
+        if ((tenantAdminService != null) && tenantAdminService.isEnabled())
+        {
+            List<Tenant> tenants = tenantAdminService.getAllTenants();
             for (Tenant tenant : tenants)
-            {          
-            	String tenantDomain = tenant.getTenantDomain();
-            	AuthenticationUtil.runAs(new RunAsWork<Object>()
+            {
+                String tenantDomain = tenant.getTenantDomain();
+                AuthenticationUtil.runAs(new RunAsWork<Object>()
                 {
-            		public Object doWork() throws Exception
+                    public Object doWork() throws Exception
                     {
-            			migrationCleanup.executeCleanup(batchSize);
-            			return null;
+                        migrationCleanup.executeCleanup(batchSize, threadCount);
+                        return null;
                     }
                 }, tenantAdminService.getDomainUser(AuthenticationUtil.getSystemUserName(), tenantDomain));
             }
diff --git a/source/java/org/alfresco/repo/version/VersionMigrator.java b/source/java/org/alfresco/repo/version/VersionMigrator.java
index 22ff80e81e..390c989f86 100644
--- a/source/java/org/alfresco/repo/version/VersionMigrator.java
+++ b/source/java/org/alfresco/repo/version/VersionMigrator.java
@@ -28,10 +28,15 @@ import java.util.Map;
 import java.util.Set;
 
 import org.alfresco.model.ContentModel;
+import org.alfresco.repo.batch.BatchProcessor;
+import org.alfresco.repo.batch.BatchProcessor.BatchProcessWorkerAdaptor;
 import org.alfresco.repo.domain.hibernate.SessionSizeResourceManager;
+import org.alfresco.repo.domain.qname.QNameDAO;
 import org.alfresco.repo.node.MLPropertyInterceptor;
 import org.alfresco.repo.policy.BehaviourFilter;
 import org.alfresco.repo.policy.PolicyScope;
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.transaction.AlfrescoTransactionSupport;
 import org.alfresco.repo.transaction.RetryingTransactionHelper;
 import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
 import org.alfresco.repo.version.common.VersionUtil;
@@ -43,6 +48,7 @@ import org.alfresco.service.cmr.repository.ChildAssociationRef;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.NodeService;
 import org.alfresco.service.cmr.repository.StoreRef;
+import org.alfresco.service.cmr.rule.RuleService;
 import org.alfresco.service.cmr.version.Version;
 import org.alfresco.service.cmr.version.VersionHistory;
 import org.alfresco.service.namespace.QName;
@@ -50,41 +56,29 @@ import org.alfresco.service.namespace.RegexQNamePattern;
 import org.alfresco.service.transaction.TransactionService;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.springframework.context.ApplicationEventPublisher;
+import org.springframework.context.ApplicationEventPublisherAware;
 import org.springframework.extensions.surf.util.I18NUtil;
 
 /**
  * Version2 Migrator
  */
-public class VersionMigrator
+public class VersionMigrator implements ApplicationEventPublisherAware
 {
     protected static Log logger = LogFactory.getLog(VersionMigrator.class);
     
     public static final StoreRef VERSION_STORE_REF_OLD = new StoreRef(StoreRef.PROTOCOL_WORKSPACE, VersionModel.STORE_ID);
     public static final StoreRef VERSION_STORE_REF_NEW = new StoreRef(StoreRef.PROTOCOL_WORKSPACE, Version2Model.STORE_ID);
     
-    /** track completion * */
-    int percentComplete;
-    
-    /** start time * */
-    long startTime;
-    
-    
     private static final String MSG_PATCH_NOOP = "version_service.migration.patch.noop";
     private static final String MSG_PATCH_COMPLETE = "version_service.migration.patch.complete";
     private static final String MSG_PATCH_SKIP1 = "version_service.migration.patch.warn.skip1";
     private static final String MSG_PATCH_SKIP2 = "version_service.migration.patch.warn.skip2";
     
-    private static final String MSG_DELETE_PROGRESS = "version_service.migration.delete.progress";
     private static final String MSG_DELETE_COMPLETE = "version_service.migration.delete.complete";
     private static final String MSG_DELETE_SKIP1    = "version_service.migration.delete.warn.skip1";
     private static final String MSG_DELETE_SKIP2    = "version_service.migration.delete.warn.skip2";
     
-    private static final String MSG_PATCH_PROGRESS = "patch.progress";
-    
-    private static final long RANGE_10 = 1000 * 60 * 90;
-    private static final long RANGE_5 = 1000 * 60 * 60 * 4;
-    private static final long RANGE_2 = 1000 * 60 * 90 * 10;
-    
     private static boolean busy = false;
     
     public final static String PREFIX_MIGRATED = "migrated-";
@@ -97,6 +91,11 @@ public class VersionMigrator
     private DictionaryService dictionaryService;
     private TransactionService transactionService;
     private NodeService versionNodeService; // NodeService impl which redirects to appropriate VersionService
+    private QNameDAO qnameDAO;
+    private RuleService ruleService;
+    private ApplicationEventPublisher applicationEventPublisher;
+    
+    private int loggingInterval = 500;
     
     public void setVersion2ServiceImpl(Version2ServiceImpl versionService)
     {
@@ -128,6 +127,27 @@ public class VersionMigrator
         this.versionNodeService = versionNodeService;
     }
     
+    public void setQnameDAO(QNameDAO qnameDAO)
+    {
+        this.qnameDAO = qnameDAO;
+    }
+    
+    public void setRuleService(RuleService ruleService)
+    {
+        this.ruleService = ruleService;
+    }
+    
+    public void setLoggingInterval(int loggingInterval)
+    {
+        this.loggingInterval = loggingInterval;
+    }
+    
+    public void setApplicationEventPublisher(ApplicationEventPublisher applicationEventPublisher) 
+    {
+        this.applicationEventPublisher = applicationEventPublisher;
+    }
+    
+    
     public void init()
     {
         version1Service.setNodeService(dbNodeService);
@@ -138,10 +158,12 @@ public class VersionMigrator
     
     public NodeRef migrateVersionHistory(NodeRef oldVHNodeRef, NodeRef versionedNodeRef)
     {
+        /*
         if (logger.isTraceEnabled())
         {
             logger.trace("migrateVersionHistory: oldVersionHistoryRef = " + oldVHNodeRef);
         }
+        */
         
         VersionHistory vh = v1BuildVersionHistory(oldVHNodeRef, versionedNodeRef);
         
@@ -180,10 +202,12 @@ public class VersionMigrator
         NodeRef versionedNodeRef = oldVersion.getVersionedNodeRef();     // nodeRef to versioned node in live store
         NodeRef frozenStateNodeRef = oldVersion.getFrozenStateNodeRef(); // nodeRef to version node in version store
         
+        /*
         if (logger.isTraceEnabled())
         {
             logger.trace("v2CreateNewVersion: oldVersionRef = " + frozenStateNodeRef + " " + oldVersion);
         }
+        */
         
         String versionLabel = oldVersion.getVersionLabel();
         String versionDescription = oldVersion.getDescription();
@@ -312,12 +336,64 @@ public class VersionMigrator
         return dbNodeService.getChildAssocs(rootNodeRef);
     }
     
-    public int migrateVersions(final int batchSize, final boolean deleteImmediately)
+    private void migrateVersion(NodeRef oldVHNodeRef, boolean deleteImmediately) throws Throwable
     {
+        NodeRef versionedNodeRef = v1GetVersionedNodeRef(oldVHNodeRef);
+        migrateVersionHistory(oldVHNodeRef, versionedNodeRef);
+        
+        if (deleteImmediately)
+        {
+            // delete old version history node
+            v1DeleteVersionHistory(oldVHNodeRef);
+        }
+        else
+        {
+            // mark old version history node for later cleanup
+            v1MarkVersionHistory(oldVHNodeRef);
+        }
+    }
+    
+    /**
+     * Do the Version migration work
+     * @return          Returns <tt>true</tt> if the work is done
+     */
+    public boolean migrateVersions(int batchSize, int threadCount, final boolean deleteImmediately)
+    {
+        transactionService.getRetryingTransactionHelper().doInTransaction(new RetryingTransactionCallback<Object>()
+        {
+            public Object execute() throws Throwable
+            {
+                // pre-create new qnames (rather than retry initial batches)
+                qnameDAO.getOrCreateQName(Version2Model.ASPECT_VERSION_STORE_ROOT);
+                qnameDAO.getOrCreateQName(Version2Model.TYPE_QNAME_VERSION_HISTORY);
+                qnameDAO.getOrCreateQName(Version2Model.PROP_QNAME_VERSIONED_NODE_ID);
+                qnameDAO.getOrCreateQName(Version2Model.ASPECT_VERSION);
+                qnameDAO.getOrCreateQName(Version2Model.PROP_QNAME_VERSION_LABEL);
+                qnameDAO.getOrCreateQName(Version2Model.PROP_QNAME_VERSION_NUMBER);
+                qnameDAO.getOrCreateQName(Version2Model.PROP_QNAME_FROZEN_NODE_REF);
+                qnameDAO.getOrCreateQName(Version2Model.PROP_QNAME_FROZEN_NODE_DBID);
+                qnameDAO.getOrCreateQName(Version2Model.PROP_QNAME_FROZEN_CREATOR);
+                qnameDAO.getOrCreateQName(Version2Model.PROP_QNAME_FROZEN_CREATED);
+                qnameDAO.getOrCreateQName(Version2Model.PROP_QNAME_FROZEN_MODIFIER);
+                qnameDAO.getOrCreateQName(Version2Model.PROP_QNAME_FROZEN_MODIFIED);
+                qnameDAO.getOrCreateQName(Version2Model.PROP_QNAME_FROZEN_ACCESSED);
+                qnameDAO.getOrCreateQName(Version2Model.ASSOC_SUCCESSOR);
+                qnameDAO.getOrCreateQName(Version2Model.CHILD_QNAME_VERSION_HISTORIES);
+                qnameDAO.getOrCreateQName(Version2Model.CHILD_QNAME_VERSIONS);
+                qnameDAO.getOrCreateQName(Version2Model.CHILD_QNAME_VERSIONED_ASSOCS);
+                qnameDAO.getOrCreateQName(Version2Model.PROP_QNAME_ASSOC_DBID);
+                qnameDAO.getOrCreateQName(Version2Model.PROP_QNAME_TRANSLATION_VERSIONS);
+                
+                return null;
+            }
+        }, false, true);
+        
         final NodeRef oldRootNodeRef = dbNodeService.getRootNode(VersionMigrator.VERSION_STORE_REF_OLD);
         final NodeRef newRootNodeRef = dbNodeService.getRootNode(VersionMigrator.VERSION_STORE_REF_NEW);
         
-        long splitTime = System.currentTimeMillis();
+        
+        long startTime = System.currentTimeMillis();
+        
         final List<ChildAssociationRef> childAssocRefs = getVersionHistories(oldRootNodeRef);
         
         int toDo = childAssocRefs.size();
@@ -325,15 +401,21 @@ public class VersionMigrator
         if (toDo == 0)
         {
             logger.info(I18NUtil.getMessage(MSG_PATCH_NOOP));
-            return 0;
+            return true;
         }
         
         if (logger.isInfoEnabled())
         {
-            logger.info("Found "+childAssocRefs.size()+" version histories in old version store (in "+((System.currentTimeMillis()-splitTime)/1000)+" secs)");
+            logger.info("Found "+childAssocRefs.size()+" version histories in old version store (in "+((System.currentTimeMillis()-startTime)/1000)+" secs)");
         }
         
-        splitTime = System.currentTimeMillis();
+        if (logger.isDebugEnabled())
+        {
+            logger.debug("batchSize="+batchSize+", batchWorkerThreadCount="+threadCount+", deleteImmediately="+deleteImmediately);
+        }
+        
+        long splitTime = System.currentTimeMillis();
+        
         final List<ChildAssociationRef> newChildAssocRefs = getVersionHistories(newRootNodeRef);
         final boolean firstMigration = (newChildAssocRefs.size() == 0);
         
@@ -346,27 +428,29 @@ public class VersionMigrator
         }
         
         // note: assumes patch runs before cleanup starts
-        startTime = System.currentTimeMillis();
-        percentComplete = 0;
         
-        int vhCount = 0;
         int alreadyMigratedCount = 0;
-        int failCount = 0;
-        
-        RetryingTransactionHelper txHelper = transactionService.getRetryingTransactionHelper();
+        int batchErrorCount = 0;
+        int batchCount = 0;
         
         boolean wasMLAware = MLPropertyInterceptor.setMLAware(true);
         SessionSizeResourceManager.setDisableInTransaction();
         
         try
         {
-            int totalCount = 0;
+            //
+            // split into batches (ignore version histories that have already been migrated)
+            //
             
-            final List<NodeRef> tmpBatch = new ArrayList<NodeRef>(batchSize);  
+            splitTime = System.currentTimeMillis();
+            
+            int totalCount = 0;
+            Collection<List<NodeRef>> batchProcessorWork = new ArrayList<List<NodeRef>>(2);
+            
+            final List<NodeRef> tmpBatch = new ArrayList<NodeRef>(batchSize);
             
             for (final ChildAssociationRef childAssocRef : childAssocRefs)
             {
-                reportProgress(MSG_PATCH_PROGRESS, toDo, totalCount);
                 totalCount++;
                 
                 // short-cut if first migration
@@ -387,74 +471,72 @@ public class VersionMigrator
                 
                 if ((tmpBatch.size() == batchSize) || (totalCount == childAssocRefs.size()))
                 {
-                    while (tmpBatch.size() != 0)
+                    // Each thread gets 1 batch to execute
+                    batchProcessorWork.add(new ArrayList<NodeRef>(tmpBatch));
+                    tmpBatch.clear();
+                }
+            }
+            
+            batchCount = batchProcessorWork.size();
+            
+            if (batchCount > 0)
+            {
+                if (logger.isDebugEnabled())
+                {
+                    logger.debug("Split into "+batchCount+" batches in "+(System.currentTimeMillis()-splitTime)+" ms");
+                }
+                
+                //
+                // do the work
+                //
+                
+                final String runAsUser = AuthenticationUtil.getRunAsUser();
+                
+                BatchProcessWorkerAdaptor<List<NodeRef>> batchProcessorWorker = new BatchProcessWorkerAdaptor<List<NodeRef>>()
+                {
+                    public void beforeProcess() throws Throwable
                     {
-                        txHelper.setMaxRetries(1);
+                        // Disable rules
+                        ruleService.disableRules();
                         
-                        try
+                        // Authentication
+                        AuthenticationUtil.setRunAsUser(runAsUser);
+                    }
+
+                    public void afterProcess() throws Throwable
+                    {
+                        // Enable rules
+                        ruleService.enableRules();
+                        // Clear authentication
+                        AuthenticationUtil.clearCurrentSecurityContext();
+                    }
+                    
+                    public void process(List<NodeRef> vhBatch) throws Throwable
+                    {
+                        long startTime = System.currentTimeMillis();
+                        
+                        for (NodeRef oldVHNodeRef : vhBatch)
                         {
-                            txHelper.doInTransaction(new RetryingTransactionCallback<NodeRef>()
-                            {
-                                public NodeRef execute() throws Throwable
-                                {
-                                    if (logger.isTraceEnabled())
-                                    {
-                                        logger.trace("Attempt to migrate batch of "+tmpBatch.size()+" version histories");
-                                    }
-                                    
-                                    long startTime = System.currentTimeMillis();
-                                    
-                                    for (NodeRef oldVHNodeRef : tmpBatch)
-                                    {
-                                        try
-                                        {
-                                            NodeRef versionedNodeRef = v1GetVersionedNodeRef(oldVHNodeRef);
-                                            migrateVersionHistory(oldVHNodeRef, versionedNodeRef);
-                                            
-                                            if (deleteImmediately)
-                                            {
-                                                // delete old version history node
-                                                v1DeleteVersionHistory(oldVHNodeRef);
-                                            }
-                                            else
-                                            {
-                                                // mark old version history node for later cleanup
-                                                v1MarkVersionHistory(oldVHNodeRef);
-                                            }  
-                                        }
-                                        catch (Throwable t)
-                                        {
-                                            logger.error("Skipping migration of: " + oldVHNodeRef, t);
-                                            throw t;
-                                        }
-                                    }
-                                    
-                                    if (logger.isDebugEnabled())
-                                    {
-                                        logger.debug("Migrated batch of "+tmpBatch.size()+" version histories in "+(System.currentTimeMillis()-startTime)+ " ms");
-                                    }
-                                    
-                                    return null;
-                                }
-                            }, false, true);
-                            
-                            // batch successful
-                            vhCount = vhCount + tmpBatch.size();
-                            tmpBatch.clear();
+                            migrateVersion(oldVHNodeRef, deleteImmediately);
                         }
-                        catch (Throwable t)
+                        
+                        if (logger.isTraceEnabled())
                         {
-                            // TODO if batchSize > 1 then could switch into batchSize=1 mode, and re-try one-by-one
-                            // in theory, could fail on commit (although integrity checks are disabled by default) hence don't know which nodes failed
-                            
-                            logger.error("Skipping migration of batch size ("+tmpBatch.size()+"): "+t);
-                            
-                            // batch failed
-                            failCount = failCount + tmpBatch.size();
-                            tmpBatch.clear();
+                            logger.trace("Migrated batch of "+vhBatch.size()+" version histories in "+(System.currentTimeMillis()-startTime)+ " ms ["+AlfrescoTransactionSupport.getTransactionId()+"]["+Thread.currentThread().getId()+"]");
                         }
                     }
-                }
+                };
+                
+                BatchProcessor<List<NodeRef>> batchProcessor = new BatchProcessor<List<NodeRef>>(
+                        "MigrateVersionStore",
+                        transactionService.getRetryingTransactionHelper(),
+                        batchProcessorWork, threadCount, 1,
+                        applicationEventPublisher, logger, loggingInterval);
+                
+                boolean splitTxns = true;
+                batchProcessor.process(batchProcessorWorker, splitTxns);
+                
+                batchErrorCount = batchProcessor.getTotalErrors();
             }
         }
         finally
@@ -463,31 +545,29 @@ public class VersionMigrator
             SessionSizeResourceManager.setEnableInTransaction();
         }
         
-        if (failCount > 0)
-        {
-            logger.warn(I18NUtil.getMessage(MSG_PATCH_SKIP1, failCount));
-        }
-        else if (alreadyMigratedCount > 0)
+        
+        if (alreadyMigratedCount > 0)
         {
             logger.warn(I18NUtil.getMessage(MSG_PATCH_SKIP2, alreadyMigratedCount));
         }
         
-        toDo = toDo - alreadyMigratedCount;
-        
-        if (vhCount != toDo)
+        if (batchCount > 0)
         {
-            logger.warn(I18NUtil.getMessage(MSG_PATCH_COMPLETE, vhCount, toDo, ((System.currentTimeMillis()-startTime)/1000)));
-        }
-        else
-        {
-            logger.info(I18NUtil.getMessage(MSG_PATCH_COMPLETE, vhCount, toDo, ((System.currentTimeMillis()-startTime)/1000)));
+            if (batchErrorCount > 0)
+            {
+                logger.warn(I18NUtil.getMessage(MSG_PATCH_SKIP1, batchErrorCount, batchCount, ((System.currentTimeMillis()-startTime)/1000)));
+            }
+            else
+            {
+                logger.info(I18NUtil.getMessage(MSG_PATCH_COMPLETE, (toDo - alreadyMigratedCount), toDo, ((System.currentTimeMillis()-startTime)/1000)));
+            }
         }
         
-        return vhCount;
+        return (batchErrorCount == 0);
     }
     
     
-    public void executeCleanup(final int batchSize)
+    public void executeCleanup(final int batchSize, final int threadCount)
     {
         if (! busy)
         {
@@ -501,6 +581,8 @@ public class VersionMigrator
                 {
                     public Object execute() throws Throwable
                     {
+                        long startTime = System.currentTimeMillis();
+                        
                         NodeRef oldRootNodeRef = dbNodeService.getRootNode(VersionMigrator.VERSION_STORE_REF_OLD);
                         List<ChildAssociationRef> childAssocRefs = getVersionHistories(oldRootNodeRef);
                         
@@ -508,100 +590,100 @@ public class VersionMigrator
                         
                         if (toDo > 0)
                         {
-                            if (logger.isDebugEnabled())
+                            if (logger.isInfoEnabled())
                             {
-                                logger.debug("Found "+toDo+" version histories in old version store");
+                                logger.info("Found "+toDo+" version histories to delete from old version store (in "+((System.currentTimeMillis()-startTime)/1000)+" secs)");
                             }
                             
                             // note: assumes cleanup runs after patch has completed
-                            startTime = System.currentTimeMillis();
-                            percentComplete = 0;
                             
-                            int deletedCount = 0;
-                            int failCount = 0;
                             int notMigratedCount = 0;
+                            int batchErrorCount = 0;
+                            int batchCount = 0;
                             
                             boolean wasMLAware = MLPropertyInterceptor.setMLAware(true);
                             SessionSizeResourceManager.setDisableInTransaction();
                             
                             try
                             {
-                                int batchCount = 0;
+                                //
+                                // split into batches
+                                //
+                                
+                                long splitTime = System.currentTimeMillis();
+                                
                                 int totalCount = 0;
                                 
+                                Collection<List<NodeRef>> batchProcessorWork = new ArrayList<List<NodeRef>>(2);
                                 final List<NodeRef> tmpBatch = new ArrayList<NodeRef>(batchSize);
                                 
                                 for (final ChildAssociationRef childAssocRef : childAssocRefs)
                                 {
-                                    reportProgress(MSG_DELETE_PROGRESS, toDo, totalCount);
                                     totalCount++;
                                     
-                                    if (isMigrated(childAssocRef))
+                                    if (! isMigrated(childAssocRef))
                                     {
-                                        if (batchCount < batchSize)
-                                        {
-                                            tmpBatch.add(childAssocRef.getChildRef());
-                                            batchCount++;
-                                        }
-                                        
-                                        if ((batchCount == batchSize) || (totalCount == childAssocRefs.size()))
-                                        {
-                                            while (tmpBatch.size() != 0)
-                                            {
-                                                txHelper.setMaxRetries(1);
-                                                NodeRef failed = txHelper.doInTransaction(new RetryingTransactionCallback<NodeRef>()
-                                                {
-                                                    public NodeRef execute() throws Throwable
-                                                    {
-                                                        if (logger.isTraceEnabled())
-                                                        {
-                                                            logger.trace("Attempt to delete batch of "+tmpBatch.size()+" migrated version histories");
-                                                        }
-                                                        
-                                                        long startTime = System.currentTimeMillis();
-                                                        
-                                                        for (NodeRef oldVHNodeRef : tmpBatch)
-                                                        {
-                                                            try
-                                                            {
-                                                                // delete old version history node
-                                                                v1DeleteVersionHistory(oldVHNodeRef);
-                                                            }
-                                                            catch (Throwable t)
-                                                            {
-                                                                logger.error("Skipping deletion of: " + oldVHNodeRef, t);
-                                                                return oldVHNodeRef;
-                                                            }
-                                                        }
-                                                        
-                                                        if (logger.isDebugEnabled())
-                                                        {
-                                                            logger.debug("Deleted batch of "+tmpBatch.size()+" migrated version histories in "+(System.currentTimeMillis()-startTime)+ " ms");
-                                                        }
-                                                        
-                                                        return null;
-                                                    }
-                                                }, false, true);
-                                                
-                                                if (failed != null)
-                                                {
-                                                    tmpBatch.remove(failed); // retry batch without the failed node
-                                                    failCount++;
-                                                }
-                                                else
-                                                {
-                                                    deletedCount = deletedCount + tmpBatch.size();
-                                                    tmpBatch.clear();
-                                                    batchCount = 0;
-                                                }
-                                            }
-                                        }
+                                       notMigratedCount++;
                                     }
                                     else
                                     {
-                                        notMigratedCount++;
+                                        if (tmpBatch.size() < batchSize)
+                                        {
+                                            tmpBatch.add(childAssocRef.getChildRef());
+                                        }
+                                        
+                                        if ((tmpBatch.size() == batchSize) || (totalCount == childAssocRefs.size()))
+                                        {
+                                            // Each thread gets 1 batch to execute
+                                            batchProcessorWork.add(new ArrayList<NodeRef>(tmpBatch));
+                                            tmpBatch.clear();
+                                        }
                                     }
                                 }
+                                
+                                batchCount = batchProcessorWork.size();
+                                
+                                if (batchCount > 0)
+                                {
+                                    if (logger.isInfoEnabled())
+                                    {
+                                        logger.info("Split into "+batchCount+" batches in "+(System.currentTimeMillis()-splitTime)+" ms");
+                                    }
+                                    
+                                    //
+                                    // do the work
+                                    //
+                                    
+                                    BatchProcessWorkerAdaptor<List<NodeRef>> batchProcessorWorker = new BatchProcessWorkerAdaptor<List<NodeRef>>()
+                                    {
+                                        public void process(List<NodeRef> vhBatch) throws Throwable
+                                        {
+                                            long startTime = System.currentTimeMillis();
+                                            
+                                            for (NodeRef oldVHNodeRef : vhBatch)
+                                            {
+                                                // delete old version history node
+                                                v1DeleteVersionHistory(oldVHNodeRef);
+                                            }
+                                            
+                                            if (logger.isTraceEnabled())
+                                            {
+                                                logger.trace("Deleted batch of "+vhBatch.size()+" migrated version histories in "+(System.currentTimeMillis()-startTime)+ " ms ["+AlfrescoTransactionSupport.getTransactionId()+"]["+Thread.currentThread().getId()+"]");
+                                            }
+                                        }
+                                    };
+                                    
+                                    BatchProcessor<List<NodeRef>> batchProcessor = new BatchProcessor<List<NodeRef>>(
+                                            "MigrateVersionStore",
+                                            transactionService.getRetryingTransactionHelper(),
+                                            batchProcessorWork, threadCount, 1,
+                                            applicationEventPublisher, logger, loggingInterval);
+                                    
+                                    boolean splitTxns = true;
+                                    batchProcessor.process(batchProcessorWorker, splitTxns);
+                                    
+                                    batchErrorCount = batchProcessor.getTotalErrors();
+                                }
                             }
                             finally
                             {
@@ -609,23 +691,21 @@ public class VersionMigrator
                                 SessionSizeResourceManager.setEnableInTransaction();
                             }
                             
-                            if (failCount > 0)
-                            {
-                                logger.warn(I18NUtil.getMessage(MSG_DELETE_SKIP1, failCount));
-                            }
-                            
                             if (notMigratedCount > 0)
                             {
                                 logger.warn(I18NUtil.getMessage(MSG_DELETE_SKIP2, notMigratedCount));
                             }
                             
-                            if (deletedCount > 0)
+                            if (batchCount > 0)
                             {
-                                logger.info(I18NUtil.getMessage(MSG_DELETE_COMPLETE, deletedCount, ((System.currentTimeMillis()-startTime)/1000)));
-                            }
-                            else if (logger.isDebugEnabled())
-                            {
-                                logger.debug(I18NUtil.getMessage(MSG_DELETE_COMPLETE, deletedCount, ((System.currentTimeMillis()-startTime)/1000)));
+                                if (batchErrorCount > 0)
+                                {
+                                    logger.warn(I18NUtil.getMessage(MSG_DELETE_SKIP1, batchErrorCount, ((System.currentTimeMillis()-startTime)/1000)));
+                                }
+                                else
+                                {
+                                    logger.info(I18NUtil.getMessage(MSG_DELETE_COMPLETE, (toDo - notMigratedCount), toDo, ((System.currentTimeMillis()-startTime)/1000)));
+                                }
                             }
                         }
                         
@@ -644,72 +724,4 @@ public class VersionMigrator
     {
         return (((String)dbNodeService.getProperty(vhChildAssocRef.getChildRef(), ContentModel.PROP_NAME)).startsWith(VersionMigrator.PREFIX_MIGRATED));
     }
-    
-    /**
-     * Support to report % completion and estimated completion time.
-     * 
-     * @param estimatedTotal
-     * @param currentInteration
-     */
-    protected void reportProgress(String msgKey, long estimatedTotal, long currentInteration)
-    {
-        if (currentInteration == 0)
-        {
-            percentComplete = 0;
-        }
-        else if (currentInteration * 100l / estimatedTotal > percentComplete)
-        {
-            int previous = percentComplete;
-            percentComplete = (int) (currentInteration * 100l / estimatedTotal);
-            
-            if (percentComplete < 100)
-            {
-                // conditional report
-                long currentTime = System.currentTimeMillis();
-                long timeSoFar = currentTime - startTime;
-                long timeRemaining = timeSoFar * (100 - percentComplete) / percentComplete;
-                
-                int report = -1;
-                
-                if (timeRemaining > 60000)
-                {
-                    int reportInterval = getreportingInterval(timeSoFar, timeRemaining);
-                    
-                    for (int i = previous + 1; i <= percentComplete; i++)
-                    {
-                        if (i % reportInterval == 0)
-                        {
-                            report = i;
-                        }
-                    }
-                    if (report > 0)
-                    {
-                        Date end = new Date(currentTime + timeRemaining);
-                        logger.info(I18NUtil.getMessage(msgKey, report, end));
-                    }
-                }
-            }
-        }
-    }
-
-    private int getreportingInterval(long soFar, long toGo)
-    {
-        long total = soFar + toGo;
-        if (total < RANGE_10)
-        {
-            return 10;
-        }
-        else if (total < RANGE_5)
-        {
-            return 5;
-        }
-        else if (total < RANGE_2)
-        {
-            return 2;
-        }
-        else
-        {
-            return 1;
-        }
-    }
 }
diff --git a/source/java/org/alfresco/repo/version/VersionMigratorTest.java b/source/java/org/alfresco/repo/version/VersionMigratorTest.java
index 78804ad8c3..0332d0bcc2 100644
--- a/source/java/org/alfresco/repo/version/VersionMigratorTest.java
+++ b/source/java/org/alfresco/repo/version/VersionMigratorTest.java
@@ -358,7 +358,7 @@ public class VersionMigratorTest extends BaseVersionStoreTest
             public NodeRef execute() throws Throwable
             {
                 // Migrate (and don't delete old version history) !
-                versionMigrator.migrateVersions(1, false);
+                versionMigrator.migrateVersions(1, 1, false);
                 
                 return null;
             }
diff --git a/source/java/org/alfresco/repo/workflow/jbpm/AlfrescoTimer.java b/source/java/org/alfresco/repo/workflow/jbpm/AlfrescoTimer.java
index 7eceada0ad..c004a10d51 100644
--- a/source/java/org/alfresco/repo/workflow/jbpm/AlfrescoTimer.java
+++ b/source/java/org/alfresco/repo/workflow/jbpm/AlfrescoTimer.java
@@ -67,7 +67,7 @@ public class AlfrescoTimer extends Timer
         
         // establish authentication context
         String username = null;
-        TaskInstance taskInstance = getTaskInstance();
+        final TaskInstance taskInstance = getTaskInstance();
         if (taskInstance != null)
         {
             String actorId = taskInstance.getActorId();
@@ -84,6 +84,15 @@ public class AlfrescoTimer extends Timer
             public Boolean doWork() throws Exception
             {
                 boolean deleteTimer = AlfrescoTimer.super.execute(jbpmContext);
+                
+                // End the task. 
+                // Note the order is a little odd here as the task will be ended
+                // after the token has been signalled to move to the next node.
+                if (taskInstance != null && taskInstance.isOpen())
+                {
+                    taskInstance.setSignalling(false);
+                	taskInstance.end();
+                }
                 return deleteTimer;
             }
         }, (username == null) ? "system" : username);
diff --git a/source/java/org/alfresco/service/cmr/dictionary/DictionaryService.java b/source/java/org/alfresco/service/cmr/dictionary/DictionaryService.java
index 69440a5e04..39504b0a85 100644
--- a/source/java/org/alfresco/service/cmr/dictionary/DictionaryService.java
+++ b/source/java/org/alfresco/service/cmr/dictionary/DictionaryService.java
@@ -90,9 +90,11 @@ public interface DictionaryService
     Collection<QName> getAllTypes();
     
     /**
-     * @param type
+     * Get the sub types of the type.   The returned list includes the base type which is passed in as a parameter.
+     * 
+     * @param type, the qualified name of the type
      * @param follow  true => all sub-type descendants, false => immediate sub-type children
-     * @return the sub types of specified type
+     * @return the names of the sub types of the specified type, including the value passed in.
      */
     @NotAuditable
     Collection<QName> getSubTypes(QName type, boolean follow);
diff --git a/source/java/org/alfresco/service/cmr/model/FileFolderService.java b/source/java/org/alfresco/service/cmr/model/FileFolderService.java
index 7a6348c5e7..34b0b22ea6 100644
--- a/source/java/org/alfresco/service/cmr/model/FileFolderService.java
+++ b/source/java/org/alfresco/service/cmr/model/FileFolderService.java
@@ -29,7 +29,9 @@ import org.alfresco.service.namespace.QName;
 
 /**
  * Provides methods specific to manipulating {@link org.alfresco.model.ContentModel#TYPE_CONTENT files}
- * and {@link org.alfresco.model.ContentModel#TYPE_FOLDER folders}.
+ * and {@link org.alfresco.model.ContentModel#TYPE_FOLDER folders}.    
+ * 
+ * So this interface provides a simple way of accessing simple trees of files and folders in Alfresco.
  * 
  * @see org.alfresco.model.ContentModel
  * 
@@ -64,9 +66,20 @@ public interface FileFolderService
      */
     @Auditable(key = Auditable.Key.ARG_0, parameters = {"contextNodeRef"})
     public List<FileInfo> listFolders(NodeRef contextNodeRef);
-
+       
     /**
-     * Get a simple list of nodes that have the given name within the parent node
+     * Lists all folders below the given context node, both immediate and lower levels
+     * 
+     * The filter parameter allows subfolders to be excluded from the search. 
+     * 
+     * @param contextNodeRef the node to start searching in
+     * @param filter - may be null in which case all sub-folders will be searched
+     */
+    @Auditable(key = Auditable.Key.ARG_0, parameters = {"contextNodeRef"})
+    public List<FileInfo> listDeepFolders(NodeRef contextNodeRef, SubFolderFilter filter);
+    
+    /**
+     * Get a node ref of the node that has the name within the parent node
      * 
      * @param contextNodeRef the parent node
      * @param name the name of the node to search for
@@ -74,7 +87,8 @@ public interface FileFolderService
      */
     @Auditable(key = Auditable.Key.ARG_0, parameters = {"contextNodeRef", "name"})
     public NodeRef searchSimple(NodeRef contextNodeRef, String name);
-
+    
+    
     /**
      * Searches for all files and folders with the matching name pattern,
      * using wildcard characters <b>*</b> and <b>?</b>.
@@ -91,9 +105,9 @@ public interface FileFolderService
      * @return Returns a list of file or folder matches
      *
      * @see #search(NodeRef, String, boolean, boolean, boolean)
-     * @deprecated for shallow search use list, listFolders, listFiles, searchSimple, alternatives 
-     * for deep search will be provided in later releases. Avoid calling this method with any 
-     * name pattern except for "*".    
+     * @deprecated for shallow search use list, listFolders, listFiles, searchSimple.
+     * For deep listing use listDeepFolders. 
+     * Avoid calling this method with any name pattern except for "*".    
      */
     @Auditable(key = Auditable.Key.ARG_0, parameters = {"contextNodeRef", "namePattern", "includeSubFolders"})
     public List<FileInfo> search(
@@ -117,9 +131,9 @@ public interface FileFolderService
      * @param folderSearch true if folder types are to be included in the search results
      * @param includeSubFolders true to search the entire hierarchy below the search context
      * @return Returns a list of file or folder matches
-     * @deprecated for shallow search use list, listFolders, listFiles, searchSimple, alternatives 
-     * for deep search will be provided in later releases.   Avoid calling this method with any 
-     * name pattern except for "*".  
+     * @deprecated for shallow search use list, listFolders, listFiles, searchSimple.
+     * For deep listing use listDeepFolders.    
+     * Avoid calling this method with any name pattern except for "*".  
      */
     @Auditable(key = Auditable.Key.ARG_0, parameters = {"contextNodeRef", "namePattern", "fileSearch", "folderSearch", "includeSubFolders"})
     public List<FileInfo> search(
@@ -213,24 +227,7 @@ public interface FileFolderService
      */
     @Auditable(key = Auditable.Key.ARG_0, parameters = {"nodeRef"})
     public void delete(NodeRef nodeRef);
-    
-    /**
-     * Checks for the presence of, and creates as necessary, the folder structure in the provided path.
-     * <p>
-     * An empty path list is not allowed as it would be impossible to necessarily return file info
-     * for the parent node - it might not be a folder node.
-     * 
-     * @param parentNodeRef the node under which the path will be created
-     * @param pathElements the folder name path to create - may not be empty
-     * @param folderTypeQName the types of nodes to create.  This must be a valid subtype of
-     *      {@link org.alfresco.model.ContentModel#TYPE_FOLDER they folder type}.
-     * @return Returns the info of the last folder in the path.
-     * 
-     * @deprecated - See the static helper method FileFolderServiceImpl.makeFolders
-     */
-    @Auditable(key = Auditable.Key.ARG_0, parameters = {"parentNodeRef", "pathElements", "folderTypeQName"})
-    public FileInfo makeFolders(NodeRef parentNodeRef, List<String> pathElements, QName folderTypeQName);
-    
+      
     /**
      * Get the file or folder names from the root down to and including the node provided.
      * <ul>
diff --git a/source/java/org/alfresco/service/cmr/model/FileFolderUtil.java b/source/java/org/alfresco/service/cmr/model/FileFolderUtil.java
new file mode 100644
index 0000000000..ddff3ad7b0
--- /dev/null
+++ b/source/java/org/alfresco/service/cmr/model/FileFolderUtil.java
@@ -0,0 +1,140 @@
+/*
+ * Copyright (C) 2005-2010 Alfresco Software Limited.
+ *
+ * This file is part of Alfresco
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.alfresco.service.cmr.model;
+
+import java.util.List;
+
+import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.alfresco.service.namespace.QName;
+
+/**
+ * Higher level utility methods to be used in conjunction with the FileFolderService.
+ * 
+ * @author mrogers
+ */
+public class FileFolderUtil
+{
+    
+//    /**
+//     * Utility method for deep listings of files/folders
+//     * 
+//     * This method walks down a tree of file/folders and for each file or folder it encounters 
+//     * 
+//     * @param contextNodeRef the starting point for our deep listing.
+//     * @param filter
+//     * @return
+//     */
+//    public List<NodeRef> listDeep(NodeRef contextNodeRef, FileFolderFilter filter)
+//    {
+//    }
+    
+
+    
+    /**
+     * Checks for the presence of, and creates as necessary, the folder
+     * structure in the provided path.
+     * <p>
+     * An empty path list is not allowed as it would be impossible to
+     * necessarily return file info for the parent node - it might not be a
+     * folder node.
+     * 
+     * @param parentNodeRef
+     *            the node under which the path will be created
+     * @param pathElements
+     *            the folder name path to create - may not be empty
+     * @param folderTypeQName
+     *            the types of nodes to create. This must be a valid subtype of
+     *            {@link org.alfresco.model.ContentModel#TYPE_FOLDER they folder
+     *            type}.
+     * @return Returns the info of the last folder in the path.
+     */
+    public static FileInfo makeFolders(FileFolderService service,
+            NodeRef parentNodeRef, List<String> pathElements,
+            QName folderTypeQName)
+    {
+        if (pathElements.size() == 0)
+        {
+            throw new IllegalArgumentException("Path element list is empty");
+        }
+
+        // make sure that the folder is correct
+        boolean isFolder = service.getType(folderTypeQName) == FileFolderServiceType.FOLDER;
+        if (!isFolder)
+        {
+            throw new IllegalArgumentException(
+                    "Type is invalid to make folders with: " + folderTypeQName);
+        }
+
+        NodeRef currentParentRef = parentNodeRef;
+        // just loop and create if necessary
+        for (String pathElement : pathElements)
+        {
+            // does it exist?
+            // Navigation should not check permissions
+            NodeRef nodeRef = AuthenticationUtil.runAs(new SearchAsSystem(
+                    service, currentParentRef, pathElement), AuthenticationUtil
+                    .getSystemUserName());
+
+            if (nodeRef == null)
+            {
+                // not present - make it
+                // If this uses the public service it will check create
+                // permissions
+                FileInfo createdFileInfo = service.create(currentParentRef,
+                        pathElement, folderTypeQName);
+                currentParentRef = createdFileInfo.getNodeRef();
+            }
+            else
+            {
+                // it exists
+                currentParentRef = nodeRef;
+            }
+        }
+        // done
+        // Used to call toFileInfo((currentParentRef, true);
+        // If this uses the public service this will check the final read access
+        FileInfo fileInfo = service.getFileInfo(currentParentRef);
+
+        // Should we check the type?
+        return fileInfo;
+    }
+
+    private static class SearchAsSystem implements RunAsWork<NodeRef>
+    {
+        FileFolderService service;
+        NodeRef node;
+        String name;
+
+        SearchAsSystem(FileFolderService service, NodeRef node, String name)
+        {
+            this.service = service;
+            this.node = node;
+            this.name = name;
+        }
+
+        public NodeRef doWork() throws Exception
+        {
+            return service.searchSimple(node, name);
+        }
+
+    }
+
+}
diff --git a/source/java/org/alfresco/service/cmr/model/SubFolderFilter.java b/source/java/org/alfresco/service/cmr/model/SubFolderFilter.java
new file mode 100644
index 0000000000..337f33ac4d
--- /dev/null
+++ b/source/java/org/alfresco/service/cmr/model/SubFolderFilter.java
@@ -0,0 +1,21 @@
+package org.alfresco.service.cmr.model;
+
+import java.util.List;
+
+import org.alfresco.service.cmr.repository.ChildAssociationRef;
+
+/**
+ * Interface to determine which sub-folders to search during deep listing.
+ * 
+ * @See FileFolderService
+ */
+public interface SubFolderFilter
+{
+    /**
+     * Does deep listing enter this subfolder?
+     * 
+     * @param subfolderRef the association
+     * @return return true to enter the sub-folder, false to exclude the subfolder and all its children
+     */
+    public boolean isEnterSubfolder(ChildAssociationRef subfolderRef);
+}
diff --git a/source/java/org/alfresco/service/cmr/model/package-info.java b/source/java/org/alfresco/service/cmr/model/package-info.java
new file mode 100644
index 0000000000..45c4b595b3
--- /dev/null
+++ b/source/java/org/alfresco/service/cmr/model/package-info.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2005-2010 Alfresco Software Limited.
+ *
+ * This file is part of Alfresco
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+   FileFolderService
+   <p/>
+   These services give <b>much</b> simpler APIs for manipulating nodes structures
+   conforming to traditional file/folder trees within the data dictionary.
+   <p/>
+   When using these methods please be aware that they only work with File/Folder trees linked
+   together by a primary association of type cm:contains.   In particular these methods do not
+   work on the association above "company home"
+   <p/>
+   FileFolderService provides the public service.
+   <p>
+   FileFolderUtil provides a utility methods.
+ */
+package org.alfresco.service.cmr.model;
diff --git a/source/java/org/alfresco/service/cmr/repository/ContentData.java b/source/java/org/alfresco/service/cmr/repository/ContentData.java
index 55db31096f..19ee93307e 100644
--- a/source/java/org/alfresco/service/cmr/repository/ContentData.java
+++ b/source/java/org/alfresco/service/cmr/repository/ContentData.java
@@ -43,7 +43,6 @@ public class ContentData implements Serializable
     private final long size;
     private final String encoding;
     private final Locale locale;
-    private int refCount;
     
     /**
      * Construct a content property from a string
@@ -223,32 +222,6 @@ public class ContentData implements Serializable
                 EqualsHelper.nullSafeEquals(this.locale, that.locale));
     }
     
-    /**
-     * Use to 'hold on' to content data outside of a transaction (e.g. on transaction retry).
-     */
-    public void reference()
-    {
-        this.refCount++;
-    }
-
-    /**
-     * Use to release a content data previously held on to by {@link #reference()}.
-     */
-    public void deReference()
-    {
-        this.refCount--;
-    }
-    
-    /**
-     * Determines whether this content data should be deleted on rollback.
-     * 
-     * @return <code>false</code> if this content data should be deleted on rollback.
-     */
-    public boolean isReferenced()
-    {
-        return this.refCount > 0;
-    }
-
     /**
      * @return Returns a string of form: <code>contentUrl=xxx;mimetype=xxx;size=xxx;encoding=xxx</code>
      */
diff --git a/source/java/org/alfresco/service/cmr/repository/ContentService.java b/source/java/org/alfresco/service/cmr/repository/ContentService.java
index ed1cd8353c..2fcbb8fa56 100644
--- a/source/java/org/alfresco/service/cmr/repository/ContentService.java
+++ b/source/java/org/alfresco/service/cmr/repository/ContentService.java
@@ -96,6 +96,13 @@ public interface ContentService
      * <p>
      * If no node is supplied, then the writer will provide a stream into the backing content
      * store, but will not be associated with any new or previous content.
+     * <p/>
+     * <b>NOTE: </b>The content URL provided will be registered for automatic cleanup in the event
+     * that the transaction, in which this method was called, rolls back.  If the transaction
+     * is successful, the writer may still be open and available for use but the underlying binary
+     * will not be cleaned up subsequently.  The recommended pattern is to group calls to retrieve
+     * the writer in the same transaction as the calls to subsequently update and close the
+     * write stream - including setting of the related content properties.
      * 
      * @param nodeRef a reference to a node having a content property, or <tt>null</tt>
      *      to just get a valid writer into a backing content store.
diff --git a/source/test-resources/tenant/mt-contentstore-context.xml b/source/test-resources/tenant/mt-contentstore-context.xml
index a67ea46342..6fc64c92ca 100644
--- a/source/test-resources/tenant/mt-contentstore-context.xml
+++ b/source/test-resources/tenant/mt-contentstore-context.xml
@@ -25,9 +25,6 @@
    <!--                                   -->
    
    <bean id="tenantFileContentStore" class="org.alfresco.repo.content.TenantRoutingFileContentStore" init-method="init">
-      <property name="applicationEventPublisher">
-         <ref bean="applicationEventPublisher" />
-      </property>
       <property name="defaultRootDir">
          <value>${dir.contentstore}</value>
       </property>