inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-10-08 14:51:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged 5.0.N (5.0.3) to 5.1.N (5.1.1) (PARTIAL MERGE)

Browse Source 
114790 amorarasu: MNT-15007: CLONE - String values when migrating from MySQL to other DBs
      Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
         114311 amorarasu: Merged V4.1-BUG-FIX (4.1.11) to V4.2-BUG-FIX (4.2.6)
            114245 tvalkevych: Merged V4.1.9 (4.1.9.13) to V4.1-BUG-FIX (4.1.11)
               113717 dhulley: MNT-14911: String values when migrating from MySQL to other DBs
                - Add a new job that allows node string values to be re-persisted according to the current 'system.maximumStringLength' value
                - Job is unscheduled by default
                - Set the 'system.maximumStringLength' and the 'system.maximumStringLength.jobCronExpression'
                - Various touched code format fixes, method naming fixes, etc


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@114988 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Raluca Munteanu
2015-10-23 07:46:06 +00:00
parent fb20d2a4e2
commit d0f097601a
15 changed files with 1185 additions and 444 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
source/java/org/alfresco/encryption/KeyStoreChecker.java
View File

@@ -18,9 +18,6 @@
*/
package org.alfresco.encryption;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
/**
* Checks the repository key stores.
*
@@ -29,8 +26,6 @@ import org.apache.commons.logging.LogFactory;
*/
public class KeyStoreChecker
{
private static final Log logger = LogFactory.getLog(KeyStoreChecker.class);
private AlfrescoKeyStore mainKeyStore;
public KeyStoreChecker()
@@ -38,16 +33,16 @@ public class KeyStoreChecker
}
public void setMainKeyStore(AlfrescoKeyStore mainKeyStore)
{
this.mainKeyStore = mainKeyStore;
}
{
this.mainKeyStore = mainKeyStore;
}
public void validateKeyStores() throws InvalidKeystoreException, MissingKeyException
{
mainKeyStore.validateKeys();
if(!mainKeyStore.exists())
{
mainKeyStore.create();
}
}
public void validateKeyStores() throws InvalidKeystoreException, MissingKeyException
{
mainKeyStore.validateKeys();
if(!mainKeyStore.exists())
{
mainKeyStore.create();
}
}
}