Skip to content

DBACLD-160990 - validate instructions for ODM 95 #9

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.

Sign up for GitHub

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

Merged
merged 8 commits into from
Apr 11, 2025
Merged

DBACLD-160990 - validate instructions for ODM 95 #9

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
eab8bf5
use Jakarta instead of Javax and update copyrights
siasin Apr 7, 2025
3ab2b49
updates wrt ODM 9.5
siasin Apr 7, 2025
8ae6c60
use target instead of tasks
siasin Apr 9, 2025
2480687
Update readme about testing against ODM 9.0 or earlier
siasin Apr 9, 2025
ad2c3b2
update to only support V9.5
siasin Apr 10, 2025
7130e81
revert back
siasin Apr 10, 2025
0e2460a
Update compose-odm-dev.yml
siasin Apr 10, 2025
8b4fa87
Merge branch 'vnext-release' into businessvalueeditor95
siasin Apr 11, 2025
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
18 changes: 15 additions & 3 deletions decisioncenter/businessvalueeditor/README-KUBERNETES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
```
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
<html>
<head>
<title>201 Created</title>
</head><body>
<h1>Created</h1>
<p>Resource /businessvalueeditor-1.0.zip has been created.</p>
</body></html>
```

## 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.
Expand Down Expand Up @@ -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

Expand All @@ -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 `<FILESERVER_URL>` 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
Expand Down
9 changes: 4 additions & 5 deletions decisioncenter/businessvalueeditor/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,24 +47,23 @@ 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 allow you to build the JAR using a Docker container featuring Maven and a JDK version 21, compatible for ODM 9.5.

For ODM 8.12, you must 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:
Run the command in the **decisioncenter/businessvalueeditor/businessvalueeditor-source** directory:

```bash
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
```

The JAR that will be used on [Docker](README-DOCKER.md) is generated in the **target** directory and is named **businessvalueeditor-1.0.jar**.

The ZIP that will be used on [Kubernetes](README-KUBERNETES.md) is generated in the **target** directory and is named **businessvalueeditor-1.0.zip**.


### 3) Instructions to use the sample in Decision Center

Click one of the links below:
Expand Down
4 changes: 2 additions & 2 deletions decisioncenter/businessvalueeditor/businessvalueeditor-source/compose-odm-dev.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
mem_limit: 4G
memswap_limit: 4G
user: "1001:0"
Expand All @@ -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
mem_limit: 4G
memswap_limit: 4G
user: "1001:0"
Expand Down
11 changes: 6 additions & 5 deletions decisioncenter/businessvalueeditor/businessvalueeditor-source/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,16 @@
<goal>run</goal>
</goals>
<configuration>
<tasks>
<javac srcdir="${project.build.sourceDirectory}"
<target>
<javac srcdir="${project.build.sourceDirectory}"
destdir="${project.build.outputDirectory}"
includeantruntime="false"
compiler="modern">
<classpath>
<fileset dir="${project.basedir}/lib" includes="**/*.jar"/>
</classpath>
</javac>
</tasks>
</target>
</configuration>
</execution>
<execution>
Expand All @@ -40,12 +40,12 @@
<goal>run</goal>
</goals>
<configuration>
<tasks>
<target>
<zip destfile="${project.basedir}/target/businessvalueeditor-1.0.zip">
<fileset dir="${project.basedir}/target" includes="businessvalueeditor-1.0.jar" />
<fileset dir="${project.basedir}" includes="web.xml" />
</zip>
</tasks>
</target>
</configuration>
</execution>
</executions>
Expand All @@ -54,6 +54,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.14.0</version>
<executions>
<execution>
<id>default-compile</id>
Expand Down
2 changes: 1 addition & 1 deletion ...usinessvalueeditor-source/src/main/java/businessvalueeditor/OfferValueEditorProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...itor/businessvalueeditor-source/src/main/java/businessvalueeditor/SampleDataProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
12 changes: 6 additions & 6 deletions ...usinessvalueeditor-source/src/main/java/businessvalueeditor/SampleValueEditorServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -15,15 +15,15 @@
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;

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;
Expand Down
2 changes: 1 addition & 1 deletion ...tor/businessvalueeditor-source/src/main/java/servervalueeditor/FilterValueTranslator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion .../businessvalueeditor-source/src/main/resources/js/custom/valueeditors/OfferValueEditor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand Down