mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-07-24 17:32:48 +00:00
Merged V2.1 to HEAD
6386: Fix for AR-1649 6387: Fix for AR-1645 6388: Updated Polish messages 6389: Updated security providers 6392: Add support to log in as guest with any password (if guest is allowed) 6393: AR-1562 : Cannot directly exit/disable Alfresco JavaScript Debugger window 6394: Allow creation of PropertyValue persisted properties without knowing the type QName 6397: Log Serializable properties don't cause infinte waits 6398: Build fix and tidy up for authentication chaining Resolved conflicted state of 'root\projects\repository\source\java\org\alfresco\repo\security\authentication\AuthenticationUtil.java' 6402: AR-1643 Web Script args object does not handle multi-value arguments 6407: Removed use of QName "{}silly" as a data type definition. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6728 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -2310,9 +2310,9 @@ public class ServerConfiguration extends AbstractLifecycleBean
|
||||
}
|
||||
else
|
||||
{
|
||||
// Use the default Cryptix JCE provider
|
||||
// Use the default Bouncy Castle
|
||||
|
||||
setJCEProvider("cryptix.jce.provider.CryptixCrypto");
|
||||
setJCEProvider("org.bouncycastle.jce.provider.BouncyCastleProvider");
|
||||
}
|
||||
|
||||
// Check if any domain mappings have been specified
|
||||
|
Reference in New Issue
Block a user