From eab8bf58bb1eeb8d744f98ada55cfdc2a26c43ba Mon Sep 17 00:00:00 2001 From: siasin Date: Mon, 7 Apr 2025 14:42:10 +0200 Subject: [PATCH 1/7] use Jakarta instead of Javax and update copyrights --- .../businessvalueeditor/OfferValueEditorProvider.java | 2 +- .../java/businessvalueeditor/SampleDataProvider.java | 2 +- .../businessvalueeditor/SampleValueEditorServlet.java | 11 +++++------ .../java/servervalueeditor/FilterValueTranslator.java | 2 +- .../js/custom/valueeditors/OfferValueEditor.js | 2 +- 5 files changed, 9 insertions(+), 10 deletions(-) diff --git a/decisioncenter/businessvalueeditor/businessvalueeditor-source/src/main/java/businessvalueeditor/OfferValueEditorProvider.java b/decisioncenter/businessvalueeditor/businessvalueeditor-source/src/main/java/businessvalueeditor/OfferValueEditorProvider.java index 39d95e5..4447129 100644 --- a/decisioncenter/businessvalueeditor/businessvalueeditor-source/src/main/java/businessvalueeditor/OfferValueEditorProvider.java +++ b/decisioncenter/businessvalueeditor/businessvalueeditor-source/src/main/java/businessvalueeditor/OfferValueEditorProvider.java @@ -1,7 +1,7 @@ /* * Licensed Materials - Property of IBM * 5725-B69 5655-Y17 5724-Y00 5724-Y17 5655-V84 -* Copyright IBM Corp. 2009, 2024. All Rights Reserved. +* Copyright IBM Corp. 2009, 2025. All Rights Reserved. * * Note to U.S. Government Users Restricted Rights: * Use, duplication or disclosure restricted by GSA ADP Schedule diff --git a/decisioncenter/businessvalueeditor/businessvalueeditor-source/src/main/java/businessvalueeditor/SampleDataProvider.java b/decisioncenter/businessvalueeditor/businessvalueeditor-source/src/main/java/businessvalueeditor/SampleDataProvider.java index 893a847..8bde55b 100644 --- a/decisioncenter/businessvalueeditor/businessvalueeditor-source/src/main/java/businessvalueeditor/SampleDataProvider.java +++ b/decisioncenter/businessvalueeditor/businessvalueeditor-source/src/main/java/businessvalueeditor/SampleDataProvider.java @@ -1,7 +1,7 @@ /* * Licensed Materials - Property of IBM * 5725-B69 5655-Y17 5724-Y00 5724-Y17 5655-V84 -* Copyright IBM Corp. 2009, 2024. All Rights Reserved. +* Copyright IBM Corp. 2009, 2025. All Rights Reserved. * * Note to U.S. Government Users Restricted Rights: * Use, duplication or disclosure restricted by GSA ADP Schedule diff --git a/decisioncenter/businessvalueeditor/businessvalueeditor-source/src/main/java/businessvalueeditor/SampleValueEditorServlet.java b/decisioncenter/businessvalueeditor/businessvalueeditor-source/src/main/java/businessvalueeditor/SampleValueEditorServlet.java index 888156c..6f5b5b8 100644 --- a/decisioncenter/businessvalueeditor/businessvalueeditor-source/src/main/java/businessvalueeditor/SampleValueEditorServlet.java +++ b/decisioncenter/businessvalueeditor/businessvalueeditor-source/src/main/java/businessvalueeditor/SampleValueEditorServlet.java @@ -1,7 +1,7 @@ /* * Licensed Materials - Property of IBM * 5725-B69 5655-Y17 5724-Y00 5724-Y17 5655-V84 -* Copyright IBM Corp. 2009, 2024. All Rights Reserved. +* Copyright IBM Corp. 2009, 2025. All Rights Reserved. * * Note to U.S. Government Users Restricted Rights: * Use, duplication or disclosure restricted by GSA ADP Schedule @@ -15,15 +15,14 @@ import ilog.rules.brl.value.descriptor.IlrValueDescriptorFactory; import ilog.rules.vocabulary.model.IlrConcept; import ilog.rules.vocabulary.model.IlrVocabulary; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.Locale; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - import com.ibm.bdsl.web.editor.IntelliTextEditorEnvironment; import com.ibm.json.java.JSONArray; import com.ibm.json.java.JSONObject; diff --git a/decisioncenter/businessvalueeditor/businessvalueeditor-source/src/main/java/servervalueeditor/FilterValueTranslator.java b/decisioncenter/businessvalueeditor/businessvalueeditor-source/src/main/java/servervalueeditor/FilterValueTranslator.java index fc05507..65140e4 100644 --- a/decisioncenter/businessvalueeditor/businessvalueeditor-source/src/main/java/servervalueeditor/FilterValueTranslator.java +++ b/decisioncenter/businessvalueeditor/businessvalueeditor-source/src/main/java/servervalueeditor/FilterValueTranslator.java @@ -1,7 +1,7 @@ /* * Licensed Materials - Property of IBM * 5725-B69 5655-Y17 5724-Y00 5724-Y17 5655-V84 -* Copyright IBM Corp. 2009, 2024. All Rights Reserved. +* Copyright IBM Corp. 2009, 2025. All Rights Reserved. * * Note to U.S. Government Users Restricted Rights: * Use, duplication or disclosure restricted by GSA ADP Schedule diff --git a/decisioncenter/businessvalueeditor/businessvalueeditor-source/src/main/resources/js/custom/valueeditors/OfferValueEditor.js b/decisioncenter/businessvalueeditor/businessvalueeditor-source/src/main/resources/js/custom/valueeditors/OfferValueEditor.js index 33694ed..0339510 100644 --- a/decisioncenter/businessvalueeditor/businessvalueeditor-source/src/main/resources/js/custom/valueeditors/OfferValueEditor.js +++ b/decisioncenter/businessvalueeditor/businessvalueeditor-source/src/main/resources/js/custom/valueeditors/OfferValueEditor.js @@ -1,7 +1,7 @@ /* * Licensed Materials - Property of IBM * 5725-B69 5655-Y17 - * Copyright IBM Corp. 2013, 2020. All Rights Reserved + * Copyright IBM Corp. 2013, 2025. All Rights Reserved * US Government Users Restricted Rights - Use, duplication or * disclosure restricted by GSA ADP Schedule Contract with * IBM Corp. From 3ab2b496bca5e8c59399aec44e015995c1d0b1a1 Mon Sep 17 00:00:00 2001 From: siasin Date: Mon, 7 Apr 2025 16:42:24 +0200 Subject: [PATCH 2/7] updates wrt ODM 9.5 --- decisioncenter/businessvalueeditor/README.md | 6 +++--- .../businessvalueeditor-source/compose-odm-dev.yml | 4 ++-- .../businessvalueeditor/businessvalueeditor-source/pom.xml | 1 + 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/decisioncenter/businessvalueeditor/README.md b/decisioncenter/businessvalueeditor/README.md index 4d4a545..c860d50 100644 --- a/decisioncenter/businessvalueeditor/README.md +++ b/decisioncenter/businessvalueeditor/README.md @@ -47,9 +47,9 @@ To use the sample in Decision Center, you need to build a JAR for [Docker](READM 2. Build the JAR - The instructions below enable to build the JAR using a Docker container featuring Maven and a JDK version 17. + The instructions below enable to build the JAR using a Docker container featuring Maven and a JDK version 21. - For ODM 8.12, you must use **maven:3.8.1-openjdk-11** instead and **maven:3.8-adoptopenjdk-8** for earlier releases. + For ODM 9.0, use **maven:3.8.5-openjdk-17**. As for ODM 8.12, use **maven:3.8.1-openjdk-11** instead and **maven:3.8-adoptopenjdk-8** for earlier releases. Run the command below in the **decisioncenter/businessvalueeditor/businessvalueeditor-source** directory: @@ -57,7 +57,7 @@ To use the sample in Decision Center, you need to build a JAR for [Docker](READM docker run --rm \ -v "$(pwd)":/usr/src/sample \ -w /usr/src/sample \ - maven:3.8.5-openjdk-17 \ + maven:3.9.9-ibm-semeru-21-jammy \ mvn clean install ``` diff --git a/decisioncenter/businessvalueeditor/businessvalueeditor-source/compose-odm-dev.yml b/decisioncenter/businessvalueeditor/businessvalueeditor-source/compose-odm-dev.yml index 7b6b5b0..2a13eb8 100644 --- a/decisioncenter/businessvalueeditor/businessvalueeditor-source/compose-odm-dev.yml +++ b/decisioncenter/businessvalueeditor/businessvalueeditor-source/compose-odm-dev.yml @@ -1,6 +1,6 @@ services: odm: - image: icr.io/cpopen/odm-k8s/odm:9.0.0 + image: icr.io/cpopen/odm-k8s/odm:9.5.0 mem_limit: 4G memswap_limit: 4G user: "1001:0" @@ -12,7 +12,7 @@ services: - 9453:9453 odm-with-custom-value-editor: - image: icr.io/cpopen/odm-k8s/odm:9.0.0 + image: icr.io/cpopen/odm-k8s/odm:9.5.0 mem_limit: 4G memswap_limit: 4G user: "1001:0" diff --git a/decisioncenter/businessvalueeditor/businessvalueeditor-source/pom.xml b/decisioncenter/businessvalueeditor/businessvalueeditor-source/pom.xml index d4306c3..b36ac92 100644 --- a/decisioncenter/businessvalueeditor/businessvalueeditor-source/pom.xml +++ b/decisioncenter/businessvalueeditor/businessvalueeditor-source/pom.xml @@ -54,6 +54,7 @@ org.apache.maven.plugins maven-compiler-plugin + 3.14.0 default-compile From 8ae6c60a919e3ba91cca9bee5309eb45661e79f7 Mon Sep 17 00:00:00 2001 From: siasin Date: Wed, 9 Apr 2025 09:50:14 +0200 Subject: [PATCH 3/7] use target instead of tasks --- .../businessvalueeditor-source/pom.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/decisioncenter/businessvalueeditor/businessvalueeditor-source/pom.xml b/decisioncenter/businessvalueeditor/businessvalueeditor-source/pom.xml index b36ac92..5919434 100644 --- a/decisioncenter/businessvalueeditor/businessvalueeditor-source/pom.xml +++ b/decisioncenter/businessvalueeditor/businessvalueeditor-source/pom.xml @@ -21,8 +21,8 @@ run - - + @@ -30,7 +30,7 @@ - + @@ -40,12 +40,12 @@ run - + - + From 2480687536b29c212e270c7c5a3687dabf88e80b Mon Sep 17 00:00:00 2001 From: siasin Date: Wed, 9 Apr 2025 11:41:51 +0200 Subject: [PATCH 4/7] Update readme about testing against ODM 9.0 or earlier --- decisioncenter/businessvalueeditor/README.md | 8 ++++++-- .../businessvalueeditor/SampleValueEditorServlet.java | 8 ++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/decisioncenter/businessvalueeditor/README.md b/decisioncenter/businessvalueeditor/README.md index c860d50..aa98f15 100644 --- a/decisioncenter/businessvalueeditor/README.md +++ b/decisioncenter/businessvalueeditor/README.md @@ -49,8 +49,6 @@ To use the sample in Decision Center, you need to build a JAR for [Docker](READM The instructions below enable to build the JAR using a Docker container featuring Maven and a JDK version 21. - For ODM 9.0, use **maven:3.8.5-openjdk-17**. As for ODM 8.12, use **maven:3.8.1-openjdk-11** instead and **maven:3.8-adoptopenjdk-8** for earlier releases. - Run the command below in the **decisioncenter/businessvalueeditor/businessvalueeditor-source** directory: ```bash @@ -65,6 +63,12 @@ To use the sample in Decision Center, you need to build a JAR for [Docker](READM The ZIP that will be used on [Kubernetes](README-KUBERNETES.md) is generated in the **target** directory and is named **businessvalueeditor-1.0.zip**. + > *Note*: + > 1. If you are testing against ODM 9.0 or earlier, you need to edit the `odm-container-samples/decisioncenter/businessvalueeditor/businessvalueeditor-source/src/main/java/SampleValueEditorServlet.java` file. + > - Remove the `jakarta.servlet` imports. + > - Uncomment the `javax.servlet` imports and save the file. + > 2. For ODM 9.0, use **maven:3.8.5-openjdk-17**. As for ODM 8.12, use **maven:3.8.1-openjdk-11** instead and **maven:3.8-adoptopenjdk-8** for earlier releases. + ### 3) Instructions to use the sample in Decision Center Click one of the links below: diff --git a/decisioncenter/businessvalueeditor/businessvalueeditor-source/src/main/java/businessvalueeditor/SampleValueEditorServlet.java b/decisioncenter/businessvalueeditor/businessvalueeditor-source/src/main/java/businessvalueeditor/SampleValueEditorServlet.java index 6f5b5b8..c2fa10b 100644 --- a/decisioncenter/businessvalueeditor/businessvalueeditor-source/src/main/java/businessvalueeditor/SampleValueEditorServlet.java +++ b/decisioncenter/businessvalueeditor/businessvalueeditor-source/src/main/java/businessvalueeditor/SampleValueEditorServlet.java @@ -15,11 +15,19 @@ import ilog.rules.brl.value.descriptor.IlrValueDescriptorFactory; import ilog.rules.vocabulary.model.IlrConcept; import ilog.rules.vocabulary.model.IlrVocabulary; +//ODM 9.5 onwards import jakarta.servlet.ServletException; import jakarta.servlet.http.HttpServlet; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; +/* ODM 9.0 and earlier +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +*/ + import java.io.IOException; import java.util.Locale; From ad2c3b24f691954d28fa5274d5b4402ab23c4155 Mon Sep 17 00:00:00 2001 From: siasin Date: Thu, 10 Apr 2025 11:20:20 +0200 Subject: [PATCH 5/7] update to only support V9.5 --- .../businessvalueeditor/README-KUBERNETES.md | 18 +++++++++++++++--- decisioncenter/businessvalueeditor/README.md | 9 ++------- .../businessvalueeditor-source/.project | 17 +++++++++++++++++ .../compose-odm-dev.yml | 4 ++-- .../SampleValueEditorServlet.java | 7 ------- 5 files changed, 36 insertions(+), 19 deletions(-) diff --git a/decisioncenter/businessvalueeditor/README-KUBERNETES.md b/decisioncenter/businessvalueeditor/README-KUBERNETES.md index 4b6d876..74b5c4a 100644 --- a/decisioncenter/businessvalueeditor/README-KUBERNETES.md +++ b/decisioncenter/businessvalueeditor/README-KUBERNETES.md @@ -12,10 +12,22 @@ Any file server reachable by Decision Center is suitable. You can either use an existing one or follow the instructions [here](https://github.com/DecisionsDev/odm-docker-kubernetes/blob/vnext-release/contrib/file-server/README.md#setup-an-httpd-file-server) to deploy a httpd file server in a new pod. Upload the **businessvalueeditor-1.0.zip** file on the file server : -``` +```bash curl -T businessvalueeditor/businessvalueeditor-source/target/businessvalueeditor-1.0.zip $FILESERVER_URL ``` +If all goes well, you should have an output with `201` status that the zip resource is created: +``` + + + +201 Created + +

Created

+

Resource /businessvalueeditor-1.0.zip has been created.

+ +``` + ## 2. Deploying ODM To get access to the ODM material, you must have an IBM entitlement key to pull the images from the IBM Cloud Container registry. @@ -57,7 +69,7 @@ helm repo update ```bash $ helm search repo ibm-odm-prod NAME CHART VERSION APP VERSION DESCRIPTION -ibm-helm/ibm-odm-prod 24.0.0 9.0.0.0 IBM Operational Decision Manager +ibm-helm/ibm-odm-prod 25.0.0 9.5.0.0 IBM Operational Decision Manager ``` #### e. Install an IBM Operational Decision Manager release @@ -75,7 +87,7 @@ Add all the other parameters suitable to your platform in `values.yaml`. Check t If you are on OCP, you can use this [values.yaml](./businessvalueeditor-source/values.yaml) file by replacing `` by the actual URL of the file server hosting the JARs. ```bash -helm install businessvalueeditor-sample ibmcharts/ibm-odm-prod -f values.yaml +helm install businessvalueeditor-sample ibm-helm/ibm-odm-prod -f values.yaml ``` # Using the Sample diff --git a/decisioncenter/businessvalueeditor/README.md b/decisioncenter/businessvalueeditor/README.md index aa98f15..f3c98fd 100644 --- a/decisioncenter/businessvalueeditor/README.md +++ b/decisioncenter/businessvalueeditor/README.md @@ -47,9 +47,9 @@ To use the sample in Decision Center, you need to build a JAR for [Docker](READM 2. Build the JAR - The instructions below enable to build the JAR using a Docker container featuring Maven and a JDK version 21. + The instructions below allow you to build the JAR using a Docker container featuring Maven and a JDK version 21, compatible for ODM 9.5. - Run the command below in the **decisioncenter/businessvalueeditor/businessvalueeditor-source** directory: + Run the command in the **decisioncenter/businessvalueeditor/businessvalueeditor-source** directory: ```bash docker run --rm \ @@ -63,11 +63,6 @@ To use the sample in Decision Center, you need to build a JAR for [Docker](READM The ZIP that will be used on [Kubernetes](README-KUBERNETES.md) is generated in the **target** directory and is named **businessvalueeditor-1.0.zip**. - > *Note*: - > 1. If you are testing against ODM 9.0 or earlier, you need to edit the `odm-container-samples/decisioncenter/businessvalueeditor/businessvalueeditor-source/src/main/java/SampleValueEditorServlet.java` file. - > - Remove the `jakarta.servlet` imports. - > - Uncomment the `javax.servlet` imports and save the file. - > 2. For ODM 9.0, use **maven:3.8.5-openjdk-17**. As for ODM 8.12, use **maven:3.8.1-openjdk-11** instead and **maven:3.8-adoptopenjdk-8** for earlier releases. ### 3) Instructions to use the sample in Decision Center diff --git a/decisioncenter/businessvalueeditor/businessvalueeditor-source/.project b/decisioncenter/businessvalueeditor/businessvalueeditor-source/.project index a576b2b..293b683 100644 --- a/decisioncenter/businessvalueeditor/businessvalueeditor-source/.project +++ b/decisioncenter/businessvalueeditor/businessvalueeditor-source/.project @@ -10,8 +10,25 @@ + + org.eclipse.m2e.core.maven2Builder + + + + org.eclipse.m2e.core.maven2Nature org.eclipse.jdt.core.javanature + + + 1744028940722 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + diff --git a/decisioncenter/businessvalueeditor/businessvalueeditor-source/compose-odm-dev.yml b/decisioncenter/businessvalueeditor/businessvalueeditor-source/compose-odm-dev.yml index 2a13eb8..4a2e130 100644 --- a/decisioncenter/businessvalueeditor/businessvalueeditor-source/compose-odm-dev.yml +++ b/decisioncenter/businessvalueeditor/businessvalueeditor-source/compose-odm-dev.yml @@ -1,6 +1,6 @@ services: odm: - image: icr.io/cpopen/odm-k8s/odm:9.5.0 + image: icr.io/cpopen/odm-k8s/odm:9.5.0.0 mem_limit: 4G memswap_limit: 4G user: "1001:0" @@ -12,7 +12,7 @@ services: - 9453:9453 odm-with-custom-value-editor: - image: icr.io/cpopen/odm-k8s/odm:9.5.0 + image: icr.io/cpopen/odm-k8s/odm:9.5.0.0 mem_limit: 4G memswap_limit: 4G user: "1001:0" diff --git a/decisioncenter/businessvalueeditor/businessvalueeditor-source/src/main/java/businessvalueeditor/SampleValueEditorServlet.java b/decisioncenter/businessvalueeditor/businessvalueeditor-source/src/main/java/businessvalueeditor/SampleValueEditorServlet.java index c2fa10b..cb99313 100644 --- a/decisioncenter/businessvalueeditor/businessvalueeditor-source/src/main/java/businessvalueeditor/SampleValueEditorServlet.java +++ b/decisioncenter/businessvalueeditor/businessvalueeditor-source/src/main/java/businessvalueeditor/SampleValueEditorServlet.java @@ -21,13 +21,6 @@ import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; -/* ODM 9.0 and earlier -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -*/ - import java.io.IOException; import java.util.Locale; From 7130e8108145e3de8e8a46898db43394c62f29e6 Mon Sep 17 00:00:00 2001 From: siasin Date: Thu, 10 Apr 2025 11:25:37 +0200 Subject: [PATCH 6/7] revert back --- .../businessvalueeditor-source/.project | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/decisioncenter/businessvalueeditor/businessvalueeditor-source/.project b/decisioncenter/businessvalueeditor/businessvalueeditor-source/.project index 293b683..a576b2b 100644 --- a/decisioncenter/businessvalueeditor/businessvalueeditor-source/.project +++ b/decisioncenter/businessvalueeditor/businessvalueeditor-source/.project @@ -10,25 +10,8 @@ - - org.eclipse.m2e.core.maven2Builder - - - - org.eclipse.m2e.core.maven2Nature org.eclipse.jdt.core.javanature - - - 1744028940722 - - 30 - - org.eclipse.core.resources.regexFilterMatcher - node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ - - - From 0e2460a3bd5242c80b1c29292f6d2ab9a5a43055 Mon Sep 17 00:00:00 2001 From: SiaSin-TAY Date: Thu, 10 Apr 2025 17:39:25 +0200 Subject: [PATCH 7/7] Update compose-odm-dev.yml --- .../businessvalueeditor-source/compose-odm-dev.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/decisioncenter/businessvalueeditor/businessvalueeditor-source/compose-odm-dev.yml b/decisioncenter/businessvalueeditor/businessvalueeditor-source/compose-odm-dev.yml index 4a2e130..d7642d3 100644 --- a/decisioncenter/businessvalueeditor/businessvalueeditor-source/compose-odm-dev.yml +++ b/decisioncenter/businessvalueeditor/businessvalueeditor-source/compose-odm-dev.yml @@ -1,6 +1,6 @@ services: odm: - image: icr.io/cpopen/odm-k8s/odm:9.5.0.0 + image: icr.io/cpopen/odm-k8s/odm:9.5 mem_limit: 4G memswap_limit: 4G user: "1001:0" @@ -12,7 +12,7 @@ services: - 9453:9453 odm-with-custom-value-editor: - image: icr.io/cpopen/odm-k8s/odm:9.5.0.0 + image: icr.io/cpopen/odm-k8s/odm:9.5 mem_limit: 4G memswap_limit: 4G user: "1001:0"