Kevin Roast 
							
						 
					 
					
						
						
							
						
						a3d3014467 
					 
					
						
						
							
							Merged from BRANCHES/DEV/KEVINR:  
						
						... 
						
						
						
						. Fix from Andy for jboss portal issue with audit component
. Fix to AlfrescoFacesPortlet to work with JBossPortal2.4.1
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5249  c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 
						
						
					 
					
						2007-03-01 15:56:52 +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 
						 
				 
			
				
					
						
							
							
								Andrew Hind 
							
						 
					 
					
						
						
							
						
						93ec1a0552 
					 
					
						
						
							
							AR-1212  
						
						... 
						
						
						
						git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5051  c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 
						
						
					 
					
						2007-02-06 14:38:48 +00:00 
						 
				 
			
				
					
						
							
							
								Derek Hulley 
							
						 
					 
					
						
						
							
						
						8e0a637886 
					 
					
						
						
							
							Merged 1.4 to HEAD  
						
						... 
						
						
						
						svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4229 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4230 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4232 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4233 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4234 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4235 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4239 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4240 .
   svn resolved root\projects\web-client\source\java\org\alfresco\web\app\AlfrescoNavigationHandler.java
   svn resolved root\projects\web-client\source\web\WEB-INF\faces-config-beans.xml
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4241 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4242 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4243 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4244 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4244 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4245 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4245 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4246 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4247 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4248 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4248 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4249 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4250 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4251 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4251 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4252 .
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4633  c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 
						
						
					 
					
						2006-12-18 13:18:44 +00:00 
						 
				 
			
				
					
						
							
							
								Britt Park 
							
						 
					 
					
						
						
							
						
						111296d4dc 
					 
					
						
						
							
							Heinous merge from HEAD.  Seems to basically work.  Be on guard however.  
						
						... 
						
						
						
						git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4137  c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 
						
						
					 
					
						2006-10-18 02:24:36 +00:00 
						 
				 
			
				
					
						
							
							
								Britt Park 
							
						 
					 
					
						
						
							
						
						39a18df7f2 
					 
					
						
						
							
							Yet another merge from head to WCM-DEV2.  
						
						... 
						
						
						
						git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3774  c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 
						
						
					 
					
						2006-09-12 18:55:07 +00:00 
						 
				 
			
				
					
						
							
							
								Britt Park 
							
						 
					 
					
						
						
							
						
						820da6ecab 
					 
					
						
						
							
							Merge from HEAD to WCM-DEV2.  
						
						... 
						
						
						
						git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3659  c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 
						
						
					 
					
						2006-09-02 18:19:00 +00:00 
						 
				 
			
				
					
						
							
							
								David Caruana 
							
						 
					 
					
						
						
							
						
						9bd553336b 
					 
					
						
						
							
							Fix case where audit information needs to be applied to locked node.  
						
						... 
						
						
						
						git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2657  c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 
						
						
					 
					
						2006-04-13 17:52:53 +00:00 
						 
				 
			
				
					
						
							
							
								David Caruana 
							
						 
					 
					
						
						
							
						
						b91897f77a 
					 
					
						
						
							
							Transaction-level Policies.  Modify AuditableAspect and ContentHits example to make use of transaction policies so they only trigger once.  
						
						... 
						
						
						
						git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2652  c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 
						
						
					 
					
						2006-04-12 16:40:36 +00:00 
						 
				 
			
				
					
						
							
							
								David Caruana 
							
						 
					 
					
						
						
							
						
						0330f2cdb7 
					 
					
						
						
							
							Transaction-level Policies.  Modify AuditableAspect and ContentHits example to make use of transaction policies so they only trigger once.  
						
						... 
						
						
						
						git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2651  c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 
						
						
					 
					
						2006-04-12 16:15:20 +00:00 
						 
				 
			
				
					
						
							
							
								Roy Wetherall 
							
						 
					 
					
						
						
							
						
						731733d59f 
					 
					
						
						
							
							- Auditable aspect now modifies properties in batch using setProperties  
						
						... 
						
						
						
						- Inbound rule type now only fires on content creation (not on content update)
- Update rule type added, but commented out sue to issues with over enthusiastic policies.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2541  c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 
						
						
					 
					
						2006-03-13 14:42: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