Change the keystore data storage type config to use registry keystore…

… data persistence manager
wso2 · Dec 20, 2024 · 705129b · 705129b
1 parent 17867c4
commit 705129b
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/...src/main/java/org/wso2/carbon/keystore/persistence/KeyStorePersistenceManagerFactory.java b/...src/main/java/org/wso2/carbon/keystore/persistence/KeyStorePersistenceManagerFactory.java
@@ -21,7 +21,6 @@
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.wso2.carbon.keystore.persistence.impl.JDBCKeyStorePersistenceManager;
 import org.wso2.carbon.keystore.persistence.impl.RegistryKeyStorePersistenceManager;
 import org.wso2.carbon.utils.CarbonUtils;
 
@@ -43,7 +42,7 @@ private KeyStorePersistenceManagerFactory() {
 
     public static KeyStorePersistenceManager getKeyStorePersistenceManager() {
 
-        KeyStorePersistenceManager defaultKeyStorePersistenceManager = new JDBCKeyStorePersistenceManager();
+        KeyStorePersistenceManager defaultKeyStorePersistenceManager = new RegistryKeyStorePersistenceManager();
         if (StringUtils.isNotBlank(KEYSTORE_STORAGE_TYPE)) {
             if (LOG.isDebugEnabled()) {
                 LOG.debug("KeyStore storage type is set to: " + KEYSTORE_STORAGE_TYPE);

diff --git a/...arbon.utils/src/main/java/org/wso2/carbon/utils/internal/CarbonUtilsServiceComponent.java b/...arbon.utils/src/main/java/org/wso2/carbon/utils/internal/CarbonUtilsServiceComponent.java
@@ -1,5 +1,6 @@
 package org.wso2.carbon.utils.internal;
 
+import org.apache.commons.lang3.StringUtils;
 import org.osgi.service.component.ComponentContext;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
@@ -25,6 +26,10 @@ protected void activate(ComponentContext ctx) {
         ctx.getBundleContext().registerService(GhostMetaArtifactsLoader.class.getName(), serviceMetaArtifactsLoader, null);
         // Read and set diagnostic logs config.
         CarbonUtils.setDiagnosticLogMode(PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId());
+        DataSource dataSource = getKeyStoreDataSource();
+        if (dataSource == null) {
+            throw new RuntimeException("Data source is not available for KeyStore Data Persistence Manager.");
+        }
         CarbonUtilsDataHolder.getInstance().setDataSource(getKeyStoreDataSource());
     }
 
@@ -42,7 +47,7 @@ private static synchronized DataSource getKeyStoreDataSource() {
 
         String dataSourceName = CarbonUtils.getServerConfiguration().getFirstProperty(
                 "KeyStoreDataPersistenceManager.DataSourceName");
-        if (dataSourceName != null) {
+        if (StringUtils.isNotBlank(dataSourceName)) {
             try {
                 return InitialContext.doLookup(dataSourceName);
             } catch (NamingException e) {

diff --git a/distribution/kernel/carbon-home/repository/conf/carbon.xml b/distribution/kernel/carbon-home/repository/conf/carbon.xml
@@ -749,7 +749,7 @@
 
     <KeyStoreDataPersistenceManager>
         <!-- Keystore data storage type-->
-        <DataStorageType>database</DataStorageType>
+        <DataStorageType>registry</DataStorageType>
         <!-- Include a data source name from the set of data sources defined in master-datasources.xml -->
         <DataSourceName>jdbc/SHARED_DB</DataSourceName>
     </KeyStoreDataPersistenceManager>

diff --git a/distribution/kernel/carbon-home/repository/resources/conf/default.json b/distribution/kernel/carbon-home/repository/resources/conf/default.json
@@ -251,6 +251,6 @@
   "database.registry_db.pool_options.validationInterval" : "30000",
   "database.registry_db.pool_options.defaultAutoCommit" : "true",
   "admin_console.resolve_absolute_urls.enable": true,
-  "data_storage_type.keystores": "database",
+  "data_storage_type.keystores": "registry",
   "keystore.datasource": "jdbc/SHARED_DB"
 }