diff --git a/CHANGELOG.md b/CHANGELOG.md index 0e22fa3..f070300 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,19 +4,27 @@ All notable changes to Docker and Docker Compose resources for WSO2 Open Banking The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). +## [v2.0.0.2] - 2021-01-13 + +### Fixed + +- Fix product name change of Open Banking Identity & Access Management Module in OB 2.0 release (refer to [issue](https://github.com/wso2/docker-open-banking/issues/103)) + ## [v2.0.0.1] - 2021-01-06 ### Added - Open Banking UK and BERLIN specifications support - Alpine and Ubuntu based Docker resources for WSO2 Open Banking API Manager `2.0.0`, WSO2 Open Banking Identity Server - as Key Manager version `2.0.0` and WSO2 Open Banking Business Intelligence Dashboard and Worker profiles `2.0.0` + as Identity & Access Management Module version `2.0.0` and WSO2 Open Banking Business Intelligence Dashboard and Worker profiles `2.0.0` - Upgrade profile based dockerfiles to use Adopt OpenJDK `jdk8u272-b10` as the base image -- Docker Compose resources for OBAM, OBKM with OBBI deployment patterns +- Docker Compose resources for OBAM, OBIAM with OBBI deployment patterns based on UK and Berlin specifications +- Docker Compose resources for OBAM with OBIAM deployment patterns based on UK and AU specifications - Solution is based on WSO2 APIM 3.1.0 and WSO2 ISKM 5.10.0 -- Previous XML based configurations are carried out using TOML based configurations. Please refer the documentation for detailed mapping of configuration changes [Map Configurations](https://docs.wso2.com/display/OB200/Map+XML+Configurations+to+TOML+Configurations)) -- For detailed information of the WSO2 Open Banking 2.0.0 product release, please see the Github release notes [Releases](https://github.com/wso2-enterprise/financial-open-banking/releases)) +- Previous XML based configurations are carried out using TOML based configurations. Please refer the documentation for detailed mapping of configuration changes [Map Configurations](https://docs.wso2.com/display/OB200/Map+XML+Configurations+to+TOML+Configurations) +- For detailed information of the WSO2 Open Banking 2.0.0 product release, please see the GitHub release notes [Releases](https://github.com/wso2-enterprise/financial-open-banking/releases) For detailed information on the tasks carried out during this release, please see the GitHub milestone [v2.0.0.1](https://github.com/wso2/docker-open-banking/milestone/11) +[v2.0.0.2]: https://github.com/wso2/docker-open-banking/compare/v2.0.0.1...v2.0.0.2 [v2.0.0.1]: https://github.com/wso2/docker-open-banking/compare/v1.5.0.2...v2.0.0.1 diff --git a/README.md b/README.md index aaa866d..6a729e1 100644 --- a/README.md +++ b/README.md @@ -3,15 +3,15 @@ This repository contains the following resources: - WSO2 Open Banking API Manager Dockerfile for Ubuntu and Alpine -- WSO2 Open Banking Key Manager Dockerfile for Ubuntu and Alpine +- WSO2 Open Banking Identity & Access Management Module Dockerfile for Ubuntu and Alpine - WSO2 Open Banking Business Intelligence Dockerfile for Ubuntu and Alpine -- Docker Compose resources to evaluate WSO2 Open Banking API Manager with WSO2 Open Banking Key Manager profile based on UK, Berlin and AU specifications -- Docker Compose resources to evaluate WSO2 Open Banking API Manager and WSO2 Open Banking Key Manager with WSO2 Open Banking Business Intelligence profiles based on UK and Berlin specifications +- Docker Compose resources to evaluate WSO2 Open Banking API Manager with WSO2 Open Banking Identity & Access Management Module profile based on UK, Berlin and AU specifications +- Docker Compose resources to evaluate WSO2 Open Banking API Manager and WSO2 Open Banking Identity & Access Management Module with WSO2 Open Banking Business Intelligence profiles based on UK, Berlin and AU specifications -Docker resources for WSO2 Open Banking API Manager, WSO2 Open Banking Key Manager and WSO2 Open Banking Business Intelligence help you build generic Docker images for deploying the corresponding product servers in containerized environments. Each Docker image includes the JDK, the relevant product distribution and a collection of utility libraries. Configurations, custom JDBC +Docker resources for WSO2 Open Banking API Manager, WSO2 Open Banking Identity & Access Management Module and WSO2 Open Banking Business Intelligence help you build generic Docker images for deploying the corresponding product servers in containerized environments. Each Docker image includes the JDK, the relevant product distribution and a collection of utility libraries. Configurations, custom JDBC drivers, extensions and other deployable artifacts are designed to be provided via volume mounts to the containers spawned. -Docker Compose resources have been created according to the most common WSO2 Open Banking deployment profiles available for allowing users to quickly evaluate product features along side their co-operate Open Banking requirements. The Compose resources make use of Docker images of WSO2 Open Banking API Manager, WSO2 Open Banking Key Manager and MySQL. +Docker Compose resources have been created according to the most common WSO2 Open Banking deployment profiles available for allowing users to quickly evaluate product features along side their co-operate Open Banking requirements. The Compose resources make use of Docker images of WSO2 Open Banking API Manager, WSO2 Open Banking Identity & Access Management Module and MySQL. **Change log** from previous `v1.5.0.2` release: [View Here](CHANGELOG.md) diff --git a/docker-compose/obam-obkm-with-obbi/README.md b/docker-compose/obam-obiam-with-obbi/README.md similarity index 84% rename from docker-compose/obam-obkm-with-obbi/README.md rename to docker-compose/obam-obiam-with-obbi/README.md index 2fac140..9c6643d 100755 --- a/docker-compose/obam-obkm-with-obbi/README.md +++ b/docker-compose/obam-obiam-with-obbi/README.md @@ -1,4 +1,4 @@ -# WSO2 Open Banking API Manager and Open Banking Key Manager with Open Banking Business Intelligence +# WSO2 Open Banking API Manager and Open Banking Identity & Access Management Module with Open Banking Business Intelligence ## Prerequisites @@ -18,13 +18,13 @@ ``` > If you are to try out an already released zip of this repo, please ignore this 1st step. -2. Switch to the `docker-compose/obam-obkm-with-obbi` folder. +2. Switch to the `docker-compose/obam-obiam-with-obbi` folder. ``` - cd docker-open-banking/docker-compose/obam-obkm-with-obbi + cd docker-open-banking/docker-compose/obam-obiam-with-obbi ``` > If you are to try out an already released zip of this repo, please ignore this 2nd step also. - Instead, extract the zip file and directly browse to `docker-open-banking-/docker-compose/obam-obkm-with-obbi` folder. + Instead, extract the zip file and directly browse to `docker-open-banking-/docker-compose/obam-obiam-with-obbi` folder. > If you want to try out an already released tag, after executing 2nd step, checkout the relevant tag, i.e. for example: git checkout tags/v1.4.0.5 and continue below steps. @@ -54,7 +54,7 @@ https://localhost:8280 ``` - WSO2 Open Banking API Manager will use WSO2 Open Banking Key Manager to generate OAuth2 tokens and validate those tokens during API invocations. You can access the WSO2 Open Banking Key Manager-Management portal using the below URL via a web browser. + WSO2 Open Banking API Manager will use WSO2 Open Banking Identity & Access Management Module to generate OAuth2 tokens and validate those tokens during API invocations. You can access the WSO2 Open Banking Identity & Access Management Module-Management portal using the below URL via a web browser. ``` https://localhost:9446/carbon diff --git a/docker-compose/obam-obkm-with-obbi/docker-compose.yml b/docker-compose/obam-obiam-with-obbi/docker-compose.yml similarity index 93% rename from docker-compose/obam-obkm-with-obbi/docker-compose.yml rename to docker-compose/obam-obiam-with-obbi/docker-compose.yml index 4ed4df9..8905800 100755 --- a/docker-compose/obam-obkm-with-obbi/docker-compose.yml +++ b/docker-compose/obam-obiam-with-obbi/docker-compose.yml @@ -43,7 +43,7 @@ services: obbi-worker: container_name: obbi-worker - image: wso2-obbi-worker:2.0.0 + image: docker.wso2.com/wso2-obbi-worker healthcheck: test: ["CMD", "nc", "-z", "localhost", "9445"] interval: 10s @@ -70,7 +70,7 @@ services: obbi-dashboard: container_name: obbi-dashboard - image: wso2-obbi-dashboard:2.0.0 + image: docker.wso2.com/wso2-obbi-dashboard healthcheck: test: ["CMD", "nc", "-z", "localhost", "9649"] interval: 10s @@ -94,9 +94,9 @@ services: - "--" - "./docker-entrypoint.sh" - obkm: + obiam: container_name: obiam - image: wso2-obiam:2.0.0 + image: docker.wso2.com/wso2-obiam healthcheck: test: ["CMD", "curl", "-k", "-f", "https://localhost:9446/carbon/admin/login.jsp"] interval: 10s @@ -107,7 +107,7 @@ services: - "mysql" - "obbi-worker" volumes: - - "./obkm/uk:/home/wso2carbon/wso2-config-volume" + - "./obiam/uk:/home/wso2carbon/wso2-config-volume" - "./wait-for-it.sh:/home/wso2carbon/wait-for-it.sh" ports: - "9446:9446" @@ -121,7 +121,7 @@ services: obam: container_name: obam - image: wso2-obam:2.0.0 + image: docker.wso2.com/wso2-obam healthcheck: test: ["CMD", "curl", "-k", "-f", "https://localhost:9443/carbon/admin/login.jsp"] interval: 10s @@ -130,7 +130,7 @@ services: retries: 5 depends_on: - "mysql" - - "obkm" + - "obiam" - "obbi-worker" volumes: - "./obam/uk:/home/wso2carbon/wso2-config-volume" @@ -141,7 +141,7 @@ services: - "8280:8280" entrypoint: - "/home/wso2carbon/wait-for-it.sh" - - "obkm:9446" + - "obiam:9446" - "-t" - "240" - "--" diff --git a/docker-compose/obam-obkm-with-obbi/mysql/scripts/au/setup.sql b/docker-compose/obam-obiam-with-obbi/mysql/scripts/au/setup.sql similarity index 100% rename from docker-compose/obam-obkm-with-obbi/mysql/scripts/au/setup.sql rename to docker-compose/obam-obiam-with-obbi/mysql/scripts/au/setup.sql diff --git a/docker-compose/obam-obkm-with-obbi/mysql/scripts/berlin/setup.sql b/docker-compose/obam-obiam-with-obbi/mysql/scripts/berlin/setup.sql similarity index 100% rename from docker-compose/obam-obkm-with-obbi/mysql/scripts/berlin/setup.sql rename to docker-compose/obam-obiam-with-obbi/mysql/scripts/berlin/setup.sql diff --git a/docker-compose/obam-obkm-with-obbi/mysql/scripts/my.cnf b/docker-compose/obam-obiam-with-obbi/mysql/scripts/my.cnf similarity index 100% rename from docker-compose/obam-obkm-with-obbi/mysql/scripts/my.cnf rename to docker-compose/obam-obiam-with-obbi/mysql/scripts/my.cnf diff --git a/docker-compose/obam-obkm-with-obbi/mysql/scripts/uk/setup.sql b/docker-compose/obam-obiam-with-obbi/mysql/scripts/uk/setup.sql similarity index 100% rename from docker-compose/obam-obkm-with-obbi/mysql/scripts/uk/setup.sql rename to docker-compose/obam-obiam-with-obbi/mysql/scripts/uk/setup.sql diff --git a/docker-compose/obam-obkm-with-obbi/obam/au/bin/wso2server.sh b/docker-compose/obam-obiam-with-obbi/obam/au/bin/wso2server.sh similarity index 100% rename from docker-compose/obam-obkm-with-obbi/obam/au/bin/wso2server.sh rename to docker-compose/obam-obiam-with-obbi/obam/au/bin/wso2server.sh diff --git a/docker-compose/obam-obkm-with-obbi/obam/au/repository/conf/api-manager.xml b/docker-compose/obam-obiam-with-obbi/obam/au/repository/conf/api-manager.xml similarity index 100% rename from docker-compose/obam-obkm-with-obbi/obam/au/repository/conf/api-manager.xml rename to docker-compose/obam-obiam-with-obbi/obam/au/repository/conf/api-manager.xml diff --git a/docker-compose/obam-obkm-with-obbi/obam/au/repository/conf/carbon.xml b/docker-compose/obam-obiam-with-obbi/obam/au/repository/conf/carbon.xml similarity index 100% rename from docker-compose/obam-obkm-with-obbi/obam/au/repository/conf/carbon.xml rename to docker-compose/obam-obiam-with-obbi/obam/au/repository/conf/carbon.xml diff --git a/docker-compose/obam-obkm-with-obbi/obam/au/repository/conf/datasources/master-datasources.xml b/docker-compose/obam-obiam-with-obbi/obam/au/repository/conf/datasources/master-datasources.xml similarity index 100% rename from docker-compose/obam-obkm-with-obbi/obam/au/repository/conf/datasources/master-datasources.xml rename to docker-compose/obam-obiam-with-obbi/obam/au/repository/conf/datasources/master-datasources.xml diff --git a/docker-compose/obam-obkm-with-obbi/obam/au/repository/conf/datasources/open-banking-datasources.xml b/docker-compose/obam-obiam-with-obbi/obam/au/repository/conf/datasources/open-banking-datasources.xml similarity index 100% rename from docker-compose/obam-obkm-with-obbi/obam/au/repository/conf/datasources/open-banking-datasources.xml rename to docker-compose/obam-obiam-with-obbi/obam/au/repository/conf/datasources/open-banking-datasources.xml diff --git a/docker-compose/obam-obkm-with-obbi/obam/au/repository/conf/finance/open-banking.xml b/docker-compose/obam-obiam-with-obbi/obam/au/repository/conf/finance/open-banking.xml similarity index 100% rename from docker-compose/obam-obkm-with-obbi/obam/au/repository/conf/finance/open-banking.xml rename to docker-compose/obam-obiam-with-obbi/obam/au/repository/conf/finance/open-banking.xml diff --git a/docker-compose/obam-obkm-with-obbi/obam/au/repository/conf/registry.xml b/docker-compose/obam-obiam-with-obbi/obam/au/repository/conf/registry.xml similarity index 100% rename from docker-compose/obam-obkm-with-obbi/obam/au/repository/conf/registry.xml rename to docker-compose/obam-obiam-with-obbi/obam/au/repository/conf/registry.xml diff --git a/docker-compose/obam-obkm-with-obbi/obam/au/repository/conf/user-mgt.xml b/docker-compose/obam-obiam-with-obbi/obam/au/repository/conf/user-mgt.xml similarity index 100% rename from docker-compose/obam-obkm-with-obbi/obam/au/repository/conf/user-mgt.xml rename to docker-compose/obam-obiam-with-obbi/obam/au/repository/conf/user-mgt.xml diff --git a/docker-compose/obam-obkm-with-obbi/obam/au/repository/deployment/server/jaggeryapps/admin/site/conf/site.json b/docker-compose/obam-obiam-with-obbi/obam/au/repository/deployment/server/jaggeryapps/admin/site/conf/site.json similarity index 100% rename from docker-compose/obam-obkm-with-obbi/obam/au/repository/deployment/server/jaggeryapps/admin/site/conf/site.json rename to docker-compose/obam-obiam-with-obbi/obam/au/repository/deployment/server/jaggeryapps/admin/site/conf/site.json diff --git a/docker-compose/obam-obkm-with-obbi/obam/au/repository/deployment/server/jaggeryapps/store/site/conf/site.json b/docker-compose/obam-obiam-with-obbi/obam/au/repository/deployment/server/jaggeryapps/store/site/conf/site.json similarity index 100% rename from docker-compose/obam-obkm-with-obbi/obam/au/repository/deployment/server/jaggeryapps/store/site/conf/site.json rename to docker-compose/obam-obiam-with-obbi/obam/au/repository/deployment/server/jaggeryapps/store/site/conf/site.json diff --git a/docker-compose/obam-obkm-with-obbi/obam/au/repository/resources/api_templates/velocity_template.xml b/docker-compose/obam-obiam-with-obbi/obam/au/repository/resources/api_templates/velocity_template.xml similarity index 100% rename from docker-compose/obam-obkm-with-obbi/obam/au/repository/resources/api_templates/velocity_template.xml rename to docker-compose/obam-obiam-with-obbi/obam/au/repository/resources/api_templates/velocity_template.xml diff --git a/docker-compose/obam-obiam-with-obbi/obam/au/repository/resources/security/client-truststore.jks b/docker-compose/obam-obiam-with-obbi/obam/au/repository/resources/security/client-truststore.jks new file mode 100644 index 0000000..813afb9 Binary files /dev/null and b/docker-compose/obam-obiam-with-obbi/obam/au/repository/resources/security/client-truststore.jks differ diff --git a/docker-compose/obam-obiam-with-obbi/obam/au/repository/resources/security/client-truststore.jks.old b/docker-compose/obam-obiam-with-obbi/obam/au/repository/resources/security/client-truststore.jks.old new file mode 100644 index 0000000..bf029b2 Binary files /dev/null and b/docker-compose/obam-obiam-with-obbi/obam/au/repository/resources/security/client-truststore.jks.old differ diff --git a/docker-compose/obam-obiam-with-obbi/obam/au/repository/resources/security/openbanking.jks b/docker-compose/obam-obiam-with-obbi/obam/au/repository/resources/security/openbanking.jks new file mode 100644 index 0000000..c8e7e84 Binary files /dev/null and b/docker-compose/obam-obiam-with-obbi/obam/au/repository/resources/security/openbanking.jks differ diff --git a/docker-compose/obam-obkm-with-obbi/obam/au/repository/resources/security/sslprofiles.xml b/docker-compose/obam-obiam-with-obbi/obam/au/repository/resources/security/sslprofiles.xml similarity index 100% rename from docker-compose/obam-obkm-with-obbi/obam/au/repository/resources/security/sslprofiles.xml rename to docker-compose/obam-obiam-with-obbi/obam/au/repository/resources/security/sslprofiles.xml diff --git a/docker-compose/obam-obiam-with-obbi/obam/au/repository/resources/security/wso2carbon.jks b/docker-compose/obam-obiam-with-obbi/obam/au/repository/resources/security/wso2carbon.jks new file mode 100644 index 0000000..f2be3fa Binary files /dev/null and b/docker-compose/obam-obiam-with-obbi/obam/au/repository/resources/security/wso2carbon.jks differ diff --git a/docker-compose/obam-obiam-with-obbi/obam/au/repository/resources/security/wso2carbon.jks.old b/docker-compose/obam-obiam-with-obbi/obam/au/repository/resources/security/wso2carbon.jks.old new file mode 100644 index 0000000..d7f0ab6 Binary files /dev/null and b/docker-compose/obam-obiam-with-obbi/obam/au/repository/resources/security/wso2carbon.jks.old differ diff --git a/docker-compose/obam-obkm-with-obbi/obam/berlin/bin/wso2server.sh b/docker-compose/obam-obiam-with-obbi/obam/berlin/bin/wso2server.sh similarity index 100% rename from docker-compose/obam-obkm-with-obbi/obam/berlin/bin/wso2server.sh rename to docker-compose/obam-obiam-with-obbi/obam/berlin/bin/wso2server.sh diff --git a/docker-compose/obam-obkm-with-obbi/obam/berlin/repository/conf/deployment.toml b/docker-compose/obam-obiam-with-obbi/obam/berlin/repository/conf/deployment.toml similarity index 100% rename from docker-compose/obam-obkm-with-obbi/obam/berlin/repository/conf/deployment.toml rename to docker-compose/obam-obiam-with-obbi/obam/berlin/repository/conf/deployment.toml diff --git a/docker-compose/obam-obkm-with-obbi/obam/berlin/repository/deployment/server/jaggeryapps/admin/site/conf/site.json b/docker-compose/obam-obiam-with-obbi/obam/berlin/repository/deployment/server/jaggeryapps/admin/site/conf/site.json similarity index 100% rename from docker-compose/obam-obkm-with-obbi/obam/berlin/repository/deployment/server/jaggeryapps/admin/site/conf/site.json rename to docker-compose/obam-obiam-with-obbi/obam/berlin/repository/deployment/server/jaggeryapps/admin/site/conf/site.json diff --git a/docker-compose/obam-obkm-with-obbi/obam/berlin/repository/deployment/server/jaggeryapps/devportal/site/public/theme/settings.js b/docker-compose/obam-obiam-with-obbi/obam/berlin/repository/deployment/server/jaggeryapps/devportal/site/public/theme/settings.js similarity index 100% rename from docker-compose/obam-obkm-with-obbi/obam/berlin/repository/deployment/server/jaggeryapps/devportal/site/public/theme/settings.js rename to docker-compose/obam-obiam-with-obbi/obam/berlin/repository/deployment/server/jaggeryapps/devportal/site/public/theme/settings.js diff --git a/docker-compose/obam-obkm-with-obbi/obam/berlin/repository/resources/api_templates/velocity_template.xml b/docker-compose/obam-obiam-with-obbi/obam/berlin/repository/resources/api_templates/velocity_template.xml similarity index 100% rename from docker-compose/obam-obkm-with-obbi/obam/berlin/repository/resources/api_templates/velocity_template.xml rename to docker-compose/obam-obiam-with-obbi/obam/berlin/repository/resources/api_templates/velocity_template.xml diff --git a/docker-compose/obam-obkm-with-obbi/obam/berlin/repository/resources/security/client-truststore.jks b/docker-compose/obam-obiam-with-obbi/obam/berlin/repository/resources/security/client-truststore.jks similarity index 100% rename from docker-compose/obam-obkm-with-obbi/obam/berlin/repository/resources/security/client-truststore.jks rename to docker-compose/obam-obiam-with-obbi/obam/berlin/repository/resources/security/client-truststore.jks diff --git a/docker-compose/obam-obkm-with-obbi/obam/berlin/repository/resources/security/listenerprofiles.xml b/docker-compose/obam-obiam-with-obbi/obam/berlin/repository/resources/security/listenerprofiles.xml similarity index 100% rename from docker-compose/obam-obkm-with-obbi/obam/berlin/repository/resources/security/listenerprofiles.xml rename to docker-compose/obam-obiam-with-obbi/obam/berlin/repository/resources/security/listenerprofiles.xml diff --git a/docker-compose/obam-obkm-with-obbi/obam/au/repository/resources/security/openbanking.jks b/docker-compose/obam-obiam-with-obbi/obam/berlin/repository/resources/security/openbanking.jks similarity index 100% rename from docker-compose/obam-obkm-with-obbi/obam/au/repository/resources/security/openbanking.jks rename to docker-compose/obam-obiam-with-obbi/obam/berlin/repository/resources/security/openbanking.jks diff --git a/docker-compose/obam-obkm-with-obbi/obam/berlin/repository/resources/security/sslprofiles.xml b/docker-compose/obam-obiam-with-obbi/obam/berlin/repository/resources/security/sslprofiles.xml similarity index 100% rename from docker-compose/obam-obkm-with-obbi/obam/berlin/repository/resources/security/sslprofiles.xml rename to docker-compose/obam-obiam-with-obbi/obam/berlin/repository/resources/security/sslprofiles.xml diff --git a/docker-compose/obam-obkm-with-obbi/obam/berlin/repository/resources/security/wso2carbon.jks b/docker-compose/obam-obiam-with-obbi/obam/berlin/repository/resources/security/wso2carbon.jks similarity index 100% rename from docker-compose/obam-obkm-with-obbi/obam/berlin/repository/resources/security/wso2carbon.jks rename to docker-compose/obam-obiam-with-obbi/obam/berlin/repository/resources/security/wso2carbon.jks diff --git a/docker-compose/obam-obkm-with-obbi/obam/uk/bin/wso2server.sh b/docker-compose/obam-obiam-with-obbi/obam/uk/bin/wso2server.sh similarity index 100% rename from docker-compose/obam-obkm-with-obbi/obam/uk/bin/wso2server.sh rename to docker-compose/obam-obiam-with-obbi/obam/uk/bin/wso2server.sh diff --git a/docker-compose/obam-obkm-with-obbi/obam/uk/repository/conf/deployment.toml b/docker-compose/obam-obiam-with-obbi/obam/uk/repository/conf/deployment.toml similarity index 100% rename from docker-compose/obam-obkm-with-obbi/obam/uk/repository/conf/deployment.toml rename to docker-compose/obam-obiam-with-obbi/obam/uk/repository/conf/deployment.toml diff --git a/docker-compose/obam-obkm-with-obbi/obam/uk/repository/deployment/server/jaggeryapps/admin/site/conf/site.json b/docker-compose/obam-obiam-with-obbi/obam/uk/repository/deployment/server/jaggeryapps/admin/site/conf/site.json similarity index 100% rename from docker-compose/obam-obkm-with-obbi/obam/uk/repository/deployment/server/jaggeryapps/admin/site/conf/site.json rename to docker-compose/obam-obiam-with-obbi/obam/uk/repository/deployment/server/jaggeryapps/admin/site/conf/site.json diff --git a/docker-compose/obam-obkm-with-obbi/obam/uk/repository/deployment/server/jaggeryapps/devportal/site/public/theme/settings.js b/docker-compose/obam-obiam-with-obbi/obam/uk/repository/deployment/server/jaggeryapps/devportal/site/public/theme/settings.js similarity index 100% rename from docker-compose/obam-obkm-with-obbi/obam/uk/repository/deployment/server/jaggeryapps/devportal/site/public/theme/settings.js rename to docker-compose/obam-obiam-with-obbi/obam/uk/repository/deployment/server/jaggeryapps/devportal/site/public/theme/settings.js diff --git a/docker-compose/obam-obkm-with-obbi/obam/uk/repository/deployment/server/synapse-configs/default/api/_TokenAPI_.xml b/docker-compose/obam-obiam-with-obbi/obam/uk/repository/deployment/server/synapse-configs/default/api/_TokenAPI_.xml similarity index 100% rename from docker-compose/obam-obkm-with-obbi/obam/uk/repository/deployment/server/synapse-configs/default/api/_TokenAPI_.xml rename to docker-compose/obam-obiam-with-obbi/obam/uk/repository/deployment/server/synapse-configs/default/api/_TokenAPI_.xml diff --git a/docker-compose/obam-obkm-with-obbi/obam/uk/repository/resources/api_templates/velocity_template.xml b/docker-compose/obam-obiam-with-obbi/obam/uk/repository/resources/api_templates/velocity_template.xml similarity index 100% rename from docker-compose/obam-obkm-with-obbi/obam/uk/repository/resources/api_templates/velocity_template.xml rename to docker-compose/obam-obiam-with-obbi/obam/uk/repository/resources/api_templates/velocity_template.xml diff --git a/docker-compose/obam-obkm-with-obbi/obam/uk/repository/resources/security/client-truststore.jks b/docker-compose/obam-obiam-with-obbi/obam/uk/repository/resources/security/client-truststore.jks similarity index 100% rename from docker-compose/obam-obkm-with-obbi/obam/uk/repository/resources/security/client-truststore.jks rename to docker-compose/obam-obiam-with-obbi/obam/uk/repository/resources/security/client-truststore.jks diff --git a/docker-compose/obam-obkm-with-obbi/obam/uk/repository/resources/security/listenerprofiles.xml b/docker-compose/obam-obiam-with-obbi/obam/uk/repository/resources/security/listenerprofiles.xml similarity index 100% rename from docker-compose/obam-obkm-with-obbi/obam/uk/repository/resources/security/listenerprofiles.xml rename to docker-compose/obam-obiam-with-obbi/obam/uk/repository/resources/security/listenerprofiles.xml diff --git a/docker-compose/obam-obkm-with-obbi/obam/berlin/repository/resources/security/openbanking.jks b/docker-compose/obam-obiam-with-obbi/obam/uk/repository/resources/security/openbanking.jks similarity index 100% rename from docker-compose/obam-obkm-with-obbi/obam/berlin/repository/resources/security/openbanking.jks rename to docker-compose/obam-obiam-with-obbi/obam/uk/repository/resources/security/openbanking.jks diff --git a/docker-compose/obam-obkm-with-obbi/obam/uk/repository/resources/security/sslprofiles.xml b/docker-compose/obam-obiam-with-obbi/obam/uk/repository/resources/security/sslprofiles.xml similarity index 100% rename from docker-compose/obam-obkm-with-obbi/obam/uk/repository/resources/security/sslprofiles.xml rename to docker-compose/obam-obiam-with-obbi/obam/uk/repository/resources/security/sslprofiles.xml diff --git a/docker-compose/obam-obkm-with-obbi/obam/uk/repository/resources/security/wso2carbon.jks b/docker-compose/obam-obiam-with-obbi/obam/uk/repository/resources/security/wso2carbon.jks similarity index 100% rename from docker-compose/obam-obkm-with-obbi/obam/uk/repository/resources/security/wso2carbon.jks rename to docker-compose/obam-obiam-with-obbi/obam/uk/repository/resources/security/wso2carbon.jks diff --git a/docker-compose/obam-obkm-with-obbi/obbi/berlin/bin/dashboard.sh b/docker-compose/obam-obiam-with-obbi/obbi/berlin/bin/dashboard.sh similarity index 100% rename from docker-compose/obam-obkm-with-obbi/obbi/berlin/bin/dashboard.sh rename to docker-compose/obam-obiam-with-obbi/obbi/berlin/bin/dashboard.sh diff --git a/docker-compose/obam-obkm-with-obbi/obbi/berlin/bin/worker.sh b/docker-compose/obam-obiam-with-obbi/obbi/berlin/bin/worker.sh similarity index 100% rename from docker-compose/obam-obkm-with-obbi/obbi/berlin/bin/worker.sh rename to docker-compose/obam-obiam-with-obbi/obbi/berlin/bin/worker.sh diff --git a/docker-compose/obam-obkm-with-obbi/obbi/berlin/conf/dashboard/deployment.yaml b/docker-compose/obam-obiam-with-obbi/obbi/berlin/conf/dashboard/deployment.yaml similarity index 100% rename from docker-compose/obam-obkm-with-obbi/obbi/berlin/conf/dashboard/deployment.yaml rename to docker-compose/obam-obiam-with-obbi/obbi/berlin/conf/dashboard/deployment.yaml diff --git a/docker-compose/obam-obkm-with-obbi/obbi/berlin/conf/worker/deployment.yaml b/docker-compose/obam-obiam-with-obbi/obbi/berlin/conf/worker/deployment.yaml similarity index 100% rename from docker-compose/obam-obkm-with-obbi/obbi/berlin/conf/worker/deployment.yaml rename to docker-compose/obam-obiam-with-obbi/obbi/berlin/conf/worker/deployment.yaml diff --git a/docker-compose/obam-obkm-with-obbi/obbi/berlin/deployment/siddhi-files/FraudStatusUpdaterApp.siddhi b/docker-compose/obam-obiam-with-obbi/obbi/berlin/deployment/siddhi-files/FraudStatusUpdaterApp.siddhi similarity index 100% rename from docker-compose/obam-obkm-with-obbi/obbi/berlin/deployment/siddhi-files/FraudStatusUpdaterApp.siddhi rename to docker-compose/obam-obiam-with-obbi/obbi/berlin/deployment/siddhi-files/FraudStatusUpdaterApp.siddhi diff --git a/docker-compose/obam-obkm-with-obbi/obbi/berlin/deployment/siddhi-files/InvalidSubmissionsApp.siddhi b/docker-compose/obam-obiam-with-obbi/obbi/berlin/deployment/siddhi-files/InvalidSubmissionsApp.siddhi similarity index 100% rename from docker-compose/obam-obkm-with-obbi/obbi/berlin/deployment/siddhi-files/InvalidSubmissionsApp.siddhi rename to docker-compose/obam-obiam-with-obbi/obbi/berlin/deployment/siddhi-files/InvalidSubmissionsApp.siddhi diff --git a/docker-compose/obam-obkm-with-obbi/obbi/berlin/deployment/siddhi-files/TRAAccountValidationApp.siddhi b/docker-compose/obam-obiam-with-obbi/obbi/berlin/deployment/siddhi-files/TRAAccountValidationApp.siddhi similarity index 100% rename from docker-compose/obam-obkm-with-obbi/obbi/berlin/deployment/siddhi-files/TRAAccountValidationApp.siddhi rename to docker-compose/obam-obiam-with-obbi/obbi/berlin/deployment/siddhi-files/TRAAccountValidationApp.siddhi diff --git a/docker-compose/obam-obkm-with-obbi/obbi/berlin/deployment/siddhi-files/TRAPaymentValidationApp.siddhi b/docker-compose/obam-obiam-with-obbi/obbi/berlin/deployment/siddhi-files/TRAPaymentValidationApp.siddhi similarity index 100% rename from docker-compose/obam-obkm-with-obbi/obbi/berlin/deployment/siddhi-files/TRAPaymentValidationApp.siddhi rename to docker-compose/obam-obiam-with-obbi/obbi/berlin/deployment/siddhi-files/TRAPaymentValidationApp.siddhi diff --git a/docker-compose/obam-obkm-with-obbi/obbi/berlin/resources/security/client-truststore.jks b/docker-compose/obam-obiam-with-obbi/obbi/berlin/resources/security/client-truststore.jks similarity index 100% rename from docker-compose/obam-obkm-with-obbi/obbi/berlin/resources/security/client-truststore.jks rename to docker-compose/obam-obiam-with-obbi/obbi/berlin/resources/security/client-truststore.jks diff --git a/docker-compose/obam-obkm-with-obbi/obbi/berlin/resources/security/securevault.jks b/docker-compose/obam-obiam-with-obbi/obbi/berlin/resources/security/securevault.jks similarity index 100% rename from docker-compose/obam-obkm-with-obbi/obbi/berlin/resources/security/securevault.jks rename to docker-compose/obam-obiam-with-obbi/obbi/berlin/resources/security/securevault.jks diff --git a/docker-compose/obam-obkm-with-obbi/obbi/berlin/resources/security/wso2carbon.jks b/docker-compose/obam-obiam-with-obbi/obbi/berlin/resources/security/wso2carbon.jks similarity index 100% rename from docker-compose/obam-obkm-with-obbi/obbi/berlin/resources/security/wso2carbon.jks rename to docker-compose/obam-obiam-with-obbi/obbi/berlin/resources/security/wso2carbon.jks diff --git a/docker-compose/obam-obkm-with-obbi/obbi/berlin/wso2/worker/conf/transports/netty-transports.yml b/docker-compose/obam-obiam-with-obbi/obbi/berlin/wso2/worker/conf/transports/netty-transports.yml similarity index 100% rename from docker-compose/obam-obkm-with-obbi/obbi/berlin/wso2/worker/conf/transports/netty-transports.yml rename to docker-compose/obam-obiam-with-obbi/obbi/berlin/wso2/worker/conf/transports/netty-transports.yml diff --git a/docker-compose/obam-obkm-with-obbi/obbi/uk/bin/dashboard.sh b/docker-compose/obam-obiam-with-obbi/obbi/uk/bin/dashboard.sh similarity index 100% rename from docker-compose/obam-obkm-with-obbi/obbi/uk/bin/dashboard.sh rename to docker-compose/obam-obiam-with-obbi/obbi/uk/bin/dashboard.sh diff --git a/docker-compose/obam-obkm-with-obbi/obbi/uk/bin/worker.sh b/docker-compose/obam-obiam-with-obbi/obbi/uk/bin/worker.sh similarity index 100% rename from docker-compose/obam-obkm-with-obbi/obbi/uk/bin/worker.sh rename to docker-compose/obam-obiam-with-obbi/obbi/uk/bin/worker.sh diff --git a/docker-compose/obam-obkm-with-obbi/obbi/uk/conf/dashboard/deployment.yaml b/docker-compose/obam-obiam-with-obbi/obbi/uk/conf/dashboard/deployment.yaml similarity index 100% rename from docker-compose/obam-obkm-with-obbi/obbi/uk/conf/dashboard/deployment.yaml rename to docker-compose/obam-obiam-with-obbi/obbi/uk/conf/dashboard/deployment.yaml diff --git a/docker-compose/obam-obkm-with-obbi/obbi/uk/conf/worker/deployment.yaml b/docker-compose/obam-obiam-with-obbi/obbi/uk/conf/worker/deployment.yaml similarity index 100% rename from docker-compose/obam-obkm-with-obbi/obbi/uk/conf/worker/deployment.yaml rename to docker-compose/obam-obiam-with-obbi/obbi/uk/conf/worker/deployment.yaml diff --git a/docker-compose/obam-obkm-with-obbi/obbi/uk/deployment/siddhi-files/FraudStatusUpdaterApp.siddhi b/docker-compose/obam-obiam-with-obbi/obbi/uk/deployment/siddhi-files/FraudStatusUpdaterApp.siddhi similarity index 100% rename from docker-compose/obam-obkm-with-obbi/obbi/uk/deployment/siddhi-files/FraudStatusUpdaterApp.siddhi rename to docker-compose/obam-obiam-with-obbi/obbi/uk/deployment/siddhi-files/FraudStatusUpdaterApp.siddhi diff --git a/docker-compose/obam-obkm-with-obbi/obbi/uk/deployment/siddhi-files/InvalidSubmissionsApp.siddhi b/docker-compose/obam-obiam-with-obbi/obbi/uk/deployment/siddhi-files/InvalidSubmissionsApp.siddhi similarity index 100% rename from docker-compose/obam-obkm-with-obbi/obbi/uk/deployment/siddhi-files/InvalidSubmissionsApp.siddhi rename to docker-compose/obam-obiam-with-obbi/obbi/uk/deployment/siddhi-files/InvalidSubmissionsApp.siddhi diff --git a/docker-compose/obam-obkm-with-obbi/obbi/uk/deployment/siddhi-files/TRAAccountValidationApp.siddhi b/docker-compose/obam-obiam-with-obbi/obbi/uk/deployment/siddhi-files/TRAAccountValidationApp.siddhi similarity index 100% rename from docker-compose/obam-obkm-with-obbi/obbi/uk/deployment/siddhi-files/TRAAccountValidationApp.siddhi rename to docker-compose/obam-obiam-with-obbi/obbi/uk/deployment/siddhi-files/TRAAccountValidationApp.siddhi diff --git a/docker-compose/obam-obkm-with-obbi/obbi/uk/deployment/siddhi-files/TRAPaymentValidationApp.siddhi b/docker-compose/obam-obiam-with-obbi/obbi/uk/deployment/siddhi-files/TRAPaymentValidationApp.siddhi similarity index 100% rename from docker-compose/obam-obkm-with-obbi/obbi/uk/deployment/siddhi-files/TRAPaymentValidationApp.siddhi rename to docker-compose/obam-obiam-with-obbi/obbi/uk/deployment/siddhi-files/TRAPaymentValidationApp.siddhi diff --git a/docker-compose/obam-obkm-with-obbi/obbi/uk/resources/security/client-truststore.jks b/docker-compose/obam-obiam-with-obbi/obbi/uk/resources/security/client-truststore.jks similarity index 100% rename from docker-compose/obam-obkm-with-obbi/obbi/uk/resources/security/client-truststore.jks rename to docker-compose/obam-obiam-with-obbi/obbi/uk/resources/security/client-truststore.jks diff --git a/docker-compose/obam-obkm-with-obbi/obbi/uk/resources/security/securevault.jks b/docker-compose/obam-obiam-with-obbi/obbi/uk/resources/security/securevault.jks similarity index 100% rename from docker-compose/obam-obkm-with-obbi/obbi/uk/resources/security/securevault.jks rename to docker-compose/obam-obiam-with-obbi/obbi/uk/resources/security/securevault.jks diff --git a/docker-compose/obam-obkm-with-obbi/obbi/uk/resources/security/wso2carbon.jks b/docker-compose/obam-obiam-with-obbi/obbi/uk/resources/security/wso2carbon.jks similarity index 100% rename from docker-compose/obam-obkm-with-obbi/obbi/uk/resources/security/wso2carbon.jks rename to docker-compose/obam-obiam-with-obbi/obbi/uk/resources/security/wso2carbon.jks diff --git a/docker-compose/obam-obkm-with-obbi/obbi/uk/wso2/worker/conf/transports/netty-transports.yml b/docker-compose/obam-obiam-with-obbi/obbi/uk/wso2/worker/conf/transports/netty-transports.yml similarity index 100% rename from docker-compose/obam-obkm-with-obbi/obbi/uk/wso2/worker/conf/transports/netty-transports.yml rename to docker-compose/obam-obiam-with-obbi/obbi/uk/wso2/worker/conf/transports/netty-transports.yml diff --git a/docker-compose/obam-obkm-with-obbi/obkm/au/bin/wso2server.sh b/docker-compose/obam-obiam-with-obbi/obiam/au/bin/wso2server.sh similarity index 100% rename from docker-compose/obam-obkm-with-obbi/obkm/au/bin/wso2server.sh rename to docker-compose/obam-obiam-with-obbi/obiam/au/bin/wso2server.sh diff --git a/docker-compose/obam-with-obkm/obkm/berlin/repository/conf/axis2/axis2.xml b/docker-compose/obam-obiam-with-obbi/obiam/au/repository/conf/axis2/axis2.xml similarity index 98% rename from docker-compose/obam-with-obkm/obkm/berlin/repository/conf/axis2/axis2.xml rename to docker-compose/obam-obiam-with-obbi/obiam/au/repository/conf/axis2/axis2.xml index 654105f..24480c8 100644 --- a/docker-compose/obam-with-obkm/obkm/berlin/repository/conf/axis2/axis2.xml +++ b/docker-compose/obam-obiam-with-obbi/obiam/au/repository/conf/axis2/axis2.xml @@ -1,725 +1,725 @@ - - - - - - - - - - - - - true - true - optional - true - work/mtom - 4000 - - ${childfirstCL} - - - true - - - true - - - - false - - inmemory - - - - - - - services - - - axis2services - - - axis2modules - - - WSO2 Identity Server-5.7.0 - - - WSO2 Identity Server-5.7.0 - - - - - - - false - - - - - - false - - - true - - - - ./repository/deployment/server/synapse-configs - - - - . - - - . - - - WSO2 Carbon Server - - - - - - - ${jaxwsparam} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 9763 - - - - - - - - - - - - 9443 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - HTTP/1.1 - chunked - - true - - - HTTP/1.1 - chunked - - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - - - multicast - - - - - wso2.carbon.domain - - - - - - 45564 - - 100 - - 60 - - - - - - 127.0.0.1 - - - - - - 4000 - - - - - - - - - - - - - - - - - - 127.0.0.1 - 4000 - - - - - - - - - + + + + + + + + + + + + + true + true + optional + true + work/mtom + 4000 + + ${childfirstCL} + + + true + + + true + + + + false + + inmemory + + + + + + + services + + + axis2services + + + axis2modules + + + WSO2 Identity Server-5.7.0 + + + WSO2 Identity Server-5.7.0 + + + + + + + false + + + + + + false + + + true + + + + ./repository/deployment/server/synapse-configs + + + + . + + + . + + + WSO2 Carbon Server + + + + + + + ${jaxwsparam} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 9763 + + + + + + + + + + + + 9443 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + HTTP/1.1 + chunked + + true + + + HTTP/1.1 + chunked + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + + + multicast + + + + + wso2.carbon.domain + + + + + + 45564 + + 100 + + 60 + + + + + + 127.0.0.1 + + + + + + 4000 + + + + + + + + + + + + + + + + + + 127.0.0.1 + 4000 + + + + + + + + + diff --git a/docker-compose/obam-obkm-with-obbi/obkm/au/repository/conf/carbon.xml b/docker-compose/obam-obiam-with-obbi/obiam/au/repository/conf/carbon.xml similarity index 100% rename from docker-compose/obam-obkm-with-obbi/obkm/au/repository/conf/carbon.xml rename to docker-compose/obam-obiam-with-obbi/obiam/au/repository/conf/carbon.xml diff --git a/docker-compose/obam-obkm-with-obbi/obkm/au/repository/conf/datasources/master-datasources.xml b/docker-compose/obam-obiam-with-obbi/obiam/au/repository/conf/datasources/master-datasources.xml similarity index 100% rename from docker-compose/obam-obkm-with-obbi/obkm/au/repository/conf/datasources/master-datasources.xml rename to docker-compose/obam-obiam-with-obbi/obiam/au/repository/conf/datasources/master-datasources.xml diff --git a/docker-compose/obam-obkm-with-obbi/obkm/au/repository/conf/datasources/open-banking-datasources.xml b/docker-compose/obam-obiam-with-obbi/obiam/au/repository/conf/datasources/open-banking-datasources.xml similarity index 100% rename from docker-compose/obam-obkm-with-obbi/obkm/au/repository/conf/datasources/open-banking-datasources.xml rename to docker-compose/obam-obiam-with-obbi/obiam/au/repository/conf/datasources/open-banking-datasources.xml diff --git a/docker-compose/obam-obkm-with-obbi/obkm/au/repository/conf/finance/open-banking.xml b/docker-compose/obam-obiam-with-obbi/obiam/au/repository/conf/finance/open-banking.xml similarity index 100% rename from docker-compose/obam-obkm-with-obbi/obkm/au/repository/conf/finance/open-banking.xml rename to docker-compose/obam-obiam-with-obbi/obiam/au/repository/conf/finance/open-banking.xml diff --git a/docker-compose/obam-obkm-with-obbi/obkm/au/repository/conf/identity/application-authentication.xml b/docker-compose/obam-obiam-with-obbi/obiam/au/repository/conf/identity/application-authentication.xml similarity index 100% rename from docker-compose/obam-obkm-with-obbi/obkm/au/repository/conf/identity/application-authentication.xml rename to docker-compose/obam-obiam-with-obbi/obiam/au/repository/conf/identity/application-authentication.xml diff --git a/docker-compose/obam-obkm-with-obbi/obkm/au/repository/conf/identity/identity.xml b/docker-compose/obam-obiam-with-obbi/obiam/au/repository/conf/identity/identity.xml similarity index 100% rename from docker-compose/obam-obkm-with-obbi/obkm/au/repository/conf/identity/identity.xml rename to docker-compose/obam-obiam-with-obbi/obiam/au/repository/conf/identity/identity.xml diff --git a/docker-compose/obam-obkm-with-obbi/obkm/au/repository/conf/registry.xml b/docker-compose/obam-obiam-with-obbi/obiam/au/repository/conf/registry.xml similarity index 100% rename from docker-compose/obam-obkm-with-obbi/obkm/au/repository/conf/registry.xml rename to docker-compose/obam-obiam-with-obbi/obiam/au/repository/conf/registry.xml diff --git a/docker-compose/obam-obkm-with-obbi/obkm/au/repository/conf/tomcat/catalina-server.xml b/docker-compose/obam-obiam-with-obbi/obiam/au/repository/conf/tomcat/catalina-server.xml similarity index 100% rename from docker-compose/obam-obkm-with-obbi/obkm/au/repository/conf/tomcat/catalina-server.xml rename to docker-compose/obam-obiam-with-obbi/obiam/au/repository/conf/tomcat/catalina-server.xml diff --git a/docker-compose/obam-obkm-with-obbi/obkm/au/repository/conf/user-mgt.xml b/docker-compose/obam-obiam-with-obbi/obiam/au/repository/conf/user-mgt.xml similarity index 100% rename from docker-compose/obam-obkm-with-obbi/obkm/au/repository/conf/user-mgt.xml rename to docker-compose/obam-obiam-with-obbi/obiam/au/repository/conf/user-mgt.xml diff --git a/docker-compose/obam-obkm-with-obbi/obkm/au/repository/deployment/server/jaggeryapps/ccportal/configs/conf.json b/docker-compose/obam-obiam-with-obbi/obiam/au/repository/deployment/server/jaggeryapps/ccportal/configs/conf.json similarity index 100% rename from docker-compose/obam-obkm-with-obbi/obkm/au/repository/deployment/server/jaggeryapps/ccportal/configs/conf.json rename to docker-compose/obam-obiam-with-obbi/obiam/au/repository/deployment/server/jaggeryapps/ccportal/configs/conf.json diff --git a/docker-compose/obam-obkm-with-obbi/obkm/au/repository/deployment/server/jaggeryapps/consentmgt/configs/conf.json b/docker-compose/obam-obiam-with-obbi/obiam/au/repository/deployment/server/jaggeryapps/consentmgt/configs/conf.json similarity index 100% rename from docker-compose/obam-obkm-with-obbi/obkm/au/repository/deployment/server/jaggeryapps/consentmgt/configs/conf.json rename to docker-compose/obam-obiam-with-obbi/obiam/au/repository/deployment/server/jaggeryapps/consentmgt/configs/conf.json diff --git a/docker-compose/obam-obiam-with-obbi/obiam/au/repository/resources/security/client-truststore.jks b/docker-compose/obam-obiam-with-obbi/obiam/au/repository/resources/security/client-truststore.jks new file mode 100644 index 0000000..813afb9 Binary files /dev/null and b/docker-compose/obam-obiam-with-obbi/obiam/au/repository/resources/security/client-truststore.jks differ diff --git a/docker-compose/obam-obiam-with-obbi/obiam/au/repository/resources/security/client-truststore.jks.old b/docker-compose/obam-obiam-with-obbi/obiam/au/repository/resources/security/client-truststore.jks.old new file mode 100644 index 0000000..bf029b2 Binary files /dev/null and b/docker-compose/obam-obiam-with-obbi/obiam/au/repository/resources/security/client-truststore.jks.old differ diff --git a/docker-compose/obam-obiam-with-obbi/obiam/au/repository/resources/security/wso2carbon.jks b/docker-compose/obam-obiam-with-obbi/obiam/au/repository/resources/security/wso2carbon.jks new file mode 100644 index 0000000..f2be3fa Binary files /dev/null and b/docker-compose/obam-obiam-with-obbi/obiam/au/repository/resources/security/wso2carbon.jks differ diff --git a/docker-compose/obam-obiam-with-obbi/obiam/au/repository/resources/security/wso2carbon.jks.old b/docker-compose/obam-obiam-with-obbi/obiam/au/repository/resources/security/wso2carbon.jks.old new file mode 100644 index 0000000..d7f0ab6 Binary files /dev/null and b/docker-compose/obam-obiam-with-obbi/obiam/au/repository/resources/security/wso2carbon.jks.old differ diff --git a/docker-compose/obam-obkm-with-obbi/obkm/berlin/bin/wso2server.sh b/docker-compose/obam-obiam-with-obbi/obiam/berlin/bin/wso2server.sh similarity index 100% rename from docker-compose/obam-obkm-with-obbi/obkm/berlin/bin/wso2server.sh rename to docker-compose/obam-obiam-with-obbi/obiam/berlin/bin/wso2server.sh diff --git a/docker-compose/obam-obkm-with-obbi/obkm/berlin/repository/conf/deployment.toml b/docker-compose/obam-obiam-with-obbi/obiam/berlin/repository/conf/deployment.toml similarity index 100% rename from docker-compose/obam-obkm-with-obbi/obkm/berlin/repository/conf/deployment.toml rename to docker-compose/obam-obiam-with-obbi/obiam/berlin/repository/conf/deployment.toml diff --git a/docker-compose/obam-obkm-with-obbi/obkm/berlin/repository/deployment/server/jaggeryapps/ccportal/configs/conf.json b/docker-compose/obam-obiam-with-obbi/obiam/berlin/repository/deployment/server/jaggeryapps/ccportal/configs/conf.json similarity index 100% rename from docker-compose/obam-obkm-with-obbi/obkm/berlin/repository/deployment/server/jaggeryapps/ccportal/configs/conf.json rename to docker-compose/obam-obiam-with-obbi/obiam/berlin/repository/deployment/server/jaggeryapps/ccportal/configs/conf.json diff --git a/docker-compose/obam-obkm-with-obbi/obkm/berlin/repository/deployment/server/jaggeryapps/consentmgt/configs/conf.json b/docker-compose/obam-obiam-with-obbi/obiam/berlin/repository/deployment/server/jaggeryapps/consentmgt/configs/conf.json similarity index 100% rename from docker-compose/obam-obkm-with-obbi/obkm/berlin/repository/deployment/server/jaggeryapps/consentmgt/configs/conf.json rename to docker-compose/obam-obiam-with-obbi/obiam/berlin/repository/deployment/server/jaggeryapps/consentmgt/configs/conf.json diff --git a/docker-compose/obam-obkm-with-obbi/obkm/berlin/repository/resources/security/client-truststore.jks b/docker-compose/obam-obiam-with-obbi/obiam/berlin/repository/resources/security/client-truststore.jks similarity index 100% rename from docker-compose/obam-obkm-with-obbi/obkm/berlin/repository/resources/security/client-truststore.jks rename to docker-compose/obam-obiam-with-obbi/obiam/berlin/repository/resources/security/client-truststore.jks diff --git a/docker-compose/obam-obkm-with-obbi/obkm/berlin/repository/resources/security/wso2carbon.jks b/docker-compose/obam-obiam-with-obbi/obiam/berlin/repository/resources/security/wso2carbon.jks similarity index 100% rename from docker-compose/obam-obkm-with-obbi/obkm/berlin/repository/resources/security/wso2carbon.jks rename to docker-compose/obam-obiam-with-obbi/obiam/berlin/repository/resources/security/wso2carbon.jks diff --git a/docker-compose/obam-obkm-with-obbi/obkm/uk/bin/wso2server.sh b/docker-compose/obam-obiam-with-obbi/obiam/uk/bin/wso2server.sh similarity index 100% rename from docker-compose/obam-obkm-with-obbi/obkm/uk/bin/wso2server.sh rename to docker-compose/obam-obiam-with-obbi/obiam/uk/bin/wso2server.sh diff --git a/docker-compose/obam-obkm-with-obbi/obkm/uk/repository/conf/deployment.toml b/docker-compose/obam-obiam-with-obbi/obiam/uk/repository/conf/deployment.toml similarity index 100% rename from docker-compose/obam-obkm-with-obbi/obkm/uk/repository/conf/deployment.toml rename to docker-compose/obam-obiam-with-obbi/obiam/uk/repository/conf/deployment.toml diff --git a/docker-compose/obam-obkm-with-obbi/obkm/uk/repository/deployment/server/jaggeryapps/ccportal/configs/conf.json b/docker-compose/obam-obiam-with-obbi/obiam/uk/repository/deployment/server/jaggeryapps/ccportal/configs/conf.json similarity index 100% rename from docker-compose/obam-obkm-with-obbi/obkm/uk/repository/deployment/server/jaggeryapps/ccportal/configs/conf.json rename to docker-compose/obam-obiam-with-obbi/obiam/uk/repository/deployment/server/jaggeryapps/ccportal/configs/conf.json diff --git a/docker-compose/obam-obkm-with-obbi/obkm/uk/repository/deployment/server/jaggeryapps/consentmgt/configs/conf.json b/docker-compose/obam-obiam-with-obbi/obiam/uk/repository/deployment/server/jaggeryapps/consentmgt/configs/conf.json similarity index 100% rename from docker-compose/obam-obkm-with-obbi/obkm/uk/repository/deployment/server/jaggeryapps/consentmgt/configs/conf.json rename to docker-compose/obam-obiam-with-obbi/obiam/uk/repository/deployment/server/jaggeryapps/consentmgt/configs/conf.json diff --git a/docker-compose/obam-obkm-with-obbi/obkm/uk/repository/resources/security/client-truststore.jks b/docker-compose/obam-obiam-with-obbi/obiam/uk/repository/resources/security/client-truststore.jks similarity index 100% rename from docker-compose/obam-obkm-with-obbi/obkm/uk/repository/resources/security/client-truststore.jks rename to docker-compose/obam-obiam-with-obbi/obiam/uk/repository/resources/security/client-truststore.jks diff --git a/docker-compose/obam-obkm-with-obbi/obkm/uk/repository/resources/security/wso2carbon.jks b/docker-compose/obam-obiam-with-obbi/obiam/uk/repository/resources/security/wso2carbon.jks similarity index 100% rename from docker-compose/obam-obkm-with-obbi/obkm/uk/repository/resources/security/wso2carbon.jks rename to docker-compose/obam-obiam-with-obbi/obiam/uk/repository/resources/security/wso2carbon.jks diff --git a/docker-compose/obam-obkm-with-obbi/scripts/README.md b/docker-compose/obam-obiam-with-obbi/scripts/README.md similarity index 84% rename from docker-compose/obam-obkm-with-obbi/scripts/README.md rename to docker-compose/obam-obiam-with-obbi/scripts/README.md index 50cbfd4..135e4de 100755 --- a/docker-compose/obam-obkm-with-obbi/scripts/README.md +++ b/docker-compose/obam-obiam-with-obbi/scripts/README.md @@ -1,4 +1,4 @@ -# WSO2 Open Banking API Manager and Open Banking Key Manager with Open Banking Business Intelligence +# WSO2 Open Banking API Manager and Open Banking Identity & Access Management Module with Open Banking Business Intelligence ## Prerequisites @@ -18,13 +18,13 @@ ``` > If you are to try out an already released zip of this repo, please ignore this 1st step. -2. Switch to the `docker-compose/obam-obkm-with-obbi` folder. +2. Switch to the `docker-compose/obam-obiam-with-obbi` folder. ``` - cd docker-open-banking/docker-compose/obam-obkm-with-obbi + cd docker-open-banking/docker-compose/obam-obiam-with-obbi ``` > If you are to try out an already released zip of this repo, please ignore this 2nd step also. - Instead, extract the zip file and directly browse to `docker-open-banking-/docker-compose/obam-obkm-with-obbi` folder. + Instead, extract the zip file and directly browse to `docker-open-banking-/docker-compose/obam-obiam-with-obbi` folder. > If you want to try out an already released tag, after executing 2nd step, checkout the relevant tag, i.e. for example: git checkout tags/v1.4.0.5 and continue below steps. @@ -54,7 +54,7 @@ https://localhost:8280 ``` - WSO2 Open Banking API Manager will use WSO2 Open Banking Key Manager to generate OAuth2 tokens and validate those tokens during API invocations. You can access the WSO2 Open Banking Key Manager-Management portal using the below URL via a web browser. + WSO2 Open Banking API Manager will use WSO2 Open Banking Identity & Access Management Module to generate OAuth2 tokens and validate those tokens during API invocations. You can access the WSO2 Open Banking Identity & Access Management Module-Management portal using the below URL via a web browser. ``` https://localhost:9446/carbon diff --git a/docker-compose/obam-obkm-with-obbi/scripts/deploy.sh b/docker-compose/obam-obiam-with-obbi/scripts/deploy.sh similarity index 100% rename from docker-compose/obam-obkm-with-obbi/scripts/deploy.sh rename to docker-compose/obam-obiam-with-obbi/scripts/deploy.sh diff --git a/docker-compose/obam-obkm-with-obbi/wait-for-it.sh b/docker-compose/obam-obiam-with-obbi/wait-for-it.sh similarity index 100% rename from docker-compose/obam-obkm-with-obbi/wait-for-it.sh rename to docker-compose/obam-obiam-with-obbi/wait-for-it.sh diff --git a/docker-compose/obam-obkm-with-obbi/obam/au/repository/resources/security/client-truststore.jks b/docker-compose/obam-obkm-with-obbi/obam/au/repository/resources/security/client-truststore.jks deleted file mode 100644 index b0c6e49..0000000 Binary files a/docker-compose/obam-obkm-with-obbi/obam/au/repository/resources/security/client-truststore.jks and /dev/null differ diff --git a/docker-compose/obam-obkm-with-obbi/obam/au/repository/resources/security/client-truststore.jks.old b/docker-compose/obam-obkm-with-obbi/obam/au/repository/resources/security/client-truststore.jks.old deleted file mode 100644 index a57d08b..0000000 Binary files a/docker-compose/obam-obkm-with-obbi/obam/au/repository/resources/security/client-truststore.jks.old and /dev/null differ diff --git a/docker-compose/obam-obkm-with-obbi/obam/au/repository/resources/security/wso2carbon.jks b/docker-compose/obam-obkm-with-obbi/obam/au/repository/resources/security/wso2carbon.jks deleted file mode 100644 index b4b6220..0000000 Binary files a/docker-compose/obam-obkm-with-obbi/obam/au/repository/resources/security/wso2carbon.jks and /dev/null differ diff --git a/docker-compose/obam-obkm-with-obbi/obam/au/repository/resources/security/wso2carbon.jks.old b/docker-compose/obam-obkm-with-obbi/obam/au/repository/resources/security/wso2carbon.jks.old deleted file mode 100644 index 010e795..0000000 Binary files a/docker-compose/obam-obkm-with-obbi/obam/au/repository/resources/security/wso2carbon.jks.old and /dev/null differ diff --git a/docker-compose/obam-obkm-with-obbi/obbi/conf/dashboard/deployment.yaml b/docker-compose/obam-obkm-with-obbi/obbi/conf/dashboard/deployment.yaml deleted file mode 100644 index e70d76e..0000000 --- a/docker-compose/obam-obkm-with-obbi/obbi/conf/dashboard/deployment.yaml +++ /dev/null @@ -1,464 +0,0 @@ -################################################################################ -# Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved -# -# Licensed under the Apache License, Version 2.0 (the \"License\"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an \"AS IS\" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -################################################################################ - - # Carbon Configuration Parameters -wso2.carbon: - type: wso2-sp - # value to uniquely identify a server - id: wso2-obbi - # server name - name: WSO2 Open Banking Business Intelligence Server - # ports used by this server - ports: - # port offset - offset: 6 - -analytics.solutions: - IS-analytics.enabled: false - APIM-analytics.enabled: true - APIM-alerts.enabled: false - EI-analytics.enabled: false - wso2-is-analytics: false - - # Configuration used for the databridge communication -databridge.config: - # No of worker threads to consume events - # THIS IS A MANDATORY FIELD - workerThreads: 10 - # Maximum amount of messages that can be queued internally in MB - # THIS IS A MANDATORY FIELD - maxEventBufferCapacity: 10000000 - # Queue size; the maximum number of events that can be stored in the queue - # THIS IS A MANDATORY FIELD - eventBufferSize: 2000 - # Keystore file path - # THIS IS A MANDATORY FIELD - keyStoreLocation : ${sys:carbon.home}/resources/security/wso2carbon.jks - # Keystore password - # THIS IS A MANDATORY FIELD - keyStorePassword : wso2carbon - # Session Timeout value in mins - # THIS IS A MANDATORY FIELD - clientTimeoutMin: 30 - # Data receiver configurations - # THIS IS A MANDATORY FIELD - dataReceivers: - - - # Data receiver configuration - dataReceiver: - # Data receiver type - # THIS IS A MANDATORY FIELD - type: Thrift - # Data receiver properties - properties: - tcpPort: '7611' - sslPort: '7711' - - - - # Data receiver configuration - dataReceiver: - # Data receiver type - # THIS IS A MANDATORY FIELD - type: Binary - # Data receiver properties - properties: - tcpPort: '9611' - sslPort: '9711' - tcpReceiverThreadPoolSize: '100' - sslReceiverThreadPoolSize: '100' - hostName: 0.0.0.0 - - # Configuration of the Data Agents - to publish events through databridge -data.agent.config: - # Data agent configurations - # THIS IS A MANDATORY FIELD - agents: - - - # Data agent configuration - agentConfiguration: - # Data agent name - # THIS IS A MANDATORY FIELD - name: Thrift - # Data endpoint class - # THIS IS A MANDATORY FIELD - dataEndpointClass: org.wso2.carbon.databridge.agent.endpoint.thrift.ThriftDataEndpoint - # Data publisher strategy - publishingStrategy: async - # Trust store path - trustStorePath: '${sys:carbon.home}/resources/security/client-truststore.jks' - # Trust store password - trustStorePassword: 'wso2carbon' - # Queue Size - queueSize: 32768 - # Batch Size - batchSize: 200 - # Core pool size - corePoolSize: 1 - # Socket timeout in milliseconds - socketTimeoutMS: 30000 - # Maximum pool size - maxPoolSize: 1 - # Keep alive time in pool - keepAliveTimeInPool: 20 - # Reconnection interval - reconnectionInterval: 30 - # Max transport pool size - maxTransportPoolSize: 250 - # Max idle connections - maxIdleConnections: 250 - # Eviction time interval - evictionTimePeriod: 5500 - # Min idle time in pool - minIdleTimeInPool: 5000 - # Secure max transport pool size - secureMaxTransportPoolSize: 250 - # Secure max idle connections - secureMaxIdleConnections: 250 - # secure eviction time period - secureEvictionTimePeriod: 5500 - # Secure min idle time in pool - secureMinIdleTimeInPool: 5000 - # SSL enabled protocols - sslEnabledProtocols: TLSv1.1,TLSv1.2 - # Ciphers - ciphers: TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256,TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256,TLS_DHE_RSA_WITH_AES_128_CBC_SHA256,TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,TLS_DHE_RSA_WITH_AES_128_CBC_SHA,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_DHE_RSA_WITH_AES_128_GCM_SHA256 - - - # Data agent configuration - agentConfiguration: - # Data agent name - # THIS IS A MANDATORY FIELD - name: Binary - # Data endpoint class - # THIS IS A MANDATORY FIELD - dataEndpointClass: org.wso2.carbon.databridge.agent.endpoint.binary.BinaryDataEndpoint - # Data publisher strategy - publishingStrategy: async - # Trust store path - trustStorePath: '${sys:carbon.home}/resources/security/client-truststore.jks' - # Trust store password - trustStorePassword: 'wso2carbon' - # Queue Size - queueSize: 32768 - # Batch Size - batchSize: 200 - # Core pool size - corePoolSize: 1 - # Socket timeout in milliseconds - socketTimeoutMS: 30000 - # Maximum pool size - maxPoolSize: 1 - # Keep alive time in pool - keepAliveTimeInPool: 20 - # Reconnection interval - reconnectionInterval: 30 - # Max transport pool size - maxTransportPoolSize: 250 - # Max idle connections - maxIdleConnections: 250 - # Eviction time interval - evictionTimePeriod: 5500 - # Min idle time in pool - minIdleTimeInPool: 5000 - # Secure max transport pool size - secureMaxTransportPoolSize: 250 - # Secure max idle connections - secureMaxIdleConnections: 250 - # secure eviction time period - secureEvictionTimePeriod: 5500 - # Secure min idle time in pool - secureMinIdleTimeInPool: 5000 - # SSL enabled protocols - sslEnabledProtocols: TLSv1.1,TLSv1.2 - # Ciphers - ciphers: TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256,TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256,TLS_DHE_RSA_WITH_AES_128_CBC_SHA256,TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,TLS_DHE_RSA_WITH_AES_128_CBC_SHA,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_DHE_RSA_WITH_AES_128_GCM_SHA256 - - # Deployment configuration parameters -wso2.artifact.deployment: - # Scheduler update interval - updateInterval: 5 - - # HA Configuration -state.persistence: - enabled: false - intervalInMin: 1 - revisionsToKeep: 2 - persistenceStore: org.wso2.carbon.stream.processor.core.persistence.FileSystemPersistenceStore - config: - location: siddhi-app-persistence - - # Secure Vault Configuration -wso2.securevault: - secretRepository: - type: org.wso2.carbon.secvault.repository.DefaultSecretRepository - parameters: - privateKeyAlias: wso2carbon - keystoreLocation: ${sys:carbon.home}/resources/security/securevault.jks - secretPropertiesFile: ${sys:carbon.home}/conf/${sys:wso2.runtime}/secrets.properties - masterKeyReader: - type: org.wso2.carbon.secvault.reader.DefaultMasterKeyReader - parameters: - masterKeyReaderFile: ${sys:carbon.home}/conf/${sys:wso2.runtime}/master-keys.yaml - - -# Data Sources Configuration -wso2.datasources: - dataSources: - # Dashboard data source - - name: WSO2_DASHBOARD_DB - description: The datasource used for dashboard feature - jndiConfig: - name: jdbc/DASHBOARD_DB - useJndiReference: true - definition: - type: RDBMS - configuration: - jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/${sys:wso2.runtime}/database/DASHBOARD_DB;IFEXISTS=TRUE;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000;MVCC=TRUE' - username: wso2carbon - password: wso2carbon - driverClassName: org.h2.Driver - maxPoolSize: 20 - idleTimeout: 60000 - connectionTestQuery: SELECT 1 - # Use below for oracle database - # connectionTestQuery: SELECT 1 FROM DUAL - validationTimeout: 30000 - isAutoCommit: false - - - name: OB_REPORTING_DB - description: The datasource used to store statistics for OB Reporting module - jndiConfig: - name: jdbc/OB_REPORTING_DB - definition: - type: RDBMS - configuration: - jdbcUrl: 'jdbc:mysql://mysql:3306/openbank_ob_reporting_statsdb?autoReconnect=true&useSSL=false' - username: 'root' - password: 'root' - driverClassName: 'com.mysql.jdbc.Driver' - maxPoolSize: 20 - idleTimeout: 60000 - connectionTestQuery: SELECT 1 - # Use below for oracle database - # connectionTestQuery: SELECT 1 FROM DUAL - validationTimeout: 30000 - isAutoCommit: false - - - name: OB_REPORTING_SUMMARIZED_DB - description: The datasource used to store statistics for OB Reporting module - jndiConfig: - name: jdbc/OB_REPORTING_SUMMARIZED_DB - definition: - type: RDBMS - configuration: - jdbcUrl: 'jdbc:mysql://mysql:3306/openbank_ob_reporting_summarizeddb?autoReconnect=true&useSSL=false' - username: 'root' - password: 'root' - driverClassName: 'com.mysql.jdbc.Driver' - maxPoolSize: 20 - idleTimeout: 60000 - connectionTestQuery: SELECT 1 - # Use below for oracle database - # connectionTestQuery: SELECT 1 FROM DUAL - validationTimeout: 30000 - isAutoCommit: false - - - name: BUSINESS_RULES_DB - description: The datasource used for dashboard feature - jndiConfig: - name: jdbc/BUSINESS_RULES_DB - useJndiReference: true - definition: - type: RDBMS - configuration: - jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/${sys:wso2.runtime}/database/BUSINESS_RULES_DB;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000;MVCC=TRUE' - username: wso2carbon - password: wso2carbon - driverClassName: org.h2.Driver - maxPoolSize: 20 - idleTimeout: 60000 - connectionTestQuery: SELECT 1 - # Use below for oracle database - # connectionTestQuery: SELECT 1 FROM DUAL - validationTimeout: 30000 - isAutoCommit: false - - name: SAMPLE_DB - description: Sample datasource used for gadgets generation wizard - jndiConfig: - name: jdbc/SAMPLE_DB - useJndiReference: true - definition: - type: RDBMS - configuration: - jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/${sys:wso2.runtime}/database/SAMPLE_DB;IFEXISTS=TRUE;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000;MVCC=TRUE' - username: wso2carbon - password: wso2carbon - driverClassName: org.h2.Driver - maxPoolSize: 10 - idleTimeout: 60000 - connectionTestQuery: SELECT 1 - # Use below for oracle database - # connectionTestQuery: SELECT 1 FROM DUAL - validationTimeout: 30000 - isAutoCommit: false - - # Dashboard data source - - name: WSO2_STATUS_DASHBOARD_DB - description: The datasource used for dashboard feature - jndiConfig: - name: jdbc/wso2_status_dashboard - useJndiReference: true - definition: - type: RDBMS - configuration: - jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/${sys:wso2.runtime}/database/wso2_status_dashboard;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000;MVCC=TRUE' - username: wso2carbon - password: wso2carbon - driverClassName: org.h2.Driver - maxPoolSize: 20 - idleTimeout: 60000 - connectionTestQuery: SELECT 1 - # Use below for oracle database - # connectionTestQuery: SELECT 1 FROM DUAL - validationTimeout: 30000 - isAutoCommit: false - - # carbon metrics data source - - name: WSO2_METRICS_DB - description: The datasource used for dashboard feature - jndiConfig: - name: jdbc/WSO2MetricsDB - definition: - type: RDBMS - configuration: - jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/dashboard/database/metrics;AUTO_SERVER=TRUE' - username: wso2carbon - password: wso2carbon - driverClassName: org.h2.Driver - maxPoolSize: 20 - idleTimeout: 60000 - connectionTestQuery: SELECT 1 - # Use below for oracle database - # connectionTestQuery: SELECT 1 FROM DUAL - validationTimeout: 30000 - isAutoCommit: false - - - name: WSO2_PERMISSIONS_DB - description: The datasource used for dashboard feature - jndiConfig: - name: jdbc/PERMISSION_DB - useJndiReference: true - definition: - type: RDBMS - configuration: - jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/${sys:wso2.runtime}/database/PERMISSION_DB;IFEXISTS=TRUE;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000;MVCC=TRUE' - username: wso2carbon - password: wso2carbon - driverClassName: org.h2.Driver - maxPoolSize: 10 - idleTimeout: 60000 - connectionTestQuery: SELECT 1 - # Use below for oracle database - # connectionTestQuery: SELECT 1 FROM DUAL - validationTimeout: 30000 - isAutoCommit: false - - #Data source for APIM Analytics - - name: APIM_ANALYTICS_DB - description: Datasource used for APIM Analytics - jndiConfig: - name: jdbc/APIM_ANALYTICS_DB - definition: - type: RDBMS - configuration: - jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/worker/database/WSO2AM_STATS_DB;AUTO_SERVER=TRUE' - username: wso2carbon - password: wso2carbon - driverClassName: org.h2.Driver - maxPoolSize: 50 - idleTimeout: 60000 - connectionTestQuery: SELECT 1 - # Use below for oracle database - # connectionTestQuery: SELECT 1 FROM DUAL - validationTimeout: 30000 - isAutoCommit: false - -wso2.business.rules.manager: - datasource: BUSINESS_RULES_DB - # rule template wise configuration for deploying business rules - deployment_configs: - - - # : of the Worker node - obbi-worker:9444: - # UUIDs of rule templates that are needed to be deployed on the node - - transaction-frequency-rule - - transaction-volume-rate-rule - - transaction-amount-rule - - application-greylisted-rule - - user-blacklisted-rule - - user-greylisted-rule - - application-blacklisted-rule - - usual-day-rule - - usual-time-rule - - fraud-detector - - fraud-rate-calculator - - consecutive-consent-rejections-rule - - delivery-location-rule - # credentials for worker nodes - username: admin@wso2.com@carbon.super - password: wso2123 - -wso2.status.dashboard: - pollingInterval: 5 - metricsDatasourceName: 'WSO2_METRICS_DB' - dashboardDatasourceName: 'WSO2_STATUS_DASHBOARD_DB' - workerAccessCredentials: - username: 'admin' - password: 'admin' - -wso2.transport.http: - transportProperties: - - name: "server.bootstrap.socket.timeout" - value: 60 - - name: "client.bootstrap.socket.timeout" - value: 60 - - name: "latency.metrics.enabled" - value: true - - listenerConfigurations: - - id: "default-https" - host: "0.0.0.0" - port: 9643 - scheme: https - keyStoreFile: "${carbon.home}/resources/security/wso2carbon.jks" - keyStorePassword: wso2carbon - certPass: wso2carbon - -auth.configs: - type: 'local' - userManager: - adminRole: admin - userStore: - users: - - - user: - username: admin@wso2.com - password: d3NvMjEyMw== - roles: 1 - roles: - - - role: - id: 1 - displayName: admin diff --git a/docker-compose/obam-obkm-with-obbi/obbi/conf/worker/deployment.yaml b/docker-compose/obam-obkm-with-obbi/obbi/conf/worker/deployment.yaml deleted file mode 100644 index ad7a61a..0000000 --- a/docker-compose/obam-obkm-with-obbi/obbi/conf/worker/deployment.yaml +++ /dev/null @@ -1,604 +0,0 @@ -################################################################################ -# Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved -# -# Licensed under the Apache License, Version 2.0 (the \"License\"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an \"AS IS\" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -################################################################################ - - # Carbon Configuration Parameters -wso2.carbon: - type: wso2-sp - # value to uniquely identify a server - id: wso2-obbi - # server name - name: WSO2 Open Banking Business Intelligence Server - # ports used by this server - ports: - # port offset - offset: 1 - -analytics.solutions: - IS-analytics.enabled: false - APIM-analytics.enabled: true - EI-analytics.enabled: false - -wso2.transport.http: - transportProperties: - - - name: "server.bootstrap.socket.timeout" - value: 60 - - - name: "client.bootstrap.socket.timeout" - value: 60 - - - name: "latency.metrics.enabled" - value: true - - listenerConfigurations: - - - id: "default" - host: "0.0.0.0" - port: 9091 - - - id: "msf4j-https" - host: "0.0.0.0" - port: 9444 - scheme: https - keyStoreFile: "${carbon.home}/resources/security/wso2carbon.jks" - keyStorePassword: wso2carbon - certPass: wso2carbon - - senderConfigurations: - - - id: "http-sender" - -siddhi.stores.query.api: - transportProperties: - - - name: "server.bootstrap.socket.timeout" - value: 60 - - - name: "client.bootstrap.socket.timeout" - value: 60 - - - name: "latency.metrics.enabled" - value: true - - listenerConfigurations: - - - id: "default" - host: "0.0.0.0" - port: 7071 - - - id: "msf4j-https" - host: "0.0.0.0" - port: 7444 - scheme: https - keyStoreFile: "${carbon.home}/resources/security/wso2carbon.jks" - keyStorePassword: wso2carbon - certPass: wso2carbon - - # Configuration used for the databridge communication -databridge.config: - # No of worker threads to consume events - # THIS IS A MANDATORY FIELD - workerThreads: 10 - # Maximum amount of messages that can be queued internally in MB - # THIS IS A MANDATORY FIELD - maxEventBufferCapacity: 10000000 - # Queue size; the maximum number of events that can be stored in the queue - # THIS IS A MANDATORY FIELD - eventBufferSize: 2000 - # Keystore file path - # THIS IS A MANDATORY FIELD - keyStoreLocation : ${sys:carbon.home}/resources/security/wso2carbon.jks - # Keystore password - # THIS IS A MANDATORY FIELD - keyStorePassword : wso2carbon - # Session Timeout value in mins - # THIS IS A MANDATORY FIELD - clientTimeoutMin: 30 - # Data receiver configurations - # THIS IS A MANDATORY FIELD - dataReceivers: - - - # Data receiver configuration - dataReceiver: - # Data receiver type - # THIS IS A MANDATORY FIELD - type: Thrift - # Data receiver properties - properties: - tcpPort: '7611' - sslPort: '7711' - - - - # Data receiver configuration - dataReceiver: - # Data receiver type - # THIS IS A MANDATORY FIELD - type: Binary - # Data receiver properties - properties: - tcpPort: '9611' - sslPort: '9711' - tcpReceiverThreadPoolSize: '100' - sslReceiverThreadPoolSize: '100' - hostName: 0.0.0.0 - - # Configuration of the Data Agents - to publish events through databridge -data.agent.config: - # Data agent configurations - # THIS IS A MANDATORY FIELD - agents: - - - # Data agent configuration - agentConfiguration: - # Data agent name - # THIS IS A MANDATORY FIELD - name: Thrift - # Data endpoint class - # THIS IS A MANDATORY FIELD - dataEndpointClass: org.wso2.carbon.databridge.agent.endpoint.thrift.ThriftDataEndpoint - # Data publisher strategy - publishingStrategy: async - # Trust store path - trustStorePath: '${sys:carbon.home}/resources/security/client-truststore.jks' - # Trust store password - trustStorePassword: 'wso2carbon' - # Queue Size - queueSize: 32768 - # Batch Size - batchSize: 200 - # Core pool size - corePoolSize: 1 - # Socket timeout in milliseconds - socketTimeoutMS: 30000 - # Maximum pool size - maxPoolSize: 1 - # Keep alive time in pool - keepAliveTimeInPool: 20 - # Reconnection interval - reconnectionInterval: 30 - # Max transport pool size - maxTransportPoolSize: 250 - # Max idle connections - maxIdleConnections: 250 - # Eviction time interval - evictionTimePeriod: 5500 - # Min idle time in pool - minIdleTimeInPool: 5000 - # Secure max transport pool size - secureMaxTransportPoolSize: 250 - # Secure max idle connections - secureMaxIdleConnections: 250 - # secure eviction time period - secureEvictionTimePeriod: 5500 - # Secure min idle time in pool - secureMinIdleTimeInPool: 5000 - # SSL enabled protocols - sslEnabledProtocols: TLSv1.1,TLSv1.2 - # Ciphers - ciphers: TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256,TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256,TLS_DHE_RSA_WITH_AES_128_CBC_SHA256,TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,TLS_DHE_RSA_WITH_AES_128_CBC_SHA,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_DHE_RSA_WITH_AES_128_GCM_SHA256 - - - # Data agent configuration - agentConfiguration: - # Data agent name - # THIS IS A MANDATORY FIELD - name: Binary - # Data endpoint class - # THIS IS A MANDATORY FIELD - dataEndpointClass: org.wso2.carbon.databridge.agent.endpoint.binary.BinaryDataEndpoint - # Data publisher strategy - publishingStrategy: async - # Trust store path - trustStorePath: '${sys:carbon.home}/resources/security/client-truststore.jks' - # Trust store password - trustStorePassword: 'wso2carbon' - # Queue Size - queueSize: 32768 - # Batch Size - batchSize: 200 - # Core pool size - corePoolSize: 1 - # Socket timeout in milliseconds - socketTimeoutMS: 30000 - # Maximum pool size - maxPoolSize: 1 - # Keep alive time in pool - keepAliveTimeInPool: 20 - # Reconnection interval - reconnectionInterval: 30 - # Max transport pool size - maxTransportPoolSize: 250 - # Max idle connections - maxIdleConnections: 250 - # Eviction time interval - evictionTimePeriod: 5500 - # Min idle time in pool - minIdleTimeInPool: 5000 - # Secure max transport pool size - secureMaxTransportPoolSize: 250 - # Secure max idle connections - secureMaxIdleConnections: 250 - # secure eviction time period - secureEvictionTimePeriod: 5500 - # Secure min idle time in pool - secureMinIdleTimeInPool: 5000 - # SSL enabled protocols - sslEnabledProtocols: TLSv1.1,TLSv1.2 - # Ciphers - ciphers: TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256,TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256,TLS_DHE_RSA_WITH_AES_128_CBC_SHA256,TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,TLS_DHE_RSA_WITH_AES_128_CBC_SHA,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_DHE_RSA_WITH_AES_128_GCM_SHA256 - -# This is the main configuration for metrics -wso2.metrics: - # Enable Metrics - enabled: false - reporting: - console: - - # The name for the Console Reporter - name: Console - - # Enable Console Reporter - enabled: false - - # Polling Period in seconds. - # This is the period for polling metrics from the metric registry and printing in the console - pollingPeriod: 5 - -wso2.metrics.jdbc: - # Data Source Configurations for JDBC Reporters - dataSource: - # Default Data Source Configuration - - &JDBC01 - # JNDI name of the data source to be used by the JDBC Reporter. - # This data source should be defined in a *-datasources.xml file in conf/datasources directory. - dataSourceName: java:comp/env/jdbc/WSO2MetricsDB - # Schedule regular deletion of metrics data older than a set number of days. - # It is recommended that you enable this job to ensure your metrics tables do not get extremely large. - # Deleting data older than seven days should be sufficient. - scheduledCleanup: - # Enable scheduled cleanup to delete Metrics data in the database. - enabled: true - - # The scheduled job will cleanup all data older than the specified days - daysToKeep: 3 - - # This is the period for each cleanup operation in seconds. - scheduledCleanupPeriod: 86400 - - # The JDBC Reporter is in the Metrics JDBC Core feature - reporting: - # The JDBC Reporter configurations will be ignored if the Metrics JDBC Core feature is not available in runtime - jdbc: - - # The name for the JDBC Reporter - name: JDBC - - # Enable JDBC Reporter - enabled: true - - # Source of Metrics, which will be used to identify each metric in database --> - # Commented to use the hostname by default - # source: Carbon - - # Alias referring to the Data Source configuration - dataSource: *JDBC01 - - # Polling Period in seconds. - # This is the period for polling metrics from the metric registry and updating the database with the values - pollingPeriod: 60 - - # Deployment configuration parameters -wso2.artifact.deployment: - # Scheduler update interval - updateInterval: 5 - - # Periodic Persistence Configuration -state.persistence: - enabled: false - intervalInMin: 1 - revisionsToKeep: 2 - persistenceStore: org.wso2.carbon.stream.processor.core.persistence.FileSystemPersistenceStore - config: - location: siddhi-app-persistence - - # Secure Vault Configuration -wso2.securevault: - secretRepository: - type: org.wso2.carbon.secvault.repository.DefaultSecretRepository - parameters: - privateKeyAlias: wso2carbon - keystoreLocation: ${sys:carbon.home}/resources/security/securevault.jks - secretPropertiesFile: ${sys:carbon.home}/conf/${sys:wso2.runtime}/secrets.properties - masterKeyReader: - type: org.wso2.carbon.secvault.reader.DefaultMasterKeyReader - parameters: - masterKeyReaderFile: ${sys:carbon.home}/conf/${sys:wso2.runtime}/master-keys.yaml - - # Datasource Configurations -wso2.datasources: - dataSources: - - - definition: - configuration: - connectionTestQuery: "SELECT 1" - driverClassName: org.h2.Driver - idleTimeout: 60000 - isAutoCommit: false - jdbcUrl: "jdbc:h2:${sys:carbon.home}/wso2/${sys:wso2.runtime}/database/WSO2_CARBON_DB;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000" - maxPoolSize: 10 - password: wso2carbon - username: wso2carbon - validationTimeout: 30000 - type: RDBMS - description: "The datasource used for registry and user manager" - name: WSO2_CARBON_DB - - # carbon metrics data source - - name: WSO2_METRICS_DB - description: The datasource used for dashboard feature - jndiConfig: - name: jdbc/WSO2MetricsDB - definition: - type: RDBMS - configuration: - jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/dashboard/database/metrics;AUTO_SERVER=TRUE' - username: wso2carbon - password: wso2carbon - driverClassName: org.h2.Driver - maxPoolSize: 30 - idleTimeout: 60000 - connectionTestQuery: SELECT 1 - # Use below for oracle database - # connectionTestQuery: SELECT 1 FROM DUAL - validationTimeout: 30000 - isAutoCommit: false - - - name: WSO2_PERMISSIONS_DB - description: The datasource used for permission feature - jndiConfig: - name: jdbc/PERMISSION_DB - useJndiReference: true - definition: - type: RDBMS - configuration: - jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/${sys:wso2.runtime}/database/PERMISSION_DB;IFEXISTS=TRUE;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000;MVCC=TRUE' - username: wso2carbon - password: wso2carbon - driverClassName: org.h2.Driver - maxPoolSize: 10 - idleTimeout: 60000 - connectionTestQuery: SELECT 1 - # Use below for oracle database - # connectionTestQuery: SELECT 1 FROM DUAL - validationTimeout: 30000 - isAutoCommit: false - - - name: Message_Tracing_DB - description: "The datasource used for message tracer to store span information." - jndiConfig: - name: jdbc/Message_Tracing_DB - definition: - type: RDBMS - configuration: - jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/dashboard/database/MESSAGE_TRACING_DB;AUTO_SERVER=TRUE' - username: wso2carbon - password: wso2carbon - driverClassName: org.h2.Driver - maxPoolSize: 30 - idleTimeout: 60000 - connectionTestQuery: SELECT 1 - # Use below for oracle database - # connectionTestQuery: SELECT 1 FROM DUAL - validationTimeout: 30000 - isAutoCommit: false - - - name: GEO_LOCATION_DATA - description: "The data source used for geo location database" - jndiConfig: - name: jdbc/GEO_LOCATION_DATA - definition: - type: RDBMS - configuration: - jdbcUrl: 'jdbc:mysql://mysql:3306/openbank_geolocationdb?autoReconnect=true&useSSL=false' - username: 'root' - password: 'root' - driverClassName: 'com.mysql.jdbc.Driver' - maxPoolSize: 50 - idleTimeout: 60000 - connectionTestQuery: SELECT 1 - # Use below for oracle database - # connectionTestQuery: SELECT 1 FROM DUAL - validationTimeout: 30000 - isAutoCommit: false - - - name: APIM_ANALYTICS_DB - description: "The datasource used for APIM statistics aggregated data." - jndiConfig: - name: jdbc/APIM_ANALYTICS_DB - definition: - type: RDBMS - configuration: - jdbcUrl: 'jdbc:mysql://mysql:3306/openbank_apimgt_statsdb?autoReconnect=true&useSSL=false' - username: 'root' - password: 'root' - driverClassName: 'com.mysql.jdbc.Driver' - maxPoolSize: 50 - idleTimeout: 60000 - connectionTestQuery: SELECT 1 - # Use below for oracle database - # connectionTestQuery: SELECT 1 FROM DUAL - validationTimeout: 30000 - isAutoCommit: false - - - name: WSO2AM_MGW_ANALYTICS_DB - description: "The datasource used for APIM MGW analytics data." - jndiConfig: - name: jdbc/WSO2AM_MGW_ANALYTICS_DB - definition: - type: RDBMS - configuration: - jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/worker/database/WSO2AM_MGW_ANALYTICS_DB;AUTO_SERVER=TRUE' - username: wso2carbon - password: wso2carbon - driverClassName: org.h2.Driver - maxPoolSize: 50 - idleTimeout: 60000 - connectionTestQuery: SELECT 1 - # Use below for oracle database - # connectionTestQuery: SELECT 1 FROM DUAL - validationTimeout: 30000 - isAutoCommit: false - - - name: OPEN_BANKING_DB - description: "The datasource used to store payment consents" - jndiConfig: - name: jdbc/OPEN_BANKING_DB - definition: - type: RDBMS - configuration: - jdbcUrl: 'jdbc:mysql://mysql:3306/openbank_openbankingdb?autoReconnect=true&useSSL=false' - username: 'root' - password: 'root' - driverClassName: 'com.mysql.jdbc.Driver' - maxPoolSize: 50 - idleTimeout: 60000 - connectionTestQuery: SELECT 1 - # Use below for oracle database - # connectionTestQuery: SELECT 1 FROM DUAL - validationTimeout: 30000 - isAutoCommit: false - - - name: OB_REPORTING_DB - description: The datasource used to store statistics for OB Reporting module - jndiConfig: - name: jdbc/OB_REPORTING_DB - definition: - type: RDBMS - configuration: - jdbcUrl: 'jdbc:mysql://mysql:3306/openbank_ob_reporting_statsdb?autoReconnect=true&useSSL=false' - username: 'root' - password: 'root' - driverClassName: 'com.mysql.jdbc.Driver' - maxPoolSize: 20 - idleTimeout: 60000 - connectionTestQuery: SELECT 1 - # Use below for oracle database - # connectionTestQuery: SELECT 1 FROM DUAL - validationTimeout: 30000 - isAutoCommit: false - - - name: OB_REPORTING_SUMMARIZED_DB - description: The datasource used to store statistics for OB Reporting module - jndiConfig: - name: jdbc/OB_REPORTING_SUMMARIZED_DB - definition: - type: RDBMS - configuration: - jdbcUrl: 'jdbc:mysql://mysql:3306/openbank_ob_reporting_summarizeddb?autoReconnect=true&useSSL=false' - username: 'root' - password: 'root' - driverClassName: 'com.mysql.jdbc.Driver' - maxPoolSize: 20 - idleTimeout: 60000 - connectionTestQuery: SELECT 1 - # Use below for oracle database - # connectionTestQuery: SELECT 1 FROM DUAL - validationTimeout: 30000 - isAutoCommit: false - -siddhi: - extensions: - - - extension: - name: 'findCountryFromIP' - namespace: 'geo' - properties: - geoLocationResolverClass: org.wso2.extension.siddhi.execution.geo.internal.impl.DefaultDBBasedGeoLocationResolver - isCacheEnabled: true - cacheSize: 10000 - isPersistInDatabase: true - datasource: GEO_LOCATION_DATA - - - extension: - name: 'findCityFromIP' - namespace: 'geo' - properties: - geoLocationResolverClass: org.wso2.extension.siddhi.execution.geo.internal.impl.DefaultDBBasedGeoLocationResolver - isCacheEnabled: true - cacheSize: 10000 - isPersistInDatabase: true - datasource: GEO_LOCATION_DATA - - # Cluster Configuration -cluster.config: - enabled: false - groupId: sp - coordinationStrategyClass: org.wso2.carbon.cluster.coordinator.rdbms.RDBMSCoordinationStrategy - strategyConfig: - datasource: WSO2_CARBON_DB - heartbeatInterval: 1000 - heartbeatMaxRetry: 2 - eventPollingInterval: 1000 - -auth.configs: - type: 'local' - userManager: - adminRole: admin - userStore: - users: - - - user: - username: admin@wso2.com@carbon.super - password: d3NvMjEyMw== - roles: 1 - roles: - - - role: - id: 1 - displayName: admin - - # Sample of deployment.config for Two node HA -#deployment.config: -# type: ha -# eventSyncServer: -# host: localhost -# port: 9893 -# advertisedHost: localhost -# advertisedPort: 9893 -# bossThreads: 10 -# workerThreads: 10 -# eventSyncClientPool: -# maxActive: 10 -# maxTotal: 10 -# maxIdle: 10 -# maxWait: 60000 -# minEvictableIdleTimeMillis: 120000 - - # Sample of deployment.config for Distributed deployment -#deployment.config: -# type: distributed -# httpsInterface: -# host: 192.168.1.3 -# port: 9443 -# username: admin -# password: admin -# leaderRetryInterval: 10000 -# resourceManagers: -# - host: 192.168.1.1 -# port: 9543 -# username: admin -# password: admin -# - host: 192.168.1.2 -# port: 9543 -# username: admin -# password: admin diff --git a/docker-compose/obam-obkm-with-obbi/obbi/deployment/siddhi-files/CDSInvocationMetricsApp.siddhi b/docker-compose/obam-obkm-with-obbi/obbi/deployment/siddhi-files/CDSInvocationMetricsApp.siddhi deleted file mode 100644 index 48e8bcf..0000000 --- a/docker-compose/obam-obkm-with-obbi/obbi/deployment/siddhi-files/CDSInvocationMetricsApp.siddhi +++ /dev/null @@ -1,121 +0,0 @@ -/** -* Copyright (c) 2020, WSO2 Inc. (http://www.wso2.com). All Rights Reserved. -* -* This software is the property of WSO2 Inc. and its suppliers, if any. -* Dissemination of any information or reproduction of any material contained -* herein is strictly forbidden, unless permitted by WSO2 in accordance with -* the WSO2 Commercial License available at http://wso2.com/licenses. For specific -* language governing the permissions and limitations under this license, -* please see the license as well as any agreement you've entered into with -* WSO2 governing the purchase of this software and any associated services. -**/ - -@App:name('CDSInvocationMetricsApp') -@App:description('Aggregate API invocation data to be used by CDS Metrics API') - -@primaryKey('USER_ID', 'CONSENT_ID', 'ACCOUNT_ID') -@store(type='rdbms', datasource='OPEN_BANKING_DB') -define table UK_ACCOUNT_CONSENT_BINDING(USER_ID string,CONSENT_ID string,ACCOUNT_ID string,TIMESTAMP long,COLLECTION_METHOD string); - -@source(type='inMemory', topic='apiInvocationRawData', @map(type='passThrough')) -define stream CDSMetricsRawStream(id string, statusCode int, respTime long, electedResource string, timestamp long); - -@primaryKey('TIMESTAMP') -@store(type='rdbms', datasource='OB_REPORTING_DB') -define table CDS_METRICS_TPS(TIMESTAMP long, MAX_TPS long); - -define stream CDSMetricsPreprocessedStream(id string, statusCode int, respTime long, priorityTier string, timestamp long); - -define stream PerformanceMetricsStream(withinThreshold bool, totalReqCount long); - -define function getPriorityTier[JavaScript] return string { - var priorityTier; - var electedResource = data[0]; - var unauthenticatedList = ["/banking/products", "/banking/products/{productId}"]; - var highPriorityList = ["/banking/accounts", "/discovery/status", "/discovery/outages", "/common/customer", "/common/customer/detail"]; - var lowPriorityList = ["/banking/accounts/{accountId}", "/banking/accounts/{accountId}/balance", "/banking/accounts/balances", "/banking/accounts/{accountId}/transactions", - "/banking/accounts/{accountId}/transactions/{transactionId}", "/banking/payees", "/banking/payees/{payeeId}", "/banking/accounts/{accountId}/direct-debits", - "/banking/accounts/{accountId}/payments/scheduled", "/banking/payments/scheduled"]; - var unattendedList = [ "/admin/register/metadata", "/admin/metrics"]; - var largePayloadList = ["/banking/accounts/direct-debits"]; - - if (lowPriorityList.indexOf(electedResource) > -1) { - priorityTier = "LowPriority"; - } else if (highPriorityList.indexOf(electedResource) > -1) { - priorityTier = "HighPriority"; - } else if (unauthenticatedList.indexOf(electedResource) > -1) { - priorityTier = "Unauthenticated"; - } else if (unattendedList.indexOf(electedResource) > -1) { - priorityTier = "Unattended"; - } else if (largePayloadList.indexOf(electedResource) > -1) { - priorityTier = "LargePayload"; - } else { - priorityTier = "Uncategorized"; - } - - return priorityTier; -}; - -define function getIsWithinThreshold[JavaScript] return bool { - var priorityTier = data[0]; - var respTime = data[1]; - var nominatedRespTime; - var withinThreshold; - - if ('LowPriority' == priorityTier) { - nominatedRespTime = 1500; - } else if ('HighPriority' == priorityTier) { - nominatedRespTime = 1000; - } else if ('Unauthenticated' == priorityTier) { - nominatedRespTime = 1500; - } else if ('Unattended' == priorityTier) { - nominatedRespTime = 4000; - } else if ('LargePayload' == priorityTier) { - nominatedRespTime = 6000; - } else { - nominatedRespTime = 0; - } - - return respTime < nominatedRespTime; -}; - -@store(type='rdbms', datasource='OB_REPORTING_DB') -@purge(enable='true', interval='60 min', @retentionPeriod(sec='10 days', min='10 days', hours='90 days', days='1 year', months='2 years')) -define aggregation CDSMetricsAgg -from CDSMetricsPreprocessedStream -select id as ID, priorityTier, sum(respTime) as totalRespTime, count() as totalReqCount -group by priorityTier -aggregate every seconds...month; - -@store(type='rdbms', datasource='OB_REPORTING_DB') -@purge(enable='true', interval='60 min', @retentionPeriod(sec='10 days', min='10 days', hours='90 days', days='1 year', months='2 years')) -define aggregation CDSMetricsStatusAgg -from CDSMetricsPreprocessedStream -select id as ID, statusCode, count() as totalReqCount -group by statusCode -aggregate every seconds...month; - -@store(type='rdbms', datasource='OB_REPORTING_DB') -@purge(enable='true', interval='60 min', @retentionPeriod(sec='10 days', min='10 days', hours='90 days', days='1 year', months='2 years')) -define aggregation CDSMetricsPerfAgg -from PerformanceMetricsStream -select withinThreshold, count() as totalReqCount -group by withinThreshold -aggregate every seconds...month; - -from CDSMetricsRawStream -select id, statusCode, respTime, getPriorityTier(electedResource) as priorityTier, timestamp -insert into CDSMetricsPreprocessedStream; - -from CDSMetricsPreprocessedStream -select getIsWithinThreshold(priorityTier, respTime) as withinThreshold, count() as totalReqCount -insert into PerformanceMetricsStream; - -from CDSMetricsPreprocessedStream -select id, timestamp, count() as tpsCount -group by timestamp -insert into CDSMetricsTpsStream; - -from CDSMetricsTpsStream#window.timeBatch(1 day) -select time:timestampInMilliseconds()/1000 as TIMESTAMP, max(tpsCount) as MAX_TPS -insert into CDS_METRICS_TPS; diff --git a/docker-compose/obam-obkm-with-obbi/obbi/deployment/siddhi-files/CDSSessionMetricsApp.siddhi b/docker-compose/obam-obkm-with-obbi/obbi/deployment/siddhi-files/CDSSessionMetricsApp.siddhi deleted file mode 100644 index 96023d0..0000000 --- a/docker-compose/obam-obkm-with-obbi/obbi/deployment/siddhi-files/CDSSessionMetricsApp.siddhi +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (c) 2020, WSO2 Inc. (http://www.wso2.com). All Rights Reserved. - * - * This software is the property of WSO2 Inc. and its suppliers, if any. - * Dissemination of any information or reproduction of any material contained - * herein is strictly forbidden, unless permitted by WSO2 in accordance with - * the WSO2 Commercial License available at http://wso2.com/licenses. - * For specific language governing the permissions and limitations under this - * license, please see the license as well as any agreement you’ve entered into - * with WSO2 governing the purchase of this software and any associated services. - */ - -@App:name("CDSSessionMetricsApp") -@App:description('Aggregate access token data to be used by CDS Metrics API') - -@source(type='wso2event', @map(type='wso2event')) -define stream AccessTokenInputStream(ACCESS_TOKEN string); - -@store(type='rdbms', datasource='OB_REPORTING_DB') -@purge(enable='true', interval='60 min', @retentionPeriod(sec='10 days', min='10 days', hours='90 days', days='1 year', months='2 years')) -define aggregation CDSMetricsSessionAgg -from AccessTokenInputStream -select count() as sessionCount -aggregate every seconds...month; - -@primaryKey('ACCESS_TOKEN') -@store(type='rdbms', datasource='OB_REPORTING_DB') -define table ACCESS_TOKEN_RAW_DATA(ACCESS_TOKEN string, TIMESTAMP long); - -from AccessTokenInputStream -select ACCESS_TOKEN, time:timestampInMilliseconds()/1000 as TIMESTAMP -insert into ACCESS_TOKEN_RAW_DATA; - - - diff --git a/docker-compose/obam-obkm-with-obbi/obbi/deployment/siddhi-files/TRAAccountValidationApp.siddhi b/docker-compose/obam-obkm-with-obbi/obbi/deployment/siddhi-files/TRAAccountValidationApp.siddhi deleted file mode 100644 index 55b820b..0000000 --- a/docker-compose/obam-obkm-with-obbi/obbi/deployment/siddhi-files/TRAAccountValidationApp.siddhi +++ /dev/null @@ -1,148 +0,0 @@ -/** - * Copyright (c) 2019, WSO2 Inc. (http://www.wso2.com). All Rights Reserved. - * - * This software is the property of WSO2 Inc. and its suppliers, if any. - * Dissemination of any information or reproduction of any material contained - * herein is strictly forbidden, unless permitted by WSO2 in accordance with - * the WSO2 Commercial License available at http://wso2.com/licenses. For specific - * language governing the permissions and limitations under this license, - * please see the license as well as any agreement you've entered into with - * WSO2 governing the purchase of this software and any associated services. - **/ -@App:name("TRAAccountValidationApp") - -@App:description('Receive events via HTTP transport and view the output on the console') - -@Source(type = 'http-request', - source.id='source', - receiver.url='http://obbi-worker:8007/TRAAccountValidationApp/TRAValidationStream', - basic.auth.enabled='false', - @map(type = 'json',@attributes(MESSAGE_ID='trp:messageId',TPP_ID='$.event.userId',CONSENT_ID='$.event.consentId', - TIMESTAMP='$.event.timestamp', TYPE='$.event.type', DEPLOYED_SPEC='$.event.DeployedSpec', - LAST_SCA_TIME_LIMIT='$.event.TimePeriodOfLastSCAApplied'))) -define stream TRAValidationStream (MESSAGE_ID string, TPP_ID string, CONSENT_ID string, TIMESTAMP long, TYPE string, - DEPLOYED_SPEC string, LAST_SCA_TIME_LIMIT int); - -@sink(type = 'inMemory', topic = 'traAccountData',@map(type = 'passThrough')) -define stream TRAAccountDataStream (TPP_ID string, MESSAGE_ID string, CONSENT_ID string, CLIENT_ID string, -CURRENT_TIMESTAMP long, TYPE string, TRA_APPLICABLE bool, LAST_SCA_TIME_LIMIT int); ---messageId string, - -@primaryKey('ID','TIMESTAMP') -@store(type='rdbms', datasource='OB_REPORTING_DB') -define table ACCOUNTS_RAW_DATA(ID string,CONSENT_ID string,USER_ID string,TPP_ID string,CLIENT_ID string,ACCOUNT_ID string, - RE_AUTHORISATION bool,TIMESTAMP long,TRA_DECISION bool,EXEMPTION string,IS_FRAUD bool); - -@primaryKey('ID') -@store(type='rdbms', datasource='OPEN_BANKING_DB') -define table UK_ACCOUNT_INITIATION(ID string,REQUEST string,CREATED_TIMESTAMP string,STATUS string,CLIENT_ID string, - STATUS_UPDATED_TIMESTAMP string,SPEC_VERSION string); - -@primaryKey('CONSENT_ID') -@store(type='rdbms', datasource='OPEN_BANKING_DB') -define table BG_ACCOUNT_BINDING(CONSENT_ID string,ACCOUNT_CONSENT string,RECURRING_INDICATOR bool, - COMBINED_SERVICE_INDICATOR bool,ACCOUNT_PERMISSIONS string); - -define function getArrayLength[JavaScript] return int { - var jsonArray = JSON.parse(data[0]); - return jsonArray.length;; -}; - -from TRAValidationStream [DEPLOYED_SPEC == "UK"] -select * -insert into UkAccountConfigDataStream; - -from UK_ACCOUNT_INITIATION as a - join UkAccountConfigDataStream as v - on a.ID == v.CONSENT_ID -select v.TPP_ID, v.MESSAGE_ID, v.CONSENT_ID, v.TIMESTAMP, a.REQUEST, v.TYPE, v.DEPLOYED_SPEC, v.LAST_SCA_TIME_LIMIT -insert into UkAccountDataStream; - -from UkAccountDataStream -select TPP_ID, MESSAGE_ID, CONSENT_ID, TIMESTAMP, json:getString(REQUEST,'$.accountData.permissions') as PERMISSION_LIST, - json:getString(REQUEST, '$.accountData.transactionFromDateTime') as TRANSACTION_FROM_DATE_TIME, - json:getString(REQUEST, '$.accountData.expirationDateTime') as EXPIRATION_DATE_TIME, TYPE, - LAST_SCA_TIME_LIMIT -insert into UkAccountPermissionDataStream; - -from UkAccountPermissionDataStream -select TPP_ID, MESSAGE_ID, CONSENT_ID, TIMESTAMP, PERMISSION_LIST, getArrayLength(PERMISSION_LIST) as size, - TRANSACTION_FROM_DATE_TIME, EXPIRATION_DATE_TIME, TYPE, LAST_SCA_TIME_LIMIT -insert into UkAccountDataWithElementCountStream; - -from UkAccountDataWithElementCountStream [size == 1] -select TPP_ID, MESSAGE_ID, CONSENT_ID, TIMESTAMP, ifThenElse(str:contains(PERMISSION_LIST,"READBALANCES"), true, false) - as TRA_APPLICABLE, TRANSACTION_FROM_DATE_TIME, EXPIRATION_DATE_TIME, TYPE, LAST_SCA_TIME_LIMIT -insert into UkAccountValidationStream; - -from UkAccountDataWithElementCountStream [size<=5] -select TPP_ID, MESSAGE_ID, CONSENT_ID, TIMESTAMP, ifThenElse( - ( - str:contains(PERMISSION_LIST,"READACCOUNTSBASIC") or - str:contains(PERMISSION_LIST,"READACCOUNTSDETAIL") or - str:contains(PERMISSION_LIST,"READBENEFICIARIESDETAIL") or - str:contains(PERMISSION_LIST,"READBENEFICIARIESBASIC") or - str:contains(PERMISSION_LIST,"READDIRECTDEBITS") or - str:contains(PERMISSION_LIST,"READOFFERS") or - str:contains(PERMISSION_LIST,"READPAN") or - str:contains(PERMISSION_LIST,"READPARTY") or - str:contains(PERMISSION_LIST,"READPARTYPSU") or - str:contains(PERMISSION_LIST,"READPRODUCTS") or - str:contains(PERMISSION_LIST,"READSCHEDULEDPAYMENTSBASIC") or - str:contains(PERMISSION_LIST,"READSCHEDULEDPAYMENTSDETAIL") or - str:contains(PERMISSION_LIST,"READSTANDINGORDERSBASIC") or - str:contains(PERMISSION_LIST,"READSTANDINGORDERSDETAIL") or - str:contains(PERMISSION_LIST,"READSTATEMENTSBASIC") or - str:contains(PERMISSION_LIST,"READSTATEMENTSDETAIL") - ), - false, true) as TRA_APPLICABLE, TRANSACTION_FROM_DATE_TIME, EXPIRATION_DATE_TIME, TYPE, LAST_SCA_TIME_LIMIT -insert into UkAccountValidationStream; - -from UkAccountDataWithElementCountStream [size > 5] -select TPP_ID,MESSAGE_ID,CONSENT_ID,TIMESTAMP,false as TRA_APPLICABLE,TRANSACTION_FROM_DATE_TIME,EXPIRATION_DATE_TIME, - TYPE, LAST_SCA_TIME_LIMIT -insert into UkAccountValidationStream; - -@info(name='getUkAccountData') -from UkAccountValidationStream as v join ACCOUNTS_RAW_DATA as a -on a.CONSENT_ID == v.CONSENT_ID -select v.TPP_ID, v.MESSAGE_ID, v.CONSENT_ID, a.CLIENT_ID, v.TIMESTAMP as CURRENT_TIMESTAMP, v.TYPE, v.TRA_APPLICABLE, - v.LAST_SCA_TIME_LIMIT -insert into TRAAccountDataStream; - -from TRAValidationStream [DEPLOYED_SPEC == "BERLIN"] -select * -insert into BerlinAccountConfigDataStream; - -from BG_ACCOUNT_BINDING as a - join BerlinAccountConfigDataStream as v - on a.CONSENT_ID == v.CONSENT_ID -select v.TPP_ID,v.MESSAGE_ID,v.CONSENT_ID,v.TIMESTAMP,v.TYPE,v.DEPLOYED_SPEC,v.LAST_SCA_TIME_LIMIT,a.ACCOUNT_CONSENT -insert into BerlinAccountDataStream; - -from BerlinAccountDataStream -select TPP_ID, MESSAGE_ID, CONSENT_ID, TIMESTAMP, json:getString(ACCOUNT_CONSENT,'$.accounts') as ACCOUNT_LIST, - json:getString(ACCOUNT_CONSENT,'$.balances') as BALANCE_LIST, json:getString(ACCOUNT_CONSENT, - '$.transactions') as TRANSACTION_LIST, TYPE, LAST_SCA_TIME_LIMIT -insert into BerlinAccountPermissionDataStream; - -from BerlinAccountPermissionDataStream -select TPP_ID, MESSAGE_ID, CONSENT_ID, TIMESTAMP, ACCOUNT_LIST, getArrayLength(ACCOUNT_LIST) as ACCOUNT_LIST_SIZE, - BALANCE_LIST, getArrayLength(BALANCE_LIST) as BALANCE_LIST_SIZE, TRANSACTION_LIST, - getArrayLength(TRANSACTION_LIST) as TRANSACTION_LIST_SIZE, TYPE, LAST_SCA_TIME_LIMIT -insert into BerlinDataWithElementCountStream; - -from BerlinDataWithElementCountStream [ACCOUNT_LIST_SIZE == 0 and BALANCE_LIST_SIZE > 1 and TRANSACTION_LIST_SIZE == 0] -select TPP_ID, MESSAGE_ID, CONSENT_ID, TIMESTAMP, true as TRA_APPLICABLE, TYPE, LAST_SCA_TIME_LIMIT -insert into BerlinAccountValidationStream; - -from BerlinDataWithElementCountStream [ACCOUNT_LIST_SIZE > 0 or TRANSACTION_LIST_SIZE > 0] -select TPP_ID, MESSAGE_ID, CONSENT_ID, TIMESTAMP, false as TRA_APPLICABLE, TYPE, LAST_SCA_TIME_LIMIT -insert into BerlinAccountValidationStream; - -@info(name='getBerlinAccountData') -from BerlinAccountValidationStream as v join ACCOUNTS_RAW_DATA as a -on a.CONSENT_ID == v.CONSENT_ID -select v.TPP_ID, v.MESSAGE_ID, v.CONSENT_ID, a.CLIENT_ID, v.TIMESTAMP as CURRENT_TIMESTAMP, v.TYPE, v.TRA_APPLICABLE, - v.LAST_SCA_TIME_LIMIT -insert into TRAAccountDataStream; diff --git a/docker-compose/obam-obkm-with-obbi/obbi/deployment/siddhi-files/TRAPaymentValidationApp.siddhi b/docker-compose/obam-obkm-with-obbi/obbi/deployment/siddhi-files/TRAPaymentValidationApp.siddhi deleted file mode 100644 index 118d5f7..0000000 --- a/docker-compose/obam-obkm-with-obbi/obbi/deployment/siddhi-files/TRAPaymentValidationApp.siddhi +++ /dev/null @@ -1,47 +0,0 @@ -/** -* Copyright (c) 2019, WSO2 Inc. (http://www.wso2.com). All Rights Reserved. -* -* This software is the property of WSO2 Inc. and its suppliers, if any. -* Dissemination of any information or reproduction of any material contained -* herein is strictly forbidden, unless permitted by WSO2 in accordance with -* the WSO2 Commercial License available at http://wso2.com/licenses. For specific -* language governing the permissions and limitations under this license, -* please see the license as well as any agreement you've entered into with -* WSO2 governing the purchase of this software and any associated services. -**/ - -@App:name("TRAPaymentValidationApp") - -@App:description('Receive events via HTTP transport and view the output on the console') - -@Source(type = 'http-request', - source.id='source', - receiver.url='http://obbi-worker:8007/TRAPaymentValidationApp/TRAValidationStream', - basic.auth.enabled='false', - @map(type = 'json',@attributes(MESSAGE_ID='trp:messageId',TIMESTAMP='event.timestamp',TPP_ID='event.userId', - CONSENT_ID='event.consentId', TYPE='$.event.type', DEPLOYED_SPEC='$.event.DeployedSpec', - RECURRING_PAYMENT_TIME='$.event.recurringPaymentTime',MAX_FREQ_WITHOUT_SCA='$.event.maxFreqWithoutSCA', - TOTAL_AMOUNT_WITHOUT_SCA='$.event.totalAmountWithoutSCA', MAX_TRANSACTION_AMOUNT='$.event.MaxTransactionAmount'))) -define stream TRAValidationStream (MESSAGE_ID string, TIMESTAMP long, TPP_ID string, CONSENT_ID string, TYPE string, - DEPLOYED_SPEC string, RECURRING_PAYMENT_TIME int, MAX_FREQ_WITHOUT_SCA int, - TOTAL_AMOUNT_WITHOUT_SCA int, MAX_TRANSACTION_AMOUNT int); - -@sink(type = 'inMemory', topic = 'traPaymentData',@map(type = 'passThrough')) -define stream TRAPaymentDataStream (TPP_ID string, MESSAGE_ID string, CONSENT_ID string, CLIENT_ID string, - AMOUNT string, CURRENT_TIMESTAMP long, TYPE string, RECURRING_PAYMENT_TIME int, - MAX_FREQ_WITHOUT_SCA int, TOTAL_AMOUNT_WITHOUT_SCA int, MAX_TRANSACTION_AMOUNT int); - -@primaryKey('ID','TIMESTAMP') -@store(type='rdbms', datasource='OB_REPORTING_DB') -define table PAYMENTS_RAW_DATA(ID string,CONSENT_ID string,USER_ID string,TPP_ID string,CLIENT_ID string, - CREDITOR_ACCOUNT_ID string,DEBTOR_ACCOUNT_ID string,MULTI_AUTHORISATION bool,PAYMENT_TYPE string, - CURRENCY string,NO_OF_TRANSACTIONS string,LOCAL_INSTRUMENT string,AMOUNT string, - PAYMENT_SUBMISSION_ID string,TIMESTAMP long,TRA_DECISION bool, EXEMPTION string, IS_FRAUD bool); - -@info(name='getTransactionData') -from TRAValidationStream as v join PAYMENTS_RAW_DATA as t -on t.CONSENT_ID == v.CONSENT_ID -select v.TPP_ID, v.MESSAGE_ID, v.CONSENT_ID, t.CLIENT_ID, t.AMOUNT, v.TIMESTAMP as CURRENT_TIMESTAMP, v.TYPE, - v.RECURRING_PAYMENT_TIME, v.MAX_FREQ_WITHOUT_SCA, v.TOTAL_AMOUNT_WITHOUT_SCA, - v.MAX_TRANSACTION_AMOUNT -insert into TRAPaymentDataStream; diff --git a/docker-compose/obam-obkm-with-obbi/obkm/au/repository/resources/security/client-truststore.jks b/docker-compose/obam-obkm-with-obbi/obkm/au/repository/resources/security/client-truststore.jks deleted file mode 100644 index b0c6e49..0000000 Binary files a/docker-compose/obam-obkm-with-obbi/obkm/au/repository/resources/security/client-truststore.jks and /dev/null differ diff --git a/docker-compose/obam-obkm-with-obbi/obkm/au/repository/resources/security/client-truststore.jks.old b/docker-compose/obam-obkm-with-obbi/obkm/au/repository/resources/security/client-truststore.jks.old deleted file mode 100644 index a57d08b..0000000 Binary files a/docker-compose/obam-obkm-with-obbi/obkm/au/repository/resources/security/client-truststore.jks.old and /dev/null differ diff --git a/docker-compose/obam-obkm-with-obbi/obkm/au/repository/resources/security/wso2carbon.jks b/docker-compose/obam-obkm-with-obbi/obkm/au/repository/resources/security/wso2carbon.jks deleted file mode 100644 index b4b6220..0000000 Binary files a/docker-compose/obam-obkm-with-obbi/obkm/au/repository/resources/security/wso2carbon.jks and /dev/null differ diff --git a/docker-compose/obam-obkm-with-obbi/obkm/au/repository/resources/security/wso2carbon.jks.old b/docker-compose/obam-obkm-with-obbi/obkm/au/repository/resources/security/wso2carbon.jks.old deleted file mode 100644 index 010e795..0000000 Binary files a/docker-compose/obam-obkm-with-obbi/obkm/au/repository/resources/security/wso2carbon.jks.old and /dev/null differ diff --git a/docker-compose/obam-with-obkm/README.md b/docker-compose/obam-with-obiam/README.md similarity index 87% rename from docker-compose/obam-with-obkm/README.md rename to docker-compose/obam-with-obiam/README.md index 9cc2cc9..788e30b 100644 --- a/docker-compose/obam-with-obkm/README.md +++ b/docker-compose/obam-with-obiam/README.md @@ -1,4 +1,4 @@ -# WSO2 Open Banking API Manager with Open Banking Key Manager +# WSO2 Open Banking API Manager with Open Banking Identity & Access Management Module ## Prerequisites @@ -18,13 +18,13 @@ ``` > If you are to try out an already released zip of this repo, please ignore this 1st step. -2. Switch to the `docker-compose/obam-with-obkm` folder. +2. Switch to the `docker-compose/obam-with-obiam` folder. ``` - cd docker-open-banking/docker-compose/obam-with-obkm + cd docker-open-banking/docker-compose/obam-with-obiam ``` > If you are to try out an already released zip of this repo, please ignore this 2nd step also. - Instead, extract the zip file and directly browse to `docker-open-banking-/docker-compose/obam-with-obkm` folder. + Instead, extract the zip file and directly browse to `docker-open-banking-/docker-compose/obam-with-obiam` folder. > If you want to try out an already released tag, after executing 2nd step, checkout the relevant tag, i.e. for example: git checkout tags/v1.4.0.5 and continue below steps. @@ -55,7 +55,7 @@ https://localhost:8280 ``` - WSO2 Open Banking API Manager will use WSO2 Open Banking Key Manager to generate OAuth2 tokens and validate those tokens during API invocations. You can access the WSO2 Open Banking Key Manager-Management portal using the below URL via a web browser. + WSO2 Open Banking API Manager will use WSO2 Open Banking Identity & Access Management Module to generate OAuth2 tokens and validate those tokens during API invocations. You can access the WSO2 Open Banking Identity & Access Management Module-Management portal using the below URL via a web browser. ``` https://localhost:9446/carbon diff --git a/docker-compose/obam-with-obkm/docker-compose.yml b/docker-compose/obam-with-obiam/docker-compose.yml similarity index 95% rename from docker-compose/obam-with-obkm/docker-compose.yml rename to docker-compose/obam-with-obiam/docker-compose.yml index e90dd64..d5d3f49 100644 --- a/docker-compose/obam-with-obkm/docker-compose.yml +++ b/docker-compose/obam-with-obiam/docker-compose.yml @@ -41,7 +41,7 @@ services: retries: 5 start_period: 30s - obkm: + obiam: container_name: obiam image: docker.wso2.com/wso2-obiam healthcheck: @@ -53,7 +53,7 @@ services: depends_on: - "mysql" volumes: - - "./obkm/au:/home/wso2carbon/wso2-config-volume" + - "./obiam/au:/home/wso2carbon/wso2-config-volume" - "./wait-for-it.sh:/home/wso2carbon/wait-for-it.sh" ports: - "9446:9446" @@ -76,7 +76,7 @@ services: retries: 5 depends_on: - "mysql" - - "obkm" + - "obiam" volumes: - "./obam/au:/home/wso2carbon/wso2-config-volume" - "./wait-for-it.sh:/home/wso2carbon/wait-for-it.sh" @@ -86,7 +86,7 @@ services: - "8280:8280" entrypoint: - "/home/wso2carbon/wait-for-it.sh" - - "obkm:9446" + - "obiam:9446" - "-t" - "240" - "--" diff --git a/docker-compose/obam-with-obkm/mysql/scripts/au/setup.sql b/docker-compose/obam-with-obiam/mysql/scripts/au/setup.sql similarity index 100% rename from docker-compose/obam-with-obkm/mysql/scripts/au/setup.sql rename to docker-compose/obam-with-obiam/mysql/scripts/au/setup.sql diff --git a/docker-compose/obam-with-obkm/mysql/scripts/berlin/setup.sql b/docker-compose/obam-with-obiam/mysql/scripts/berlin/setup.sql similarity index 100% rename from docker-compose/obam-with-obkm/mysql/scripts/berlin/setup.sql rename to docker-compose/obam-with-obiam/mysql/scripts/berlin/setup.sql diff --git a/docker-compose/obam-with-obkm/mysql/scripts/my.cnf b/docker-compose/obam-with-obiam/mysql/scripts/my.cnf similarity index 100% rename from docker-compose/obam-with-obkm/mysql/scripts/my.cnf rename to docker-compose/obam-with-obiam/mysql/scripts/my.cnf diff --git a/docker-compose/obam-with-obkm/mysql/scripts/uk/setup.sql b/docker-compose/obam-with-obiam/mysql/scripts/uk/setup.sql similarity index 100% rename from docker-compose/obam-with-obkm/mysql/scripts/uk/setup.sql rename to docker-compose/obam-with-obiam/mysql/scripts/uk/setup.sql diff --git a/docker-compose/obam-with-obkm/obam/au/bin/wso2server.sh b/docker-compose/obam-with-obiam/obam/au/bin/wso2server.sh similarity index 100% rename from docker-compose/obam-with-obkm/obam/au/bin/wso2server.sh rename to docker-compose/obam-with-obiam/obam/au/bin/wso2server.sh diff --git a/docker-compose/obam-with-obkm/obam/au/repository/conf/deployment.toml b/docker-compose/obam-with-obiam/obam/au/repository/conf/deployment.toml similarity index 100% rename from docker-compose/obam-with-obkm/obam/au/repository/conf/deployment.toml rename to docker-compose/obam-with-obiam/obam/au/repository/conf/deployment.toml diff --git a/docker-compose/obam-with-obkm/obam/au/repository/deployment/server/jaggeryapps/admin/site/conf/site.json b/docker-compose/obam-with-obiam/obam/au/repository/deployment/server/jaggeryapps/admin/site/conf/site.json similarity index 100% rename from docker-compose/obam-with-obkm/obam/au/repository/deployment/server/jaggeryapps/admin/site/conf/site.json rename to docker-compose/obam-with-obiam/obam/au/repository/deployment/server/jaggeryapps/admin/site/conf/site.json diff --git a/docker-compose/obam-with-obkm/obam/au/repository/deployment/server/jaggeryapps/devportal/site/public/theme/settings.js b/docker-compose/obam-with-obiam/obam/au/repository/deployment/server/jaggeryapps/devportal/site/public/theme/settings.js similarity index 100% rename from docker-compose/obam-with-obkm/obam/au/repository/deployment/server/jaggeryapps/devportal/site/public/theme/settings.js rename to docker-compose/obam-with-obiam/obam/au/repository/deployment/server/jaggeryapps/devportal/site/public/theme/settings.js diff --git a/docker-compose/obam-with-obkm/obam/au/repository/resources/api_templates/velocity_template.xml b/docker-compose/obam-with-obiam/obam/au/repository/resources/api_templates/velocity_template.xml similarity index 100% rename from docker-compose/obam-with-obkm/obam/au/repository/resources/api_templates/velocity_template.xml rename to docker-compose/obam-with-obiam/obam/au/repository/resources/api_templates/velocity_template.xml diff --git a/docker-compose/obam-with-obkm/obam/au/repository/resources/security/client-truststore.jks b/docker-compose/obam-with-obiam/obam/au/repository/resources/security/client-truststore.jks similarity index 96% rename from docker-compose/obam-with-obkm/obam/au/repository/resources/security/client-truststore.jks rename to docker-compose/obam-with-obiam/obam/au/repository/resources/security/client-truststore.jks index c05313e..5adbb00 100644 Binary files a/docker-compose/obam-with-obkm/obam/au/repository/resources/security/client-truststore.jks and b/docker-compose/obam-with-obiam/obam/au/repository/resources/security/client-truststore.jks differ diff --git a/docker-compose/obam-with-obkm/obam/uk/repository/resources/security/listenerprofiles.xml b/docker-compose/obam-with-obiam/obam/au/repository/resources/security/listenerprofiles.xml similarity index 93% rename from docker-compose/obam-with-obkm/obam/uk/repository/resources/security/listenerprofiles.xml rename to docker-compose/obam-with-obiam/obam/au/repository/resources/security/listenerprofiles.xml index 4f6aac4..080ff5f 100644 --- a/docker-compose/obam-with-obkm/obam/uk/repository/resources/security/listenerprofiles.xml +++ b/docker-compose/obam-with-obiam/obam/au/repository/resources/security/listenerprofiles.xml @@ -17,9 +17,7 @@ ~ under the License. --> - - - + 0.0.0.0 @@ -36,4 +34,3 @@ optional - diff --git a/docker-compose/obam-obkm-with-obbi/obam/uk/repository/resources/security/openbanking.jks b/docker-compose/obam-with-obiam/obam/au/repository/resources/security/openbanking.jks similarity index 100% rename from docker-compose/obam-obkm-with-obbi/obam/uk/repository/resources/security/openbanking.jks rename to docker-compose/obam-with-obiam/obam/au/repository/resources/security/openbanking.jks diff --git a/docker-compose/obam-with-obiam/obam/au/repository/resources/security/sslprofiles.xml b/docker-compose/obam-with-obiam/obam/au/repository/resources/security/sslprofiles.xml new file mode 100644 index 0000000..64d9c2b --- /dev/null +++ b/docker-compose/obam-with-obiam/obam/au/repository/resources/security/sslprofiles.xml @@ -0,0 +1,17 @@ + + + + * + + repository/resources/security/wso2carbon.jks + JKS + wso2carbon + wso2carbon + + + repository/resources/security/client-truststore.jks + JKS + wso2carbon + + + diff --git a/docker-compose/obam-with-obiam/obam/au/repository/resources/security/wso2carbon.jks b/docker-compose/obam-with-obiam/obam/au/repository/resources/security/wso2carbon.jks new file mode 100644 index 0000000..d175597 Binary files /dev/null and b/docker-compose/obam-with-obiam/obam/au/repository/resources/security/wso2carbon.jks differ diff --git a/docker-compose/obam-with-obkm/obam/berlin/bin/wso2server.sh b/docker-compose/obam-with-obiam/obam/berlin/bin/wso2server.sh similarity index 100% rename from docker-compose/obam-with-obkm/obam/berlin/bin/wso2server.sh rename to docker-compose/obam-with-obiam/obam/berlin/bin/wso2server.sh diff --git a/docker-compose/obam-with-obkm/obam/berlin/repository/conf/api-manager.xml b/docker-compose/obam-with-obiam/obam/berlin/repository/conf/api-manager.xml similarity index 100% rename from docker-compose/obam-with-obkm/obam/berlin/repository/conf/api-manager.xml rename to docker-compose/obam-with-obiam/obam/berlin/repository/conf/api-manager.xml diff --git a/docker-compose/obam-with-obkm/obam/berlin/repository/conf/carbon.xml b/docker-compose/obam-with-obiam/obam/berlin/repository/conf/carbon.xml similarity index 100% rename from docker-compose/obam-with-obkm/obam/berlin/repository/conf/carbon.xml rename to docker-compose/obam-with-obiam/obam/berlin/repository/conf/carbon.xml diff --git a/docker-compose/obam-with-obkm/obam/berlin/repository/conf/datasources/master-datasources.xml b/docker-compose/obam-with-obiam/obam/berlin/repository/conf/datasources/master-datasources.xml similarity index 100% rename from docker-compose/obam-with-obkm/obam/berlin/repository/conf/datasources/master-datasources.xml rename to docker-compose/obam-with-obiam/obam/berlin/repository/conf/datasources/master-datasources.xml diff --git a/docker-compose/obam-with-obkm/obam/berlin/repository/conf/datasources/open-banking-datasources.xml b/docker-compose/obam-with-obiam/obam/berlin/repository/conf/datasources/open-banking-datasources.xml similarity index 100% rename from docker-compose/obam-with-obkm/obam/berlin/repository/conf/datasources/open-banking-datasources.xml rename to docker-compose/obam-with-obiam/obam/berlin/repository/conf/datasources/open-banking-datasources.xml diff --git a/docker-compose/obam-with-obkm/obam/berlin/repository/conf/finance/open-banking.xml b/docker-compose/obam-with-obiam/obam/berlin/repository/conf/finance/open-banking.xml similarity index 100% rename from docker-compose/obam-with-obkm/obam/berlin/repository/conf/finance/open-banking.xml rename to docker-compose/obam-with-obiam/obam/berlin/repository/conf/finance/open-banking.xml diff --git a/docker-compose/obam-with-obkm/obam/berlin/repository/conf/registry.xml b/docker-compose/obam-with-obiam/obam/berlin/repository/conf/registry.xml similarity index 100% rename from docker-compose/obam-with-obkm/obam/berlin/repository/conf/registry.xml rename to docker-compose/obam-with-obiam/obam/berlin/repository/conf/registry.xml diff --git a/docker-compose/obam-with-obkm/obam/berlin/repository/conf/user-mgt.xml b/docker-compose/obam-with-obiam/obam/berlin/repository/conf/user-mgt.xml similarity index 100% rename from docker-compose/obam-with-obkm/obam/berlin/repository/conf/user-mgt.xml rename to docker-compose/obam-with-obiam/obam/berlin/repository/conf/user-mgt.xml diff --git a/docker-compose/obam-with-obkm/obam/berlin/repository/deployment/server/executionplans/global_FreqPerDay.siddhiql b/docker-compose/obam-with-obiam/obam/berlin/repository/deployment/server/executionplans/global_FreqPerDay.siddhiql similarity index 100% rename from docker-compose/obam-with-obkm/obam/berlin/repository/deployment/server/executionplans/global_FreqPerDay.siddhiql rename to docker-compose/obam-with-obiam/obam/berlin/repository/deployment/server/executionplans/global_FreqPerDay.siddhiql diff --git a/docker-compose/obam-with-obkm/obam/berlin/repository/deployment/server/jaggeryapps/admin/site/conf/site.json b/docker-compose/obam-with-obiam/obam/berlin/repository/deployment/server/jaggeryapps/admin/site/conf/site.json similarity index 100% rename from docker-compose/obam-with-obkm/obam/berlin/repository/deployment/server/jaggeryapps/admin/site/conf/site.json rename to docker-compose/obam-with-obiam/obam/berlin/repository/deployment/server/jaggeryapps/admin/site/conf/site.json diff --git a/docker-compose/obam-with-obkm/obam/berlin/repository/deployment/server/jaggeryapps/store/site/conf/site.json b/docker-compose/obam-with-obiam/obam/berlin/repository/deployment/server/jaggeryapps/store/site/conf/site.json similarity index 100% rename from docker-compose/obam-with-obkm/obam/berlin/repository/deployment/server/jaggeryapps/store/site/conf/site.json rename to docker-compose/obam-with-obiam/obam/berlin/repository/deployment/server/jaggeryapps/store/site/conf/site.json diff --git a/docker-compose/obam-with-obkm/obam/berlin/repository/resources/api_templates/velocity_template.xml b/docker-compose/obam-with-obiam/obam/berlin/repository/resources/api_templates/velocity_template.xml similarity index 100% rename from docker-compose/obam-with-obkm/obam/berlin/repository/resources/api_templates/velocity_template.xml rename to docker-compose/obam-with-obiam/obam/berlin/repository/resources/api_templates/velocity_template.xml diff --git a/docker-compose/obam-with-obkm/obam/uk/bin/wso2server.sh b/docker-compose/obam-with-obiam/obam/uk/bin/wso2server.sh similarity index 100% rename from docker-compose/obam-with-obkm/obam/uk/bin/wso2server.sh rename to docker-compose/obam-with-obiam/obam/uk/bin/wso2server.sh diff --git a/docker-compose/obam-with-obkm/obam/uk/repository/conf/deployment.toml b/docker-compose/obam-with-obiam/obam/uk/repository/conf/deployment.toml similarity index 100% rename from docker-compose/obam-with-obkm/obam/uk/repository/conf/deployment.toml rename to docker-compose/obam-with-obiam/obam/uk/repository/conf/deployment.toml diff --git a/docker-compose/obam-with-obkm/obam/uk/repository/deployment/server/jaggeryapps/admin/site/conf/site.json b/docker-compose/obam-with-obiam/obam/uk/repository/deployment/server/jaggeryapps/admin/site/conf/site.json similarity index 100% rename from docker-compose/obam-with-obkm/obam/uk/repository/deployment/server/jaggeryapps/admin/site/conf/site.json rename to docker-compose/obam-with-obiam/obam/uk/repository/deployment/server/jaggeryapps/admin/site/conf/site.json diff --git a/docker-compose/obam-with-obkm/obam/uk/repository/deployment/server/jaggeryapps/devportal/site/public/theme/settings.js b/docker-compose/obam-with-obiam/obam/uk/repository/deployment/server/jaggeryapps/devportal/site/public/theme/settings.js similarity index 100% rename from docker-compose/obam-with-obkm/obam/uk/repository/deployment/server/jaggeryapps/devportal/site/public/theme/settings.js rename to docker-compose/obam-with-obiam/obam/uk/repository/deployment/server/jaggeryapps/devportal/site/public/theme/settings.js diff --git a/docker-compose/obam-with-obkm/obam/uk/repository/resources/api_templates/velocity_template.xml b/docker-compose/obam-with-obiam/obam/uk/repository/resources/api_templates/velocity_template.xml similarity index 100% rename from docker-compose/obam-with-obkm/obam/uk/repository/resources/api_templates/velocity_template.xml rename to docker-compose/obam-with-obiam/obam/uk/repository/resources/api_templates/velocity_template.xml diff --git a/docker-compose/obam-with-obkm/obam/uk/repository/resources/security/client-truststore.jks b/docker-compose/obam-with-obiam/obam/uk/repository/resources/security/client-truststore.jks similarity index 96% rename from docker-compose/obam-with-obkm/obam/uk/repository/resources/security/client-truststore.jks rename to docker-compose/obam-with-obiam/obam/uk/repository/resources/security/client-truststore.jks index c05313e..5adbb00 100644 Binary files a/docker-compose/obam-with-obkm/obam/uk/repository/resources/security/client-truststore.jks and b/docker-compose/obam-with-obiam/obam/uk/repository/resources/security/client-truststore.jks differ diff --git a/docker-compose/obam-with-obkm/obam/au/repository/resources/security/listenerprofiles.xml b/docker-compose/obam-with-obiam/obam/uk/repository/resources/security/listenerprofiles.xml similarity index 93% rename from docker-compose/obam-with-obkm/obam/au/repository/resources/security/listenerprofiles.xml rename to docker-compose/obam-with-obiam/obam/uk/repository/resources/security/listenerprofiles.xml index 4f6aac4..080ff5f 100644 --- a/docker-compose/obam-with-obkm/obam/au/repository/resources/security/listenerprofiles.xml +++ b/docker-compose/obam-with-obiam/obam/uk/repository/resources/security/listenerprofiles.xml @@ -17,9 +17,7 @@ ~ under the License. --> - - - + 0.0.0.0 @@ -36,4 +34,3 @@ optional - diff --git a/docker-compose/obam-with-obkm/obam/au/repository/resources/security/openbanking.jks b/docker-compose/obam-with-obiam/obam/uk/repository/resources/security/openbanking.jks similarity index 100% rename from docker-compose/obam-with-obkm/obam/au/repository/resources/security/openbanking.jks rename to docker-compose/obam-with-obiam/obam/uk/repository/resources/security/openbanking.jks diff --git a/docker-compose/obam-with-obiam/obam/uk/repository/resources/security/sslprofiles.xml b/docker-compose/obam-with-obiam/obam/uk/repository/resources/security/sslprofiles.xml new file mode 100644 index 0000000..64d9c2b --- /dev/null +++ b/docker-compose/obam-with-obiam/obam/uk/repository/resources/security/sslprofiles.xml @@ -0,0 +1,17 @@ + + + + * + + repository/resources/security/wso2carbon.jks + JKS + wso2carbon + wso2carbon + + + repository/resources/security/client-truststore.jks + JKS + wso2carbon + + + diff --git a/docker-compose/obam-with-obiam/obam/uk/repository/resources/security/wso2carbon.jks b/docker-compose/obam-with-obiam/obam/uk/repository/resources/security/wso2carbon.jks new file mode 100644 index 0000000..d175597 Binary files /dev/null and b/docker-compose/obam-with-obiam/obam/uk/repository/resources/security/wso2carbon.jks differ diff --git a/docker-compose/obam-with-obkm/obkm/au/bin/wso2server.sh b/docker-compose/obam-with-obiam/obiam/au/bin/wso2server.sh similarity index 100% rename from docker-compose/obam-with-obkm/obkm/au/bin/wso2server.sh rename to docker-compose/obam-with-obiam/obiam/au/bin/wso2server.sh diff --git a/docker-compose/obam-with-obkm/obkm/au/repository/conf/deployment.toml b/docker-compose/obam-with-obiam/obiam/au/repository/conf/deployment.toml similarity index 100% rename from docker-compose/obam-with-obkm/obkm/au/repository/conf/deployment.toml rename to docker-compose/obam-with-obiam/obiam/au/repository/conf/deployment.toml diff --git a/docker-compose/obam-with-obkm/obkm/au/repository/deployment/server/jaggeryapps/ccportal/configs/conf.json b/docker-compose/obam-with-obiam/obiam/au/repository/deployment/server/jaggeryapps/ccportal/configs/conf.json similarity index 100% rename from docker-compose/obam-with-obkm/obkm/au/repository/deployment/server/jaggeryapps/ccportal/configs/conf.json rename to docker-compose/obam-with-obiam/obiam/au/repository/deployment/server/jaggeryapps/ccportal/configs/conf.json diff --git a/docker-compose/obam-with-obkm/obkm/au/repository/deployment/server/jaggeryapps/consentmgt/configs/conf.json b/docker-compose/obam-with-obiam/obiam/au/repository/deployment/server/jaggeryapps/consentmgt/configs/conf.json similarity index 100% rename from docker-compose/obam-with-obkm/obkm/au/repository/deployment/server/jaggeryapps/consentmgt/configs/conf.json rename to docker-compose/obam-with-obiam/obiam/au/repository/deployment/server/jaggeryapps/consentmgt/configs/conf.json diff --git a/docker-compose/obam-with-obkm/obkm/au/repository/resources/security/client-truststore.jks b/docker-compose/obam-with-obiam/obiam/au/repository/resources/security/client-truststore.jks similarity index 95% rename from docker-compose/obam-with-obkm/obkm/au/repository/resources/security/client-truststore.jks rename to docker-compose/obam-with-obiam/obiam/au/repository/resources/security/client-truststore.jks index a40fc60..d71982b 100644 Binary files a/docker-compose/obam-with-obkm/obkm/au/repository/resources/security/client-truststore.jks and b/docker-compose/obam-with-obiam/obiam/au/repository/resources/security/client-truststore.jks differ diff --git a/docker-compose/obam-with-obiam/obiam/au/repository/resources/security/wso2carbon.jks b/docker-compose/obam-with-obiam/obiam/au/repository/resources/security/wso2carbon.jks new file mode 100644 index 0000000..95dcc3c Binary files /dev/null and b/docker-compose/obam-with-obiam/obiam/au/repository/resources/security/wso2carbon.jks differ diff --git a/docker-compose/obam-with-obkm/obkm/berlin/bin/wso2server.sh b/docker-compose/obam-with-obiam/obiam/berlin/bin/wso2server.sh similarity index 100% rename from docker-compose/obam-with-obkm/obkm/berlin/bin/wso2server.sh rename to docker-compose/obam-with-obiam/obiam/berlin/bin/wso2server.sh diff --git a/docker-compose/obam-obkm-with-obbi/obkm/au/repository/conf/axis2/axis2.xml b/docker-compose/obam-with-obiam/obiam/berlin/repository/conf/axis2/axis2.xml similarity index 98% rename from docker-compose/obam-obkm-with-obbi/obkm/au/repository/conf/axis2/axis2.xml rename to docker-compose/obam-with-obiam/obiam/berlin/repository/conf/axis2/axis2.xml index 654105f..24480c8 100644 --- a/docker-compose/obam-obkm-with-obbi/obkm/au/repository/conf/axis2/axis2.xml +++ b/docker-compose/obam-with-obiam/obiam/berlin/repository/conf/axis2/axis2.xml @@ -1,725 +1,725 @@ - - - - - - - - - - - - - true - true - optional - true - work/mtom - 4000 - - ${childfirstCL} - - - true - - - true - - - - false - - inmemory - - - - - - - services - - - axis2services - - - axis2modules - - - WSO2 Identity Server-5.7.0 - - - WSO2 Identity Server-5.7.0 - - - - - - - false - - - - - - false - - - true - - - - ./repository/deployment/server/synapse-configs - - - - . - - - . - - - WSO2 Carbon Server - - - - - - - ${jaxwsparam} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 9763 - - - - - - - - - - - - 9443 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - HTTP/1.1 - chunked - - true - - - HTTP/1.1 - chunked - - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - - - multicast - - - - - wso2.carbon.domain - - - - - - 45564 - - 100 - - 60 - - - - - - 127.0.0.1 - - - - - - 4000 - - - - - - - - - - - - - - - - - - 127.0.0.1 - 4000 - - - - - - - - - + + + + + + + + + + + + + true + true + optional + true + work/mtom + 4000 + + ${childfirstCL} + + + true + + + true + + + + false + + inmemory + + + + + + + services + + + axis2services + + + axis2modules + + + WSO2 Identity Server-5.7.0 + + + WSO2 Identity Server-5.7.0 + + + + + + + false + + + + + + false + + + true + + + + ./repository/deployment/server/synapse-configs + + + + . + + + . + + + WSO2 Carbon Server + + + + + + + ${jaxwsparam} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 9763 + + + + + + + + + + + + 9443 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + HTTP/1.1 + chunked + + true + + + HTTP/1.1 + chunked + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + + + multicast + + + + + wso2.carbon.domain + + + + + + 45564 + + 100 + + 60 + + + + + + 127.0.0.1 + + + + + + 4000 + + + + + + + + + + + + + + + + + + 127.0.0.1 + 4000 + + + + + + + + + diff --git a/docker-compose/obam-with-obkm/obkm/berlin/repository/conf/carbon.xml b/docker-compose/obam-with-obiam/obiam/berlin/repository/conf/carbon.xml similarity index 100% rename from docker-compose/obam-with-obkm/obkm/berlin/repository/conf/carbon.xml rename to docker-compose/obam-with-obiam/obiam/berlin/repository/conf/carbon.xml diff --git a/docker-compose/obam-with-obkm/obkm/berlin/repository/conf/datasources/master-datasources.xml b/docker-compose/obam-with-obiam/obiam/berlin/repository/conf/datasources/master-datasources.xml similarity index 100% rename from docker-compose/obam-with-obkm/obkm/berlin/repository/conf/datasources/master-datasources.xml rename to docker-compose/obam-with-obiam/obiam/berlin/repository/conf/datasources/master-datasources.xml diff --git a/docker-compose/obam-with-obkm/obkm/berlin/repository/conf/datasources/open-banking-datasources.xml b/docker-compose/obam-with-obiam/obiam/berlin/repository/conf/datasources/open-banking-datasources.xml similarity index 100% rename from docker-compose/obam-with-obkm/obkm/berlin/repository/conf/datasources/open-banking-datasources.xml rename to docker-compose/obam-with-obiam/obiam/berlin/repository/conf/datasources/open-banking-datasources.xml diff --git a/docker-compose/obam-with-obkm/obkm/berlin/repository/conf/finance/open-banking.xml b/docker-compose/obam-with-obiam/obiam/berlin/repository/conf/finance/open-banking.xml similarity index 100% rename from docker-compose/obam-with-obkm/obkm/berlin/repository/conf/finance/open-banking.xml rename to docker-compose/obam-with-obiam/obiam/berlin/repository/conf/finance/open-banking.xml diff --git a/docker-compose/obam-with-obkm/obkm/berlin/repository/conf/identity/application-authentication.xml b/docker-compose/obam-with-obiam/obiam/berlin/repository/conf/identity/application-authentication.xml similarity index 100% rename from docker-compose/obam-with-obkm/obkm/berlin/repository/conf/identity/application-authentication.xml rename to docker-compose/obam-with-obiam/obiam/berlin/repository/conf/identity/application-authentication.xml diff --git a/docker-compose/obam-with-obkm/obkm/berlin/repository/conf/identity/identity.xml b/docker-compose/obam-with-obiam/obiam/berlin/repository/conf/identity/identity.xml similarity index 100% rename from docker-compose/obam-with-obkm/obkm/berlin/repository/conf/identity/identity.xml rename to docker-compose/obam-with-obiam/obiam/berlin/repository/conf/identity/identity.xml diff --git a/docker-compose/obam-with-obkm/obkm/berlin/repository/conf/registry.xml b/docker-compose/obam-with-obiam/obiam/berlin/repository/conf/registry.xml similarity index 100% rename from docker-compose/obam-with-obkm/obkm/berlin/repository/conf/registry.xml rename to docker-compose/obam-with-obiam/obiam/berlin/repository/conf/registry.xml diff --git a/docker-compose/obam-with-obkm/obkm/berlin/repository/conf/tomcat/catalina-server.xml b/docker-compose/obam-with-obiam/obiam/berlin/repository/conf/tomcat/catalina-server.xml similarity index 100% rename from docker-compose/obam-with-obkm/obkm/berlin/repository/conf/tomcat/catalina-server.xml rename to docker-compose/obam-with-obiam/obiam/berlin/repository/conf/tomcat/catalina-server.xml diff --git a/docker-compose/obam-with-obkm/obkm/berlin/repository/conf/user-mgt.xml b/docker-compose/obam-with-obiam/obiam/berlin/repository/conf/user-mgt.xml similarity index 100% rename from docker-compose/obam-with-obkm/obkm/berlin/repository/conf/user-mgt.xml rename to docker-compose/obam-with-obiam/obiam/berlin/repository/conf/user-mgt.xml diff --git a/docker-compose/obam-with-obkm/obkm/berlin/repository/deployment/server/jaggeryapps/ccportal/configs/conf.json b/docker-compose/obam-with-obiam/obiam/berlin/repository/deployment/server/jaggeryapps/ccportal/configs/conf.json similarity index 100% rename from docker-compose/obam-with-obkm/obkm/berlin/repository/deployment/server/jaggeryapps/ccportal/configs/conf.json rename to docker-compose/obam-with-obiam/obiam/berlin/repository/deployment/server/jaggeryapps/ccportal/configs/conf.json diff --git a/docker-compose/obam-with-obkm/obkm/berlin/repository/deployment/server/jaggeryapps/consentmgt/configs/conf.json b/docker-compose/obam-with-obiam/obiam/berlin/repository/deployment/server/jaggeryapps/consentmgt/configs/conf.json similarity index 100% rename from docker-compose/obam-with-obkm/obkm/berlin/repository/deployment/server/jaggeryapps/consentmgt/configs/conf.json rename to docker-compose/obam-with-obiam/obiam/berlin/repository/deployment/server/jaggeryapps/consentmgt/configs/conf.json diff --git a/docker-compose/obam-with-obkm/obkm/uk/bin/wso2server.sh b/docker-compose/obam-with-obiam/obiam/uk/bin/wso2server.sh similarity index 100% rename from docker-compose/obam-with-obkm/obkm/uk/bin/wso2server.sh rename to docker-compose/obam-with-obiam/obiam/uk/bin/wso2server.sh diff --git a/docker-compose/obam-with-obkm/obkm/uk/repository/conf/deployment.toml b/docker-compose/obam-with-obiam/obiam/uk/repository/conf/deployment.toml similarity index 100% rename from docker-compose/obam-with-obkm/obkm/uk/repository/conf/deployment.toml rename to docker-compose/obam-with-obiam/obiam/uk/repository/conf/deployment.toml diff --git a/docker-compose/obam-with-obkm/obkm/uk/repository/deployment/server/jaggeryapps/ccportal/configs/conf.json b/docker-compose/obam-with-obiam/obiam/uk/repository/deployment/server/jaggeryapps/ccportal/configs/conf.json similarity index 100% rename from docker-compose/obam-with-obkm/obkm/uk/repository/deployment/server/jaggeryapps/ccportal/configs/conf.json rename to docker-compose/obam-with-obiam/obiam/uk/repository/deployment/server/jaggeryapps/ccportal/configs/conf.json diff --git a/docker-compose/obam-with-obkm/obkm/uk/repository/deployment/server/jaggeryapps/consentmgt/configs/conf.json b/docker-compose/obam-with-obiam/obiam/uk/repository/deployment/server/jaggeryapps/consentmgt/configs/conf.json similarity index 100% rename from docker-compose/obam-with-obkm/obkm/uk/repository/deployment/server/jaggeryapps/consentmgt/configs/conf.json rename to docker-compose/obam-with-obiam/obiam/uk/repository/deployment/server/jaggeryapps/consentmgt/configs/conf.json diff --git a/docker-compose/obam-with-obkm/obkm/uk/repository/resources/security/client-truststore.jks b/docker-compose/obam-with-obiam/obiam/uk/repository/resources/security/client-truststore.jks similarity index 95% rename from docker-compose/obam-with-obkm/obkm/uk/repository/resources/security/client-truststore.jks rename to docker-compose/obam-with-obiam/obiam/uk/repository/resources/security/client-truststore.jks index a40fc60..d71982b 100644 Binary files a/docker-compose/obam-with-obkm/obkm/uk/repository/resources/security/client-truststore.jks and b/docker-compose/obam-with-obiam/obiam/uk/repository/resources/security/client-truststore.jks differ diff --git a/docker-compose/obam-with-obiam/obiam/uk/repository/resources/security/wso2carbon.jks b/docker-compose/obam-with-obiam/obiam/uk/repository/resources/security/wso2carbon.jks new file mode 100644 index 0000000..95dcc3c Binary files /dev/null and b/docker-compose/obam-with-obiam/obiam/uk/repository/resources/security/wso2carbon.jks differ diff --git a/docker-compose/obam-with-obkm/scripts/README.md b/docker-compose/obam-with-obiam/scripts/README.md similarity index 85% rename from docker-compose/obam-with-obkm/scripts/README.md rename to docker-compose/obam-with-obiam/scripts/README.md index 9271c5a..38d3cfd 100755 --- a/docker-compose/obam-with-obkm/scripts/README.md +++ b/docker-compose/obam-with-obiam/scripts/README.md @@ -1,4 +1,4 @@ -# WSO2 Open Banking API Manager with Open Banking Key Manager +# WSO2 Open Banking API Manager with Open Banking Identity & Access Management Module ## Prerequisites @@ -18,13 +18,13 @@ ``` > If you are to try out an already released zip of this repo, please ignore this 1st step. -2. Switch to the `docker-compose/obam-with-obkm` folder. +2. Switch to the `docker-compose/obam-with-obiam` folder. ``` - cd docker-open-banking/docker-compose/obam-with-obkm + cd docker-open-banking/docker-compose/obam-with-obiam ``` > If you are to try out an already released zip of this repo, please ignore this 2nd step also. - Instead, extract the zip file and directly browse to `docker-open-banking-/docker-compose/obam-with-obkm` folder. + Instead, extract the zip file and directly browse to `docker-open-banking-/docker-compose/obam-with-obiam` folder. > If you want to try out an already released tag, after executing 2nd step, checkout the relevant tag, i.e. for example: git checkout tags/v1.4.0.5 and continue below steps. @@ -54,7 +54,7 @@ https://localhost:8280 ``` - WSO2 Open Banking API Manager will use WSO2 Open Banking Key Manager to generate OAuth2 tokens and validate those tokens during API invocations. You can access the WSO2 Open Banking Key Manager-Management portal using the below URL via a web browser. + WSO2 Open Banking API Manager will use WSO2 Open Banking Identity & Access Management Module to generate OAuth2 tokens and validate those tokens during API invocations. You can access the WSO2 Open Banking Identity & Access Management Module-Management portal using the below URL via a web browser. ``` https://localhost:9446/carbon diff --git a/docker-compose/obam-with-obkm/scripts/deploy.sh b/docker-compose/obam-with-obiam/scripts/deploy.sh similarity index 100% rename from docker-compose/obam-with-obkm/scripts/deploy.sh rename to docker-compose/obam-with-obiam/scripts/deploy.sh diff --git a/docker-compose/obam-with-obkm/wait-for-it.sh b/docker-compose/obam-with-obiam/wait-for-it.sh similarity index 100% rename from docker-compose/obam-with-obkm/wait-for-it.sh rename to docker-compose/obam-with-obiam/wait-for-it.sh diff --git a/docker-compose/obam-with-obkm/obam/au/repository/resources/security/sslprofiles.xml b/docker-compose/obam-with-obkm/obam/au/repository/resources/security/sslprofiles.xml deleted file mode 100644 index af68444..0000000 --- a/docker-compose/obam-with-obkm/obam/au/repository/resources/security/sslprofiles.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - * - - repository/resources/security/wso2carbon.jks - JKS - wso2carbon - wso2carbon - - - repository/resources/security/client-truststore.jks - JKS - wso2carbon - - - - diff --git a/docker-compose/obam-with-obkm/obam/au/repository/resources/security/wso2carbon.jks b/docker-compose/obam-with-obkm/obam/au/repository/resources/security/wso2carbon.jks deleted file mode 100644 index f6126ee..0000000 Binary files a/docker-compose/obam-with-obkm/obam/au/repository/resources/security/wso2carbon.jks and /dev/null differ diff --git a/docker-compose/obam-with-obkm/obam/uk/repository/resources/security/openbanking.jks b/docker-compose/obam-with-obkm/obam/uk/repository/resources/security/openbanking.jks deleted file mode 100644 index b05f0d1..0000000 Binary files a/docker-compose/obam-with-obkm/obam/uk/repository/resources/security/openbanking.jks and /dev/null differ diff --git a/docker-compose/obam-with-obkm/obam/uk/repository/resources/security/sslprofiles.xml b/docker-compose/obam-with-obkm/obam/uk/repository/resources/security/sslprofiles.xml deleted file mode 100644 index af68444..0000000 --- a/docker-compose/obam-with-obkm/obam/uk/repository/resources/security/sslprofiles.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - * - - repository/resources/security/wso2carbon.jks - JKS - wso2carbon - wso2carbon - - - repository/resources/security/client-truststore.jks - JKS - wso2carbon - - - - diff --git a/docker-compose/obam-with-obkm/obam/uk/repository/resources/security/wso2carbon.jks b/docker-compose/obam-with-obkm/obam/uk/repository/resources/security/wso2carbon.jks deleted file mode 100644 index f6126ee..0000000 Binary files a/docker-compose/obam-with-obkm/obam/uk/repository/resources/security/wso2carbon.jks and /dev/null differ diff --git a/docker-compose/obam-with-obkm/obkm/au/repository/resources/security/wso2carbon.jks b/docker-compose/obam-with-obkm/obkm/au/repository/resources/security/wso2carbon.jks deleted file mode 100644 index 08e033e..0000000 Binary files a/docker-compose/obam-with-obkm/obkm/au/repository/resources/security/wso2carbon.jks and /dev/null differ diff --git a/docker-compose/obam-with-obkm/obkm/uk/repository/resources/security/wso2carbon.jks b/docker-compose/obam-with-obkm/obkm/uk/repository/resources/security/wso2carbon.jks deleted file mode 100644 index 08e033e..0000000 Binary files a/docker-compose/obam-with-obkm/obkm/uk/repository/resources/security/wso2carbon.jks and /dev/null differ diff --git a/dockerfiles/alpine/obkm/Dockerfile b/dockerfiles/alpine/obiam/Dockerfile similarity index 100% rename from dockerfiles/alpine/obkm/Dockerfile rename to dockerfiles/alpine/obiam/Dockerfile diff --git a/dockerfiles/alpine/obkm/README.md b/dockerfiles/alpine/obiam/README.md similarity index 80% rename from dockerfiles/alpine/obkm/README.md rename to dockerfiles/alpine/obiam/README.md index 0fd1f4c..0a3e7bf 100644 --- a/dockerfiles/alpine/obkm/README.md +++ b/dockerfiles/alpine/obiam/README.md @@ -1,11 +1,11 @@ -# Dockerfile for WSO2 Open Banking Key Manager # -This section defines the step-by-step instructions to build an [Alpine](https://hub.docker.com/_/alpine/) Linux based Docker image for WSO2 Open Banking Key Manager. +# Dockerfile for WSO2 Open Banking Identity & Access Management Module # +This section defines the step-by-step instructions to build an [Alpine](https://hub.docker.com/_/alpine/) Linux based Docker image for WSO2 Open Banking Identity & Access Management Module. ## Prerequisites * [Docker](https://www.docker.com/get-docker) v17.09.0 or above * [Git](https://git-scm.com/book/en/v2/Getting-Started-Installing-Git) client -* WSO2 Open Banking Key Manager pack downloaded through [WUM](https://docs.wso2.com/display/OB200/Setting+Up+Servers) +* WSO2 Open Banking Identity & Access Management Module pack downloaded through [WUM](https://docs.wso2.com/display/OB200/Setting+Up+Servers) + Host the downloaded pack locally or on a remote location. > The hosted location will be passed as the build argument `WSO2_SERVER_DIST_URL` when building the Docker image. @@ -17,11 +17,11 @@ This section defines the step-by-step instructions to build an [Alpine](https:// git clone https://github.com/wso2/docker-open-banking.git ``` -> The local copy of the `dockerfiles/alpine/obkm` directory will be referred to as `OBKM_DOCKERFILE_HOME` from this point onwards. +> The local copy of the `dockerfiles/alpine/obiam` directory will be referred to as `OBIAM_DOCKERFILE_HOME` from this point onwards. ##### 2. Build the Docker image. -- Navigate to `` directory.
+- Navigate to `` directory.
Execute `docker build` command as shown below. + `docker build --build-arg WSO2_SERVER_DIST_URL= -t wso2-obiam:2.0.0-alpine .` > eg:- Hosted locally: `docker build --build-arg WSO2_SERVER_DIST_URL=http://172.17.0.1:8000/wso2-obiam:2.0.0.zip -t wso2-obiam:2.0.0-alpine .` @@ -43,9 +43,9 @@ git clone https://github.com/wso2/docker-open-banking.git Configurations would lie on the Docker host machine and they can be volume mounted to the container.
As an example, steps required to change the port offset using `carbon.xml` is as follows: -##### 1. Stop the Key Manager container if it's already running. +##### 1. Stop the Identity & Access Management Module container if it's already running. -In WSO2 Open Banking Key Manager 2.0.0 product distribution, `carbon.xml` configuration file
+In WSO2 Open Banking Identity & Access Management Module 2.0.0 product distribution, `carbon.xml` configuration file
can be found at `/repository/conf`. Copy the file to some suitable location of the host machine,
referred to as `/carbon.xml` and change the offset value under ports to 1. @@ -74,16 +74,16 @@ Follow the steps given in [Creating a new keystore](https://docs.wso2.com/displa ##### 2. Import the certificate of the keystores to the truststore. -* Import the public key certificate of the new server keystore to the truststore of WSO2 Open Banking Key Manager. +* Import the public key certificate of the new server keystore to the truststore of WSO2 Open Banking Identity & Access Management Module. * If there are any client certificates, import them to the truststore as well. -##### 3. Add the new keystore and truststore to WSO2 Open Banking Key Manager. +##### 3. Add the new keystore and truststore to WSO2 Open Banking Identity & Access Management Module. * Copy the generated keystore to `/repository/resources/security`. * Replace the existing `/repository/resources/security/client-truststore.jks` with the truststore updated in step 2 * To configure the keystore and trustore follow [Configuring KeyStores](https://docs.wso2.com/display/ADMIN44x/Configuring+Keystores+in+WSO2+Products). -##### 4. Build the Docker Image for Open Banking Key Manager. +##### 4. Build the Docker Image for Open Banking Identity & Access Management Module. Build the Docker Image following the above steps. diff --git a/dockerfiles/alpine/obkm/docker-entrypoint.sh b/dockerfiles/alpine/obiam/docker-entrypoint.sh similarity index 100% rename from dockerfiles/alpine/obkm/docker-entrypoint.sh rename to dockerfiles/alpine/obiam/docker-entrypoint.sh diff --git a/dockerfiles/ubuntu/obkm/Dockerfile b/dockerfiles/ubuntu/obiam/Dockerfile similarity index 100% rename from dockerfiles/ubuntu/obkm/Dockerfile rename to dockerfiles/ubuntu/obiam/Dockerfile diff --git a/dockerfiles/ubuntu/obkm/README.md b/dockerfiles/ubuntu/obiam/README.md similarity index 80% rename from dockerfiles/ubuntu/obkm/README.md rename to dockerfiles/ubuntu/obiam/README.md index bb0955e..2b1bd8b 100644 --- a/dockerfiles/ubuntu/obkm/README.md +++ b/dockerfiles/ubuntu/obiam/README.md @@ -1,11 +1,11 @@ -# Dockerfile for WSO2 Open Banking Key Manager # -This section defines the step-by-step instructions to build an [Ubuntu](https://hub.docker.com/_/ubuntu/) Linux based Docker image for WSO2 Open Banking Key Manager. +# Dockerfile for WSO2 Open Banking Identity & Access Management Module # +This section defines the step-by-step instructions to build an [Ubuntu](https://hub.docker.com/_/ubuntu/) Linux based Docker image for WSO2 Open Banking Identity & Access Management Module. ## Prerequisites * [Docker](https://www.docker.com/get-docker) v17.09.0 or above * [Git](https://git-scm.com/book/en/v2/Getting-Started-Installing-Git) client -* WSO2 Open Banking Key Manager pack downloaded through [WUM](https://docs.wso2.com/display/OB200/Setting+Up+Servers) +* WSO2 Open Banking Identity & Access Management Module pack downloaded through [WUM](https://docs.wso2.com/display/OB200/Setting+Up+Servers) + Host the downloaded pack locally or on a remote location. > The hosted location will be passed as the build argument `WSO2_SERVER_DIST_URL` when building the Docker image. @@ -17,11 +17,11 @@ This section defines the step-by-step instructions to build an [Ubuntu](https:// git clone https://github.com/wso2/docker-open-banking.git ``` -> The local copy of the `dockerfiles/ubuntu/obkm` directory will be referred to as `OBKM_DOCKERFILE_HOME` from this point onwards. +> The local copy of the `dockerfiles/ubuntu/obiam` directory will be referred to as `OBIAM_DOCKERFILE_HOME` from this point onwards. ##### 2. Build the Docker image. -- Navigate to `` directory.
+- Navigate to `` directory.
Execute `docker build` command as shown below. + `docker build --build-arg WSO2_SERVER_DIST_URL= -t wso2-obiam:2.0.0 .` > eg:- Hosted locally: `docker build --build-arg WSO2_SERVER_DIST_URL=http://172.17.0.1:8000/wso2-obiam:2.0.0.zip -t wso2-obiam:2.0.0 .` @@ -43,9 +43,9 @@ git clone https://github.com/wso2/docker-open-banking.git Configurations would lie on the Docker host machine and they can be volume mounted to the container.
As an example, steps required to change the port offset using `carbon.xml` is as follows: -##### 1. Stop the Key Manager container if it's already running. +##### 1. Stop the Identity & Access Management Module container if it's already running. -In WSO2 Open Banking Key Manager 2.0.0 product distribution, `carbon.xml` configuration file
+In WSO2 Open Banking Identity & Access Management Module 2.0.0 product distribution, `carbon.xml` configuration file
can be found at `/repository/conf`. Copy the file to some suitable location of the host machine,
referred to as `/carbon.xml` and change the offset value under ports to 1. @@ -74,16 +74,16 @@ Follow the steps given in [Creating a new keystore](https://docs.wso2.com/displa ##### 2. Import the certificate of the keystores to the truststore. -* Import the public key certificate of the new server keystore to the truststore of WSO2 Open Banking Key Manager. +* Import the public key certificate of the new server keystore to the truststore of WSO2 Open Banking Identity & Access Management Module. * If there are any client certificates, import them to the truststore as well. -##### 3. Add the new keystore and truststore to WSO2 Open Banking Key Manager. +##### 3. Add the new keystore and truststore to WSO2 Open Banking Identity & Access Management Module. * Copy the generated keystore to `/repository/resources/security`. * Replace the existing `/repository/resources/security/client-truststore.jks` with the truststore updated in step 2 * To configure the keystore and trustore follow [Configuring KeyStores](https://docs.wso2.com/display/ADMIN44x/Configuring+Keystores+in+WSO2+Products). -##### 4. Build the Docker Image for Open Banking Key Manager. +##### 4. Build the Docker Image for Open Banking Identity & Access Management Module. Build the Docker Image following the above steps. diff --git a/dockerfiles/ubuntu/obkm/docker-entrypoint.sh b/dockerfiles/ubuntu/obiam/docker-entrypoint.sh similarity index 100% rename from dockerfiles/ubuntu/obkm/docker-entrypoint.sh rename to dockerfiles/ubuntu/obiam/docker-entrypoint.sh