Derek Hulley 
							
						 
					 
					
						
						
							
						
						e0b54089c6 
					 
					
						
						
							
							Merged V2.0 to HEAD  
						
						... 
						
						
						
						6179: AWC-1314
   6186: WCM-486
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6187  c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 
						
						
					 
					
						2007-07-06 11:28:55 +00:00 
						 
				 
			
				
					
						
							
							
								Kevin Roast 
							
						 
					 
					
						
						
							
						
						62bfb6356a 
					 
					
						
						
							
							Support for Liferay user login in WebScript JSR-168 portlet authenticators.  
						
						... 
						
						
						
						Fix to add missing downloadUrl property to TemplateContentData object for non-standard content property values.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6137  c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 
						
						
					 
					
						2007-07-03 09:58:09 +00:00 
						 
				 
			
				
					
						
							
							
								Kevin Roast 
							
						 
					 
					
						
						
							
						
						fd36b00448 
					 
					
						
						
							
							JavaScript AVM API enhancements. Template AVM API addition.  
						
						... 
						
						
						
						git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6049  c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 
						
						
					 
					
						2007-06-21 11:59:52 +00:00 
						 
				 
			
				
					
						
							
							
								Mike Hatfield 
							
						 
					 
					
						
						
							
						
						84b84ffad0 
					 
					
						
						
							
							Made downloadUrl available across all public APIs for nodes  
						
						... 
						
						
						
						git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6047  c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 
						
						
					 
					
						2007-06-21 10:09:56 +00:00 
						 
				 
			
				
					
						
							
							
								Mike Hatfield 
							
						 
					 
					
						
						
							
						
						af8c77753f 
					 
					
						
						
							
							Doclist Webscript - main document list now separate ajax panel. New PortletActionsBean to perform server-side actions from portlets. DeleteItem moved out of MySpacesBean into PortletActionsBean. TemplateNode addition of downloadUrl method for non-inline document downloads.  
						
						... 
						
						
						
						git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6044  c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 
						
						
					 
					
						2007-06-20 21:23:51 +00:00 
						 
				 
			
				
					
						
							
							
								Kevin Roast 
							
						 
					 
					
						
						
							
						
						2191fe7a23 
					 
					
						
						
							
							Lucene search support for AVM FreeMarker Template API  
						
						... 
						
						
						
						git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6043  c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 
						
						
					 
					
						2007-06-20 20:28:38 +00:00 
						 
				 
			
				
					
						
							
							
								David Caruana 
							
						 
					 
					
						
						
							
						
						2794a59085 
					 
					
						
						
							
							- Refinements to Javascript/Freemarker Node conversions  
						
						... 
						
						
						
						- Removed hard-coded conversions from Web Scripts
- example category search web script aligned with documentation
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5940  c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 
						
						
					 
					
						2007-06-13 17:23:47 +00:00 
						 
				 
			
				
					
						
							
							
								Kevin Roast 
							
						 
					 
					
						
						
							
						
						6cadd8573a 
					 
					
						
						
							
							All arrays returned by JavaScript API calls (i.e. node.children) now returned as proper JavaScript native Array objects.  
						
						... 
						
						
						
						git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5866  c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 
						
						
					 
					
						2007-06-06 11:16:55 +00:00 
						 
				 
			
				
					
						
							
							
								Kevin Roast 
							
						 
					 
					
						
						
							
						
						74b2ac0c79 
					 
					
						
						
							
							REST API command support for launching the XForms edit content dialog. AVM Templating API addition to retrieve the list of modified items for a sandbox user.  
						
						... 
						
						
						
						git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5858  c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 
						
						
					 
					
						2007-06-05 20:21:57 +00:00 
						 
				 
			
				
					
						
							
							
								Kevin Roast 
							
						 
					 
					
						
						
							
						
						4843b56e2a 
					 
					
						
						
							
							GetAspects() method now working correctly for AVM nodes in templating API  
						
						... 
						
						
						
						git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5854  c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 
						
						
					 
					
						2007-06-05 17:49:13 +00:00 
						 
				 
			
				
					
						
							
							
								Mike Hatfield 
							
						 
					 
					
						
						
							
						
						c2b6a11cd7 
					 
					
						
						
							
							Added getTaskById(String taskId) to get a single workflow task (req'd by Office Add-In)  
						
						... 
						
						
						
						git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5840  c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 
						
						
					 
					
						2007-06-04 13:07:11 +00:00 
						 
				 
			
				
					
						
							
							
								Kevin Roast 
							
						 
					 
					
						
						
							
						
						527addc354 
					 
					
						
						
							
							Short URL format for common Alfresco servlets - for internal use  
						
						... 
						
						
						
						git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5839  c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 
						
						
					 
					
						2007-06-04 11:06:26 +00:00 
						 
				 
			
				
					
						
							
							
								Kevin Roast 
							
						 
					 
					
						
						
							
						
						4cfeec0306 
					 
					
						
						
							
							Manage Task Dialog (from web-client) can now be launched from the MyTasks portlet for an individual task.  
						
						... 
						
						
						
						git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5813  c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 
						
						
					 
					
						2007-05-30 16:35:40 +00:00 
						 
				 
			
				
					
						
							
							
								Kevin Roast 
							
						 
					 
					
						
						
							
						
						71f060d9a6 
					 
					
						
						
							
							Minor fix change and spelling mistake  
						
						... 
						
						
						
						git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5797  c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 
						
						
					 
					
						2007-05-29 11:05:26 +00:00 
						 
				 
			
				
					
						
							
							
								Kevin Roast 
							
						 
					 
					
						
						
							
						
						a55a186705 
					 
					
						
						
							
							The Import dialog now allows ZIP file structure import into the repo from the web-client by any user with Write access to a folder - this is nice quick way for any user to import bulk data without using an FTP client or CIFS folder access.  
						
						... 
						
						
						
						Import action moved to top-level in the main browse screen now it is useful on a day-to-day basis.
The 'import' repository action (ImporterActionExecuter) extended to support import of any zip flavour file.
More zip flavour filetypes added to mimetype map.
Improved debugging output added to BasePathResultsMap for xpaths executed in templates.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5760  c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 
						
						
					 
					
						2007-05-23 12:25:04 +00:00 
						 
				 
			
				
					
						
							
							
								Kevin Roast 
							
						 
					 
					
						
						
							
						
						7d2159686f 
					 
					
						
						
							
							TemplateImageResolver refactoring to support 64x64 icons as a new filetype image size. More icons from Linton.  
						
						... 
						
						
						
						git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5707  c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 
						
						
					 
					
						2007-05-17 09:35:56 +00:00 
						 
				 
			
				
					
						
							
							
								Kevin Roast 
							
						 
					 
					
						
						
							
						
						9a980892d8 
					 
					
						
						
							
							First pass at My Spaces webscript based portlet. Fixes and improvements to doclist and mytasks portlets. New 64x64 icons from Linton.  
						
						... 
						
						
						
						git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5694  c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 
						
						
					 
					
						2007-05-16 16:47:51 +00:00 
						 
				 
			
				
					
						
							
							
								Kevin Roast 
							
						 
					 
					
						
						
							
						
						431f990806 
					 
					
						
						
							
							My Forms template now opens website virtualisation URL when icon clicked.  
						
						... 
						
						
						
						New Template AVM API methods added to generate staging, user sandbox and path asset URLs for virtualisation server.
Some refactoring of constants used in AVMConstants into JNDIConstants to allow repository classes to also use them.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5624  c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 
						
						
					 
					
						2007-05-04 11:27:46 +00:00 
						 
				 
			
				
					
						
							
							
								Kevin Roast 
							
						 
					 
					
						
						
							
						
						ebcd489416 
					 
					
						
						
							
							Task resources list now populated in My Tasks template.  
						
						... 
						
						
						
						git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5602  c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 
						
						
					 
					
						2007-05-02 21:05:56 +00:00 
						 
				 
			
				
					
						
							
							
								Kevin Roast 
							
						 
					 
					
						
						
							
						
						162ba3e141 
					 
					
						
						
							
							Ajax pop-up summary panel code refactored into generic library.  
						
						... 
						
						
						
						First cut of the My Tasks webscript..
Added "url.context" help object to template model for TemplateContentServlet.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5549  c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 
						
						
					 
					
						2007-04-25 14:33:29 +00:00 
						 
				 
			
				
					
						
							
							
								Kevin Roast 
							
						 
					 
					
						
						
							
						
						884b4920c3 
					 
					
						
						
							
							Workflow helper object added to Template API, for use in new 2.1 Portlets.  
						
						... 
						
						
						
						git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5538  c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 
						
						
					 
					
						2007-04-24 13:14:02 +00:00 
						 
				 
			
				
					
						
							
							
								Kevin Roast 
							
						 
					 
					
						
						
							
						
						577d45c551 
					 
					
						
						
							
							More fall out from Template/Script refactoring:  
						
						... 
						
						
						
						- fix to missing annotated service method (caused script command servlet to fail)
 - spelling mistakes in annotated service method parameters
 - cleanup in AbstractWebScript
Added ValueConverter concept to Template API - similar to JavaScript API ValueConverter, for a consistent mechanism to recursively convert Alfresco node properties to template accessable objects.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5535  c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 
						
						
					 
					
						2007-04-24 13:11:25 +00:00 
						 
				 
			
				
					
						
							
							
								Roy Wetherall 
							
						 
					 
					
						
						
							
						
						3322e78a09 
					 
					
						
						
							
							Fallout fix from template/script refactor.  
						
						... 
						
						
						
						git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5524  c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 
						
						
					 
					
						2007-04-23 13:19:26 +00:00 
						 
				 
			
				
					
						
							
							
								Roy Wetherall 
							
						 
					 
					
						
						
							
						
						5401499003 
					 
					
						
						
							
							Refactor of template and script services to allow easy addition of further template and script processors.  
						
						... 
						
						
						
						Hightlights of check-in include:
- Introduction of script processor 
- Neutralisation of script and template models
- The notion of a processor extension introduced
- Extensions applied to processor implementation rather than the services
- Auto selection of processor based on file extension of template or script
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5519  c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 
						
						
					 
					
						2007-04-20 17:13:34 +00:00 
						 
				 
			
				
					
						
							
							
								Kevin Roast 
							
						 
					 
					
						
						
							
						
						e2329988bd 
					 
					
						
						
							
							Child association (map) support for JavaScript API. Fix to child association support for Template API.  
						
						... 
						
						
						
						git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5508  c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 
						
						
					 
					
						2007-04-18 11:19:05 +00:00 
						 
				 
			
				
					
						
							
							
								Kevin Roast 
							
						 
					 
					
						
						
							
						
						a650515ea8 
					 
					
						
						
							
							Added create/remove association JavaScript API and improvements to the createNode() JavaScript API  
						
						... 
						
						
						
						git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5504  c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 
						
						
					 
					
						2007-04-17 14:52:04 +00:00 
						 
				 
			
				
					
						
							
							
								Kevin Roast 
							
						 
					 
					
						
						
							
						
						98f2e85cc0 
					 
					
						
						
							
							New API for templates.  
						
						... 
						
						
						
						Provides access to AVM stores and nodes within those stores. The majority of the standard template Node API is available (such as properties, children, content, icons etc.) and some additional AVM specific methods. 
Root level helper object 'avm' provides lookup for AVM store object and AVM nodes objects by path in the OO style expected by template writers. Once retrieved, the store object provides store meta-data and access to the root Template AVM node for the store (or lookup of individual nodes by path) which exposes the standard template Node API.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5460  c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 
						
						
					 
					
						2007-04-04 16:26:16 +00:00 
						 
				 
			
				
					
						
							
							
								Kevin Roast 
							
						 
					 
					
						
						
							
						
						fab3f867f8 
					 
					
						
						
							
							JavaDoc updates for recent Template/script class changes and additions  
						
						... 
						
						
						
						git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5428  c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 
						
						
					 
					
						2007-03-28 09:14:19 +00:00 
						 
				 
			
				
					
						
							
							
								Kevin Roast 
							
						 
					 
					
						
						
							
						
						1e05a3b0ac 
					 
					
						
						
							
							Split of the template node functionality into new interface hierarchy and appropriate base classes impl.  
						
						... 
						
						
						
						git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5418  c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 
						
						
					 
					
						2007-03-23 16:26:09 +00:00 
						 
				 
			
				
					
						
							
							
								Kevin Roast 
							
						 
					 
					
						
						
							
						
						6795d5dc9c 
					 
					
						
						
							
							JavaScript node and Template node xpath search now uses QueryParameters for folder path searches  
						
						... 
						
						
						
						git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5408  c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 
						
						
					 
					
						2007-03-21 12:43:51 +00:00 
						 
				 
			
				
					
						
							
							
								Kevin Roast 
							
						 
					 
					
						
						
							
						
						bcd81b582e 
					 
					
						
						
							
							hasPermission() method added (as configured template API extension) to Template API  
						
						... 
						
						
						
						git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5378  c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 
						
						
					 
					
						2007-03-12 15:42:33 +00:00 
						 
				 
			
				
					
						
							
							
								Kevin Roast 
							
						 
					 
					
						
						
							
						
						200d170489 
					 
					
						
						
							
							Added spring configured template extensions support to WebScript and image resolving support.  
						
						... 
						
						
						
						git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5374  c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 
						
						
					 
					
						2007-03-09 18:26:02 +00:00 
						 
				 
			
				
					
						
							
							
								Kevin Roast 
							
						 
					 
					
						
						
							
						
						9323a8cd7a 
					 
					
						
						
							
							Template extension spring configuration support  
						
						... 
						
						
						
						- similar pattern to existing script bean extension support
 - new root model helper objects and custom methods can be added via spring configuration
Cleanup of script extension spring support
Fix to thread safety of configured script extension beans that use the Scopable interface
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5369  c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 
						
						
					 
					
						2007-03-09 12:30:34 +00:00 
						 
				 
			
				
					
						
							
							
								Derek Hulley 
							
						 
					 
					
						
						
							
						
						f17fd30824 
					 
					
						
						
							
							Merge V2.0 to HEAD  
						
						... 
						
						
						
						5234: LicenseService shutdown
   5256: AR-1273 workaround
   5289: AWC-1142
   5294: WCM-360
   5296: Potential NPE in patches dao
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5333  c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 
						
						
					 
					
						2007-03-07 15:14:46 +00:00 
						 
				 
			
				
					
						
							
							
								Kevin Roast 
							
						 
					 
					
						
						
							
						
						a6cd614afa 
					 
					
						
						
							
							Merged from BRANCHES/DEV/KEVINR:  
						
						... 
						
						
						
						. NodeInfo panel and Ajax client library
 - Rewrite of Node Info panel
 - Alfresco common DOM methods refactored into namespaced object (YUI/Dojo style) Alfresco.Dom
 - Addition of useful DOM and 'smart' alignment method to common.js
 - OpenSearch now uses additional namespace for it's global method handlers: Alfresco.OpenSearchEngine
 - Temporary icons added for pop-up node info panel
. Additional FreeMarker model API method "cropContent(contentprop, length)" to return the first N bytes of a content stream - auto converted to plain/text from all supported transformation mimetypes
. DownloadContentServlet now handles ContentIOException more gracefully
. AbstractContentReader fixed to handle empty file data when requesting N characters from a content stream
. Yahoo scripts move to PageTag rendering as appropriate
. Refactoring of existing ajax components that output Yahoo scripts
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5253  c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 
						
						
					 
					
						2007-03-01 17:24:08 +00:00 
						 
				 
			
				
					
						
							
							
								Paul Holmes-Higgin 
							
						 
					 
					
						
						
							
						
						4e2300f095 
					 
					
						
						
							
							Updated copyright  
						
						... 
						
						
						
						git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5186  c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 
						
						
					 
					
						2007-02-19 17:17:36 +00:00 
						 
				 
			
				
					
						
							
							
								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