mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
Merged PATCHES/V3.2.0 to HEAD
19089: (RECORD ONLY) Merged V3.2 to PATCHES/V3.2.0 Merged DEV/TEMPORARY to V3.2 19005: Group Admin Scalability (SAP) implementation 19078: ALF-1934: change the behaviour of 'Manage User Groups' similar to 'Manage System Users' 19205: (RECORD ONLY) Merged HEAD to V3.2.0 19203: ALF-1999: Refactored AuthorityService.findAuthorities to support search options required by Alfresco Explorer client in efficient manner - optional parentAuthority argument - when set will only search for authorities under a given group - optional immediate flag - when false means do a recursive search. When true means only return first level. When true and parentAuthority is null means root groups. - search expression - which is tested against the short name and the display name - reworked all existing calls for new semantics - this method is for UI search only - not for existence checking! - removed some ill-informed calls 19206: (RECORD ONLY) Undid accidental change to log4j.properties 19212: (RECORD ONLY) Merged HEAD to V3.2.0 19210: Build fix - Corrected lookup of root groups - Improved root group search in the process - Spent ages trying to work out why GROUP_BUFFY wasn't being deleted! 19758: Merged DEV/BELARUS/V3.2-2010_03_17 to V3.2.0 19733: ALF-442: With SSO enabled, visiting wcservice URL and logging in redirects to My Alfresco 19793: (RECORD ONLY) Merged HEAD to V3.2.0 19786: Refactor of previous test fix. I have pushed down the OOo-specific parts of the change from AbstractContentTransformerTest to OpenOfficeContentTransformerTest leaving an extension point in the base class should other transformations need to be excluded in the future. 19785: Fix for failing test OpenOfficeContentTransformerTest.testAllConversions. Various OOo-related transformations are returned as available but fail on our test server with OOo on it. Pending further work on these failings, I am disabling those transformations in test code whilst leaving them available in the product code. This is because in the wild a different OOo version may succeed with these transformations. I had previously explicitly disabled 3 transformations in the product and I am moving that restriction from product to test code for the same reason. 19707: Return value from isTransformationBlocked was inverted. Fixed now. 19705: Refinement of previous check-in re OOo transformations. I have pulled up the code that handles blocked transformations into a superclass so that the JodConverter-based transformer worker can inherit the same list of blocked transformations. To reiterate, blocked transformations are those that the OOo integration code believes should work but which are broken in practice. These are blocked by the transformers and will always be unavailable regardless of the OOo connection state. 19702: Fix for HEAD builds running on panda build server. OOo was recently installed on panda which has activated various OOo-related transformations/extractions in the test code. It appears that OOo does not support some transformations from Office 97 to Office 2007. Specifically doc to docx and xls to xlsx. These transformations have now been marked as unavailable. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19995 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -99,4 +99,14 @@ public class WebScriptNTLMAuthenticationFilter extends NTLMAuthenticationFilter
|
|||||||
super.doFilter(context, sreq, sresp, chain);
|
super.doFilter(context, sreq, sresp, chain);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* (non-Javadoc)
|
||||||
|
* @see org.alfresco.web.app.servlet.NTLMAuthenticationFilter#onLoginComplete(javax.servlet.ServletContext, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse, boolean)
|
||||||
|
*/
|
||||||
|
protected boolean onLoginComplete(ServletContext sc, HttpServletRequest req, HttpServletResponse res, boolean userInit)
|
||||||
|
throws IOException
|
||||||
|
{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user