Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Accelerator 4] Modifying root and module poms, module names and removing BI accelerator implementations #106

Merged
merged 4 commits into from
Aug 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2023, WSO2 LLC. (https://www.wso2.com).
# Copyright (c) 2024, WSO2 LLC. (https://www.wso2.com).
#
# WSO2 LLC. licenses this file to you under the Apache License,
# Version 2.0 (the "License"); you may not use this file except
Expand All @@ -14,7 +14,7 @@
# specific language governing permissions and limitations
# under the License.

name: Build Open Banking Repository
name: Build Financial Services Repository

on:
# Triggers the workflow on push or pull request events but only for the master branch
Expand Down
3 changes: 1 addition & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,11 @@ plugins/ios.json
www/
$RECYCLE.BIN/
node_modules/

**/webapps

#mac
.DS_Store


# React dashboard ignore
.DS_STORE
**/node_modules/
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2023-2024, WSO2 LLC. (https://www.wso2.com).
# Copyright (c) 2024, WSO2 LLC. (https://www.wso2.com).
#
# WSO2 LLC. licenses this file to you under the Apache License,
# Version 2.0 (the "License"); you may not use this file except
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
# Copyright (c) 2023, WSO2 LLC. (https://www.wso2.com).
# Copyright (c) 2024, WSO2 LLC. (https://www.wso2.com).
#
# WSO2 LLC. licenses this file to you under the Apache License,
# Version 2.0 (the "License"); you may not use this file except
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2023-2024, WSO2 LLC. (https://www.wso2.com).
# Copyright (c) 2024, WSO2 LLC. (https://www.wso2.com).
#
# WSO2 LLC. licenses this file to you under the Apache License,
# Version 2.0 (the "License"); you may not use this file except
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
# Copyright (c) 2023, WSO2 LLC. (https://www.wso2.com).
# Copyright (c) 2024, WSO2 LLC. (https://www.wso2.com).
#
# WSO2 LLC. licenses this file to you under the Apache License,
# Version 2.0 (the "License"); you may not use this file except
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright (c) 2023, WSO2 LLC. (https://www.wso2.com).
~ Copyright (c) 2024, WSO2 LLC. (https://www.wso2.com).
~
~ WSO2 LLC. licenses this file to you under the Apache License,
~ Version 2.0 (the "License"); you may not use this file except
Expand All @@ -17,7 +17,7 @@
~ under the License.
-->

<Server xmlns="http://wso2.org/projects/carbon/open-banking.xml">
<Server xmlns="http://wso2.org/projects/carbon/financial-services.xml">
<Gateway>
<RequestRouter>com.wso2.openbanking.accelerator.gateway.executor.core.DefaultRequestRouter</RequestRouter>
<!-- Custom Throttle Data publisher -->
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!--
~ Copyright (c) 2023, WSO2 LLC. (https://www.wso2.com).
~ Copyright (c) 2024, WSO2 LLC. (https://www.wso2.com).
~
~ WSO2 LLC. licenses this file to you under the Apache License,
~ Version 2.0 (the "License"); you may not use this file except
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright (c) 2023-2024, WSO2 LLC. (https://www.wso2.com).
~ Copyright (c) 2024, WSO2 LLC. (https://www.wso2.com).
~
~ WSO2 LLC. licenses this file to you under the Apache License,
~ Version 2.0 (the "License"); you may not use this file except
Expand All @@ -17,7 +17,7 @@
~ under the License.
-->

<Server xmlns="http://wso2.org/projects/carbon/open-banking.xml">
<Server xmlns="http://wso2.org/projects/carbon/financial-services.xml">
<Common>
<Identity>
<Cache>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright (c) 2023, WSO2 LLC. (https://www.wso2.com).
~ Copyright (c) 2024, WSO2 LLC. (https://www.wso2.com).
~
~ WSO2 LLC. licenses this file to you under the Apache License,
~ Version 2.0 (the "License"); you may not use this file except
Expand All @@ -23,19 +23,19 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>com.wso2.openbanking.accelerator</groupId>
<artifactId>open-banking</artifactId>
<version>3.2.0-SNAPSHOT</version>
<artifactId>financial-services-accelerator-modules</artifactId>
<groupId>org.wso2.financial.services.accelerator</groupId>
<version>4.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>wso2-obam-accelerator</artifactId>
<artifactId>wso2-financial-services-am-accelerator</artifactId>
<packaging>pom</packaging>
<name>WSO2 Open Banking - API Manager Accelerator Module</name>
<name>WSO2 Financial Services - API Manager Accelerator Module</name>
<url>http://wso2.org</url>

<properties>
<ob-apim>${basedir}</ob-apim>
<fs-apim>${basedir}</fs-apim>
</properties>

<build>
Expand Down Expand Up @@ -82,37 +82,37 @@
<!-- Copying jars to dropins -->
<copy todir="${project.basedir}/carbon-home/repository/components/dropins" overwrite="true">
<fileset
dir="../../components/com.wso2.openbanking.accelerator.common/target">
dir="../../components/org.wso2.financial.services.accelerator.common/target">
<filename
regex="com.wso2.openbanking.accelerator.common-(\d.*?)\.jar$"/>
regex="org.wso2.financial.services.accelerator.common-(\d.*?)\.jar$"/>
</fileset>
</copy>
<copy todir="${project.basedir}/carbon-home/repository/components/dropins" overwrite="true">
<fileset
dir="../../components/com.wso2.openbanking.accelerator.gateway/target">
dir="../../components/org.wso2.financial.services.accelerator.gateway/target">
<filename
regex="com.wso2.openbanking.accelerator.gateway-(\d.*?)\.jar$"/>
regex="org.wso2.financial.services.accelerator.gateway-(\d.*?)\.jar$"/>
</fileset>
</copy>
<copy todir="${project.basedir}/carbon-home/repository/components/dropins" overwrite="true">
<fileset
dir="../../components/com.wso2.openbanking.accelerator.data.publisher/com.wso2.openbanking.accelerator.data.publisher.common/target">
dir="../../components/org.wso2.financial.services.accelerator.data.publisher/org.wso2.financial.services.accelerator.data.publisher.common/target">
<filename
regex="com.wso2.openbanking.accelerator.data.publisher.common-(\d.*?)\.jar$"/>
regex="org.wso2.financial.services.accelerator.data.publisher.common-(\d.*?)\.jar$"/>
</fileset>
</copy>
<copy todir="${project.basedir}/carbon-home/repository/components/dropins" overwrite="true">
<fileset
dir="../../components/com.wso2.openbanking.accelerator.keymanager/target">
dir="../../components/org.wso2.financial.services.accelerator.keymanager/target">
<filename
regex="com.wso2.openbanking.accelerator.keymanager-(\d.*?)\.jar$"/>
regex="org.wso2.financial.services.accelerator.keymanager-(\d.*?)\.jar$"/>
</fileset>
</copy>
<copy todir="${project.basedir}/carbon-home/repository/deployment/server/webapps" overwrite="true">
<fileset
dir="../../internal-apis/internal-webapps/com.wso2.openbanking.accelerator.demo.backend/target">
dir="../../internal-apis/internal-webapps/org.wso2.financial.services.accelerator.demo.backend/target">
<filename
regex="api#openbanking#backend.war$"/>
regex="api#financialservices#backend.war$"/>
</fileset>
</copy>
</target>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2023, WSO2 LLC. (https://www.wso2.com).
# Copyright (c) 2024, WSO2 LLC. (https://www.wso2.com).
#
# WSO2 LLC. licenses this file to you under the Apache License,
# Version 2.0 (the "License"); you may not use this file except
Expand All @@ -20,8 +20,8 @@ IS_HOSTNAME=localhost
BI_HOSTNAME=localhost

# Specify the deployment.toml file containing the required configurations based on the APIM version being used
# As an example if APIM 4.1.0 version is used change the file name to wso2am-4.1.0-deployment.toml in the same file path
PRODUCT_CONF_PATH=repository/resources/wso2am-4.2.0-deployment.toml
# As an example if APIM 4.3.0 version is used change the file name to wso2am-4.3.0-deployment.toml in the same file path
PRODUCT_CONF_PATH=repository/resources/wso2am-4.3.0-deployment.toml

# Configure databases related properties
DB_TYPE=mysql
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!--
~ Copyright (c) 2023, WSO2 LLC. (https://www.wso2.com).
~ Copyright (c) 2024, WSO2 LLC. (https://www.wso2.com).
~
~ WSO2 LLC. licenses this file to you under the Apache License,
~ Version 2.0 (the "License"); you may not use this file except
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!--
~ Copyright (c) 2023, WSO2 LLC. (https://www.wso2.com).
~ Copyright (c) 2024, WSO2 LLC. (https://www.wso2.com).
~
~ WSO2 LLC. licenses this file to you under the Apache License,
~ Version 2.0 (the "License"); you may not use this file except
Expand All @@ -18,9 +18,9 @@
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
<id>ob.iam.accelerator</id>
<id>fs.am.accelerator</id>
<includeBaseDirectory>true</includeBaseDirectory>
<baseDirectory>wso2-obiam-accelerator-${project.version}</baseDirectory>
<baseDirectory>wso2-fs-am-accelerator-${project.version}</baseDirectory>

<formats>
<format>zip</format>
Expand All @@ -41,5 +41,4 @@
<source>${project.basedir}/README.md</source>
</file>
</files>

</assembly>
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2023-2024, WSO2 LLC. (https://www.wso2.com).
# Copyright (c) 2024, WSO2 LLC. (https://www.wso2.com).
#
# WSO2 LLC. licenses this file to you under the Apache License,
# Version 2.0 (the "License"); you may not use this file except
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
# Copyright (c) 2023, WSO2 LLC. (https://www.wso2.com).
# Copyright (c) 2024, WSO2 LLC. (https://www.wso2.com).
#
# WSO2 LLC. licenses this file to you under the Apache License,
# Version 2.0 (the "License"); you may not use this file except
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2023-2024, WSO2 LLC. (https://www.wso2.com).
# Copyright (c) 2024, WSO2 LLC. (https://www.wso2.com).
#
# WSO2 LLC. licenses this file to you under the Apache License,
# Version 2.0 (the "License"); you may not use this file except
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
# Copyright (c) 2023, WSO2 LLC. (https://www.wso2.com).
# Copyright (c) 2024, WSO2 LLC. (https://www.wso2.com).
#
# WSO2 LLC. licenses this file to you under the Apache License,
# Version 2.0 (the "License"); you may not use this file except
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright (c) 2023, WSO2 LLC. (https://www.wso2.com).
* Copyright (c) 2024, WSO2 LLC. (https://www.wso2.com).
*
* WSO2 LLC. licenses this file to you under the Apache License,
* Version 2.0 (the "License"); you may not use this file except
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright (c) 2023, WSO2 LLC. (https://www.wso2.com).
* Copyright (c) 2024, WSO2 LLC. (https://www.wso2.com).
*
* WSO2 LLC. licenses this file to you under the Apache License,
* Version 2.0 (the "License"); you may not use this file except
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright (c) 2023, WSO2 LLC. (https://www.wso2.com).
* Copyright (c) 2024, WSO2 LLC. (https://www.wso2.com).
*
* WSO2 LLC. licenses this file to you under the Apache License,
* Version 2.0 (the "License"); you may not use this file except
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright (c) 2023, WSO2 LLC. (https://www.wso2.com).
* Copyright (c) 2024, WSO2 LLC. (https://www.wso2.com).
*
* WSO2 LLC. licenses this file to you under the Apache License,
* Version 2.0 (the "License"); you may not use this file except
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright (c) 2023, WSO2 LLC. (https://www.wso2.com).
* Copyright (c) 2024, WSO2 LLC. (https://www.wso2.com).
*
* WSO2 LLC. licenses this file to you under the Apache License,
* Version 2.0 (the "License"); you may not use this file except
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright (c) 2023, WSO2 LLC. (https://www.wso2.com).
* Copyright (c) 2024, WSO2 LLC. (https://www.wso2.com).
*
* WSO2 LLC. licenses this file to you under the Apache License,
* Version 2.0 (the "License"); you may not use this file except
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright (c) 2023, WSO2 LLC. (https://www.wso2.com).
* Copyright (c) 2024, WSO2 LLC. (https://www.wso2.com).
*
* WSO2 LLC. licenses this file to you under the Apache License,
* Version 2.0 (the "License"); you may not use this file except
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright (c) 2023, WSO2 LLC. (https://www.wso2.com).
* Copyright (c) 2024, WSO2 LLC. (https://www.wso2.com).
*
* WSO2 LLC. licenses this file to you under the Apache License,
* Version 2.0 (the "License"); you may not use this file except
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright (c) 2023, WSO2 LLC. (https://www.wso2.com).
* Copyright (c) 2024, WSO2 LLC. (https://www.wso2.com).
*
* WSO2 LLC. licenses this file to you under the Apache License,
* Version 2.0 (the "License"); you may not use this file except
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright (c) 2023, WSO2 LLC. (https://www.wso2.com).
* Copyright (c) 2024, WSO2 LLC. (https://www.wso2.com).
*
* WSO2 LLC. licenses this file to you under the Apache License,
* Version 2.0 (the "License"); you may not use this file except
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright (c) 2023, WSO2 LLC. (https://www.wso2.com).
* Copyright (c) 2024, WSO2 LLC. (https://www.wso2.com).
*
* WSO2 LLC. licenses this file to you under the Apache License,
* Version 2.0 (the "License"); you may not use this file except
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright (c) 2023, WSO2 LLC. (https://www.wso2.com).
* Copyright (c) 2024, WSO2 LLC. (https://www.wso2.com).
*
* WSO2 LLC. licenses this file to you under the Apache License,
* Version 2.0 (the "License"); you may not use this file except
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright (c) 2023, WSO2 LLC. (https://www.wso2.com).
* Copyright (c) 2024, WSO2 LLC. (https://www.wso2.com).
*
* WSO2 LLC. licenses this file to you under the Apache License,
* Version 2.0 (the "License"); you may not use this file except
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright (c) 2023, WSO2 LLC. (https://www.wso2.com).
* Copyright (c) 2024, WSO2 LLC. (https://www.wso2.com).
*
* WSO2 LLC. licenses this file to you under the Apache License,
* Version 2.0 (the "License"); you may not use this file except
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright (c) 2023, WSO2 LLC. (https://www.wso2.com).
~ Copyright (c) 2024, WSO2 LLC. (https://www.wso2.com).
~
~ WSO2 LLC. licenses this file to you under the Apache License,
~ Version 2.0 (the "License"); you may not use this file except
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright (c) 2023, WSO2 LLC. (https://www.wso2.com).
~ Copyright (c) 2024, WSO2 LLC. (https://www.wso2.com).
~
~ WSO2 LLC. licenses this file to you under the Apache License,
~ Version 2.0 (the "License"); you may not use this file except
Expand Down
Loading
Loading