Derek Hulley 
							
						 
					 
					
						
						
							
						
						0c10d61a48 
					 
					
						
						
							
							Merged V2.0 to HEAD  
						
						... 
						
						
						
						svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V2.0@5141 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V2.0@51352 .
      - FLOSS
      - Some files will need a follow-up
         -root/projects/repository/source/java/org/alfresco/repo/avm/wf/AVMRemoveWFStoreHandler.java (not yet on HEAD: 5094)
         -root/projects/repository/source/java/org/alfresco/filesys/server/state/FileStateLockManager.java (not yet on HEAD: 5093)
         -onContentUpdateRecord (not on HEAD)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5167  c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 
						
						
					 
					
						2007-02-16 06:44:46 +00:00 
						 
				 
			
				
					
						
							
							
								Paul Holmes-Higgin 
							
						 
					 
					
						
						
							
						
						31c250682b 
					 
					
						
						
							
							Changed licence headers  
						
						... 
						
						
						
						git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5081  c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 
						
						
					 
					
						2007-02-08 18:59:58 +00:00 
						 
				 
			
				
					
						
							
							
								Derek Hulley 
							
						 
					 
					
						
						
							
						
						bd2524dc2d 
					 
					
						
						
							
							Merged DEV\EXTENSIONS to HEAD  
						
						... 
						
						
						
						svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/DEV/EXTENSIONS@4865 svn://svn.alfresco.com:3691/alfresco/BRANCHES/DEV/EXTENSIONS@4866 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/DEV/EXTENSIONS@4872 svn://svn.alfresco.com:3691/alfresco/BRANCHES/DEV/EXTENSIONS@4884 .
   Dave and Gavin's search work
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4899  c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 
						
						
					 
					
						2007-01-23 12:09:27 +00:00 
						 
				 
			
				
					
						
							
							
								David Caruana 
							
						 
					 
					
						
						
							
						
						26937ed560 
					 
					
						
						
							
							OpenSearch  
						
						... 
						
						
						
						- comply with atom feed validators
- addition of xmldate and urlencode freemarker methods
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4750  c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 
						
						
					 
					
						2007-01-08 12:36:17 +00:00 
						 
				 
			
				
					
						
							
							
								Kevin Roast 
							
						 
					 
					
						
						
							
						
						ec80a72900 
					 
					
						
						
							
							. Merge horrors fixed  
						
						... 
						
						
						
						. Code compile issue fixed
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4669  c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 
						
						
					 
					
						2006-12-20 10:03:44 +00:00 
						 
				 
			
				
					
						
							
							
								Derek Hulley 
							
						 
					 
					
						
						
							
						
						e6f28374a5 
					 
					
						
						
							
							Merged 1.4 to HEAD (Repo and other pieces for support of Records Management)  
						
						... 
						
						
						
						svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4/root/projects/repository@4616 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4/root/projects/repository@4617 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4/root/projects/web-client@4616 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4/root/projects/web-client@4617 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4/root/common@4616 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4/root/common@4617 .
   svn revert common.properties
   Manually carried common.properties file changes over
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4666  c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 
						
						
					 
					
						2006-12-19 17:30:05 +00:00 
						 
				 
			
				
					
						
							
							
								Derek Hulley 
							
						 
					 
					
						
						
							
						
						a67dce2f5e 
					 
					
						
						
							
							Merged 1.4 to HEAD (Repository support for Records Management)  
						
						... 
						
						
						
						svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4/root/projects/repository@4306 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4/root/projects/repository@4307 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4/root/projects/repository@4485 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4/root/projects/repository@4486 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4/root/projects/repository@4532 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4/root/projects/repository@4533 .
   svn resolved source\java\org\alfresco\repo\jscript\Node.java
   svn resolved config\alfresco\action-services-context.xml
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4664  c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 
						
						
					 
					
						2006-12-19 17:12:47 +00:00 
						 
				 
			
				
					
						
							
							
								Derek Hulley 
							
						 
					 
					
						
						
							
						
						b3a235b6eb 
					 
					
						
						
							
							Merge 1.4 to HEAD  
						
						... 
						
						
						
						svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4504 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4505 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4506 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4507 .
   svn resolved root\projects\core\source\java\log4j.properties
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4548 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4549 .
   svn resolved root\projects\repository\source\java\org\alfresco\repo\jscript\Node.java
   svn resolved  root\projects\repository\source\java\org\alfresco\repo\jscript\CategoryTemplateNode.java
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4603 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4604 .
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4662  c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 
						
						
					 
					
						2006-12-19 16:28:32 +00:00 
						 
				 
			
				
					
						
							
							
								Derek Hulley 
							
						 
					 
					
						
						
							
						
						ced83b971b 
					 
					
						
						
							
							Merged 1.4 to HEAD  
						
						... 
						
						
						
						svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4392 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4399 .
   svn resolved root\projects\repository\source\java\org\alfresco\repo\jscript\Node.java
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4660  c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 
						
						
					 
					
						2006-12-19 16:01:52 +00:00 
						 
				 
			
				
					
						
							
							
								Derek Hulley 
							
						 
					 
					
						
						
							
						
						760cb0fe77 
					 
					
						
						
							
							Merge 1.4 to HEAD  
						
						... 
						
						
						
						svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4351 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4352 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4353 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4354 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4354 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4362 .
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4657  c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 
						
						
					 
					
						2006-12-19 14:36:46 +00:00 
						 
				 
			
				
					
						
							
							
								Derek Hulley 
							
						 
					 
					
						
						
							
						
						72bb79696d 
					 
					
						
						
							
							Merged 1.4 to HEAD  
						
						... 
						
						
						
						svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4252 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4294 .
   svn revert root\common\common.xml
   svn resolved root\projects\repository\config\alfresco\script-services-context.xml
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4634  c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 
						
						
					 
					
						2006-12-18 13:45:11 +00:00 
						 
				 
			
				
					
						
							
							
								Derek Hulley 
							
						 
					 
					
						
						
							
						
						ff07ea1e7d 
					 
					
						
						
							
							Merged 1.4 to HEAD  
						
						... 
						
						
						
						svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4192 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4197 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4205 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4206 .
   svn resolved root\projects\repository\source\java\org\alfresco\filesys\server\config\ServerConfiguration.java
   svn revert root\projects\repository\config\alfresco\version.properties
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4219 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4224 .
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4631  c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 
						
						
					 
					
						2006-12-18 11:58:55 +00:00 
						 
				 
			
				
					
						
							
							
								Derek Hulley 
							
						 
					 
					
						
						
							
						
						be167f60cf 
					 
					
						
						
							
							Merged V1.4 to HEAD  
						
						... 
						
						
						
						svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@3987 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4133 .
   Removed LicenseComponent reference from projects\repository\source\java\org\alfresco\repo\descriptor\DescriptorServiceImpl.java
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4135  c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 
						
						
					 
					
						2006-10-17 22:42:59 +00:00 
						 
				 
			
				
					
						
							
							
								Kevin Roast 
							
						 
					 
					
						
						
							
						
						8473e7fc4f 
					 
					
						
						
							
							. Added ability to execute FreeMarker templates from within Alfresco JavaScript  
						
						... 
						
						
						
						git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@3561  c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 
						
						
					 
					
						2006-08-22 08:24:59 +00:00 
						 
				 
			
				
					
						
							
							
								Kevin Roast 
							
						 
					 
					
						
						
							
						
						d24a815b79 
					 
					
						
						
							
							. JavaScript API improvements  
						
						... 
						
						
						
						. Template API improvements
. Fixed a couple more UTF-8 code file warnings when compiling the source
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@3473  c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 
						
						
					 
					
						2006-08-09 12:51:42 +00:00 
						 
				 
			
				
					
						
							
							
								Kevin Roast 
							
						 
					 
					
						
						
							
						
						1ec0296c22 
					 
					
						
						
							
							. Fix to issue in login page redirect code where URL arguments (e.g. for templates and scripts) were removed and not passed through.  
						
						... 
						
						
						
						- this only affected the template/command servlets that were using parameters and had not already logged in
. Support for 'path' argument on DownloadContentServlet
  for example /alfresco/download/direct?path=/Company%20Home/Kev's%20Home%20Space/myimage.jpg
  - paths are specified in a similar way to webdav path - they are 'cm:name' based URL encoded strings
  - this means we no longer need to have the NodeRef to a document to download it
. Support for 'templatePath' and 'contextPath' URL arguments in TemplateContentServlet
  for example: /alfresco/template?templatePath=/Company%20Home/Data%20Dictionary/Presentation%20Templates/doc_info.ftl&contextPath=/Company%20Home/file.txt
  - the 'templatePath' argument specifies the cm:name based path to the template to execute
  - the 'contextPath' argument specifies the cm:name based path to the context for the template
. Support for 'scriptPath' and 'contextPath' URL arguments in Script CommandProcessor
  for example: /alfresco/command/script/execute?scriptPath=/Company%20Home/Data%20Dictionary/Scripts/append%20copyright.js&contextPath=/Company%20Home/file.txt
  - the 'scriptPath' argument specifies the cm:name based path to the script to execute
  - the 'contextPath' argument specifies the cm:name based path to the context for the script
. Adding debugging output to get timings for executing templates and scripts
. Enhancements and additions to JavaScript API:
  setPermission()
  removePermission()
  get/setInheritsPermissions()
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@3297  c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 
						
						
					 
					
						2006-07-11 10:13:30 +00:00 
						 
				 
			
				
					
						
							
							
								Kevin Roast 
							
						 
					 
					
						
						
							
						
						1757cec4f8 
					 
					
						
						
							
							Checkpoint for the Rhino Script engine integration  
						
						... 
						
						
						
						git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2720  c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 
						
						
					 
					
						2006-04-27 09:39:25 +00:00 
						 
				 
			
				
					
						
							
							
								Andrew Hind 
							
						 
					 
					
						
						
							
						
						05525aff09 
					 
					
						
						
							
							Scheduled Actions  
						
						... 
						
						
						
						git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2673  c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 
						
						
					 
					
						2006-04-20 13:57:06 +00:00 
						 
				 
			
				
					
						
							
							
								Kevin Roast 
							
						 
					 
					
						
						
							
						
						26e45a09a1 
					 
					
						
						
							
							. Saved Search execution and direct Lucene query execution support added to Template API.  
						
						... 
						
						
						
						. Fixed bug in TemplateNode for encoding of UTF-8 characters in generated URL filenames.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2334  c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 
						
						
					 
					
						2006-02-09 14:22:54 +00:00 
						 
				 
			
				
					
						
							
							
								Kevin Roast 
							
						 
					 
					
						
						
							
						
						43b285e956 
					 
					
						
						
							
							Added several missing UI actions to the Space Details and Document Details page  
						
						... 
						
						
						
						git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2113  c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 
						
						
					 
					
						2006-01-13 18:08:00 +00:00 
						 
				 
			
				
					
						
							
							
								Derek Hulley 
							
						 
					 
					
						
						
							
						
						e1e6508fec 
					 
					
						
						
							
							Moving to root below branch label  
						
						... 
						
						
						
						git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2005  c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 
						
						
					 
					
						2005-12-08 07:13:07 +00:00