Merge branch 'wso2:master' into master

wso2 · May 3, 2024 · a7615fb · a7615fb
2 parents b426237 + 4e39f38
commit a7615fb
Show file tree

Hide file tree

Showing 55 changed files with 35,597 additions and 14,941 deletions.
diff --git a/petcare-sample/b2c/web-app/petdesk/README.md b/petcare-sample/b2c/web-app/petdesk/README.md
@@ -11,7 +11,7 @@
     ```
     bal run
     ```
-1. Navigate to <PROJECT_HOME>/petcare-sample/b2c/web-app/petdesk/apis/ballerina/billing-management-service and start the 
+2. Navigate to <PROJECT_HOME>/petcare-sample/b2c/web-app/petdesk/apis/ballerina/billing-management-service and start the 
    pet management service by executing the following command in the terminal.
     ```
     bal run
@@ -44,7 +44,7 @@ dbPort = "<DB_PORT>"
     clientID: "<CONFIGURED_SPA_CLIENT_ID>",
     signInRedirectURL: "http://localhost:5173",
     signOutRedirectURL: "http://localhost:5173",
-    resourceServerURL: "http://localhost:9090",
+    petManagementServiceURL: "http://localhost:9090",
     billingServerURL: "http://localhost:9091",
     scope: ["openid", "email", "profile"]
    ```

diff --git a/petcare-sample/b2c/web-app/petdesk/apis/ballerina/billing-management-service/Ballerina.toml b/petcare-sample/b2c/web-app/petdesk/apis/ballerina/billing-management-service/Ballerina.toml
@@ -1,5 +1,5 @@
 [package]
-org = "sachinm"
+org = "WSO2"
 name = "billing_management_service"
 version = "0.1.0"
 distribution = "2201.3.2"

diff --git a/...re-sample/b2c/web-app/petdesk/apis/ballerina/billing-management-service/Dependencies.toml b/...re-sample/b2c/web-app/petdesk/apis/ballerina/billing-management-service/Dependencies.toml
@@ -292,7 +292,7 @@ modules = [
 ]
 
 [[package]]
-org = "sachinm"
+org = "WSO2"
 name = "billing_management_service"
 version = "0.1.0"
 dependencies = [
@@ -301,7 +301,7 @@ dependencies = [
 	{org = "ballerinai", name = "observe"}
 ]
 modules = [
-	{org = "sachinm", packageName = "billing_management_service", moduleName = "billing_management_service"}
+	{org = "WSO2", packageName = "billing_management_service", moduleName = "billing_management_service"}
 ]
 
 
diff --git a/...mple/b2c/web-app/petdesk/apis/ballerina/salesforce-integration-service/.devcontainer.json b/...mple/b2c/web-app/petdesk/apis/ballerina/salesforce-integration-service/.devcontainer.json
@@ -0,0 +1,4 @@
+{
+    "image": "ballerina/ballerina-devcontainer:2201.3.2",
+    "extensions": ["WSO2.ballerina"],
+}
diff --git a/petcare-sample/b2c/web-app/petdesk/apis/ballerina/salesforce-integration-service/.gitignore b/petcare-sample/b2c/web-app/petdesk/apis/ballerina/salesforce-integration-service/.gitignore
@@ -0,0 +1 @@
+target
diff --git a/...e-sample/b2c/web-app/petdesk/apis/ballerina/salesforce-integration-service/Ballerina.toml b/...e-sample/b2c/web-app/petdesk/apis/ballerina/salesforce-integration-service/Ballerina.toml
@@ -0,0 +1,8 @@
+[package]
+org = "WSO2"
+name = "salesforce_integration_service"
+version = "0.1.0"
+distribution = "2201.3.2"
+
+[build-options]
+observabilityIncluded = true