Merge remote-tracking branch 'upstream/main' into demo

wso2 · Oct 15, 2024 · d9d3a10 · d9d3a10
2 parents e9d1d9a + a580405
commit d9d3a10
Show file tree

Hide file tree

Showing 17 changed files with 810 additions and 82 deletions.
diff --git a/financial-services-accelerator/accelerators/fs-apim/bin/configure.sh b/financial-services-accelerator/accelerators/fs-apim/bin/configure.sh
@@ -117,9 +117,6 @@ create_mysql_databases() {
     mysql -u${DB_USER} ${DB_MYSQL_PASS} -h${DB_HOST} -e "DROP DATABASE IF EXISTS ${DB_GOV}; CREATE DATABASE ${DB_GOV};
     ALTER DATABASE ${DB_GOV} CHARACTER SET latin1 COLLATE latin1_swedish_ci";
     echo "Database Created: ${DB_GOV}"
-    mysql -u${DB_USER} ${DB_MYSQL_PASS} -h${DB_HOST} -e "DROP DATABASE IF EXISTS ${DB_USER_STORE}; CREATE DATABASE ${DB_USER_STORE};
-    ALTER DATABASE ${DB_USER_STORE} CHARACTER SET latin1 COLLATE latin1_swedish_ci";
-    echo "Database Created: ${DB_USER_STORE}"
 };
 
 create_mysql_database_tables() {
@@ -129,8 +126,6 @@ create_mysql_database_tables() {
     echo "Database tables Created for: ${DB_AM_CONFIG}"
     mysql -u${DB_USER} ${DB_MYSQL_PASS} -D${DB_GOV} -h${DB_HOST} -e "SOURCE ${WSO2_APIM_HOME}/dbscripts/mysql.sql";
     echo "Database tables Created for: ${DB_GOV}"
-    mysql -u${DB_USER} ${DB_MYSQL_PASS} -D${DB_USER_STORE} -h${DB_HOST} -e "SOURCE ${WSO2_APIM_HOME}/dbscripts/mysql.sql";
-    echo "Database tables Created for: ${DB_USER_STORE}"
 };
 
 add_json_fault_sequence() {

diff --git a/...vices-accelerator/accelerators/fs-apim/carbon-home/repository/conf/financial-services.xml b/...vices-accelerator/accelerators/fs-apim/carbon-home/repository/conf/financial-services.xml
@@ -18,12 +18,6 @@
  -->
 
 <Server xmlns="http://wso2.org/projects/carbon/financial-services.xml">
-    <Common>
-        <Cache>
-            <CacheAccessExpiry>60</CacheAccessExpiry>
-            <CacheModifiedExpiry>60</CacheModifiedExpiry>
-        </Cache>
-    </Common>
     <Gateway>
         <RequestRouter>org.wso2.financial.services.accelerator.gateway.executor.core.DefaultRequestRouter</RequestRouter>
         <FinancialServicesGatewayExecutors>

diff --git a/...carbon-home/repository/resources/conf/templates/repository/conf/financial-services.xml.j2 b/...carbon-home/repository/resources/conf/templates/repository/conf/financial-services.xml.j2
@@ -18,20 +18,6 @@
  -->
 
 <Server xmlns="http://wso2.org/projects/carbon/financial-services.xml">
-    <Common>
-        <Cache>
-            {% if financial_services.common.cache.cache_access_expiry_minutes is defined %}
-            <CacheAccessExpiry>{{financial_services.common.cache.cache_access_expiry_minutes}}</CacheAccessExpiry>
-            {% else %}
-            <CacheAccessExpiry>60</CacheAccessExpiry>
-            {% endif %}
-            {% if financial_services.common.cache.cache_modified_expiry_minutes is defined %}
-            <CacheModifiedExpiry>{{financial_services.common.cache.cache_modified_expiry_minutes}}</CacheModifiedExpiry>
-            {% else %}
-            <CacheModifiedExpiry>60</CacheModifiedExpiry>
-            {% endif %}
-        </Cache>
-    </Common>
     <Gateway>
         {% if financial_services.gateway.request_router is defined %}
         <RequestRouter>{{financial_services.gateway.request_router}}</RequestRouter>

diff --git a/financial-services-accelerator/accelerators/fs-apim/repository/conf/configure.properties b/financial-services-accelerator/accelerators/fs-apim/repository/conf/configure.properties
@@ -21,7 +21,7 @@ BI_HOSTNAME=localhost
 
 # Specify the deployment.toml file containing the required configurations based on the APIM version being used
 # As an example if APIM 4.3.0 version is used change the file name to wso2am-4.3.0-deployment.toml in the same file path
-PRODUCT_CONF_PATH=repository/resources/wso2am-4.3.0-deployment.toml
+PRODUCT_CONF_PATH=repository/resources/wso2am-4.4.0-deployment.toml
 
 # Configure databases related properties
 DB_TYPE=mysql
@@ -34,6 +34,5 @@ DB_APIMGT=fs_apimgtdb
 DB_USER_STORE=fs_userdb
 DB_AM_CONFIG=fs_am_configdb
 DB_GOV=fs_govdb
-DB_IS_CONFIG=fs_iskm_configdb
 DB_FS_STORE=fs_consentdb