From 0a882f0986bf0685c902d9e3a956fba89cc00644 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Tue, 31 Mar 2026 09:18:43 +0000
Subject: [PATCH 1/5] Initial plan


From f9354099721c8ec55e04d96cf07ca5c97638b1c5 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Tue, 31 Mar 2026 10:37:37 +0000
Subject: [PATCH 2/5] Make /openidm REST context path configurable via
 openidm.context.path system property

Agent-Logs-Url: https://github.com/OpenIdentityPlatform/OpenIDM/sessions/eb238ff3-61a5-48d1-8e24-75012632d4af

Co-authored-by: vharseko <6818498+vharseko@users.noreply.github.com>
---
 .../servlet/internal/ServletComponent.java    | 30 +++++++--
 .../internal/ServletComponentTest.java        | 67 +++++++++++++++++++
 .../impl/ServletRegistrationSingleton.java    | 23 ++++++-
 .../shell/impl/RemoteCommandScope.java        | 25 ++++++-
 .../js/config/validators/AdminValidators.js   |  9 +--
 .../ui/admin/delegates/AuditDelegate.js       |  2 +-
 .../ui/admin/delegates/ClusterDelegate.js     |  2 +-
 .../ui/admin/delegates/ConnectorDelegate.js   |  2 +-
 .../admin/delegates/ExternalAccessDelegate.js |  4 +-
 .../ui/admin/delegates/MaintenanceDelegate.js |  2 +-
 .../ui/admin/delegates/ReconDelegate.js       | 10 +--
 .../ui/admin/delegates/SchedulerDelegate.js   |  2 +-
 .../ui/admin/delegates/ScriptDelegate.js      |  2 +-
 .../ui/admin/delegates/SecurityDelegate.js    |  2 +-
 .../ui/admin/delegates/SyncDelegate.js        |  8 +--
 .../ui/admin/delegates/WorkflowDelegate.js    |  2 +-
 .../DataAssociationManagementView.js          |  6 +-
 .../ui/admin/mapping/util/MappingUtils.js     |  2 +-
 .../openidm/ui/admin/settings/SettingsView.js |  2 +-
 .../openidm/ui/admin/user/EditUserView.js     |  2 +-
 .../ui/admin/workflow/ActiveProcessesView.js  |  8 +--
 .../admin/workflow/ProcessDefinitionView.js   |  4 +-
 .../admin/workflow/ProcessDefinitionsView.js  |  6 +-
 .../ui/admin/workflow/ProcessHistoryView.js   |  6 +-
 .../ui/admin/workflow/ProcessInstanceView.js  | 12 ++--
 .../ui/admin/workflow/ProcessListView.js      |  4 +-
 .../ui/admin/workflow/TaskInstanceView.js     |  6 +-
 .../openidm/ui/admin/workflow/TaskListView.js | 12 ++--
 .../ui/common/delegates/ConfigDelegate.js     |  2 +-
 .../ui/common/delegates/InfoDelegate.js       |  2 +-
 .../common/delegates/InternalUserDelegate.js  |  2 +-
 .../ui/common/delegates/PolicyDelegate.js     |  2 +-
 .../ui/common/delegates/ResourceDelegate.js   |  4 +-
 .../ui/common/delegates/SearchDelegate.js     |  2 +-
 .../ui/common/delegates/SocialDelegate.js     |  6 +-
 .../common/delegates/SystemHealthDelegate.js  |  2 +-
 .../notifications/NotificationDelegate.js     |  2 +-
 .../ui/common/workflow/WorkflowDelegate.js    | 10 +--
 .../openidm/ui/common/util/ConstantsTest.js   | 11 +++
 .../src/main/resources/conf/system.properties |  5 ++
 40 files changed, 232 insertions(+), 80 deletions(-)
 create mode 100644 openidm-api-servlet/src/test/java/org/forgerock/openidm/servlet/internal/ServletComponentTest.java

diff --git a/openidm-api-servlet/src/main/java/org/forgerock/openidm/servlet/internal/ServletComponent.java b/openidm-api-servlet/src/main/java/org/forgerock/openidm/servlet/internal/ServletComponent.java
index 85c59358ec..f844be7abe 100644
--- a/openidm-api-servlet/src/main/java/org/forgerock/openidm/servlet/internal/ServletComponent.java
+++ b/openidm-api-servlet/src/main/java/org/forgerock/openidm/servlet/internal/ServletComponent.java
@@ -74,7 +74,7 @@
 /**
  * A component to create and register the "API" Servlet; that is, the CHF Servlet that
  *
- * 1) listens on /openidm,
+ * 1) listens on /openidm (or the path configured via openidm.context.path system property),
  * 2) dispatches to the HttpApplication, that is composed of
  *    a) the auth filter
  *    b) the JSON resource HTTP Handler, that
@@ -93,7 +93,11 @@ public class ServletComponent implements EventHandler {
 
     static final String PID = "org.forgerock.openidm.api-servlet";
 
-    private static final String SERVLET_ALIAS = "/openidm";
+    /** System property name for the configurable REST context path. */
+    static final String OPENIDM_CONTEXT_PATH_PROPERTY = "openidm.context.path";
+
+    /** Default REST context path. */
+    static final String OPENIDM_CONTEXT_PATH_DEFAULT = "/openidm";
 
     private static final String API_ID = "frapi:openidm";
 
@@ -155,9 +159,25 @@ protected synchronized void unbindRegistrator(ServletFilterRegistrator registrat
 
     private HttpServlet servlet;
 
+    /**
+     * Returns the servlet alias (REST context path) from the system property
+     * {@code openidm.context.path}, defaulting to {@code /openidm}.
+     */
+    static String getServletAlias() {
+        String path = System.getProperty(OPENIDM_CONTEXT_PATH_PROPERTY, OPENIDM_CONTEXT_PATH_DEFAULT);
+        if (!path.startsWith("/")) {
+            path = "/" + path;
+        }
+        if (path.endsWith("/")) {
+            path = path.substring(0, path.length() - 1);
+        }
+        return path;
+    }
+
     @Activate
     protected void activate(ComponentContext context) throws ServletException, NamespaceException {
-        logger.debug("Registering servlet at {}", SERVLET_ALIAS);
+        final String servletAlias = getServletAlias();
+        logger.debug("Registering servlet at {}", servletAlias);
 
         final Handler handler = CrestHttp.newHttpHandler(
                 new CrestApplication() {
@@ -201,8 +221,8 @@ public void stop() {
 
         @SuppressWarnings("rawtypes")
         final Dictionary params = new Hashtable();
-        servletRegistration.registerServlet(SERVLET_ALIAS, servlet, params);
-        logger.info("Registered servlet at {}", SERVLET_ALIAS);
+        servletRegistration.registerServlet(servletAlias, servlet, params);
+        logger.info("Registered servlet at {}", servletAlias);
     }
 
     @Deactivate
diff --git a/openidm-api-servlet/src/test/java/org/forgerock/openidm/servlet/internal/ServletComponentTest.java b/openidm-api-servlet/src/test/java/org/forgerock/openidm/servlet/internal/ServletComponentTest.java
new file mode 100644
index 0000000000..84db58d187
--- /dev/null
+++ b/openidm-api-servlet/src/test/java/org/forgerock/openidm/servlet/internal/ServletComponentTest.java
@@ -0,0 +1,67 @@
+/*
+ * The contents of this file are subject to the terms of the Common Development and
+ * Distribution License (the License). You may not use this file except in compliance with the
+ * License.
+ *
+ * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the
+ * specific language governing permission and limitations under the License.
+ *
+ * When distributing Covered Software, include this CDDL Header Notice in each file and include
+ * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL
+ * Header, with the fields enclosed by brackets [] replaced by your own identifying
+ * information: "Portions copyright [year] [name of copyright owner]".
+ *
+ * Copyright 2025 3A Systems LLC.
+ */
+
+package org.forgerock.openidm.servlet.internal;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.Test;
+
+/**
+ * Unit tests for {@link ServletComponent} context path configuration.
+ */
+public class ServletComponentTest {
+
+    @AfterMethod
+    public void clearSystemProperty() {
+        System.clearProperty(ServletComponent.OPENIDM_CONTEXT_PATH_PROPERTY);
+    }
+
+    @Test
+    public void testDefaultServletAlias() {
+        // When no system property is set, should return the default /openidm
+        System.clearProperty(ServletComponent.OPENIDM_CONTEXT_PATH_PROPERTY);
+        assertThat(ServletComponent.getServletAlias()).isEqualTo("/openidm");
+    }
+
+    @Test
+    public void testCustomServletAlias() {
+        // When system property is set to /myidm, should return /myidm
+        System.setProperty(ServletComponent.OPENIDM_CONTEXT_PATH_PROPERTY, "/myidm");
+        assertThat(ServletComponent.getServletAlias()).isEqualTo("/myidm");
+    }
+
+    @Test
+    public void testServletAliasWithoutLeadingSlash() {
+        // Should add leading slash if missing
+        System.setProperty(ServletComponent.OPENIDM_CONTEXT_PATH_PROPERTY, "myidm");
+        assertThat(ServletComponent.getServletAlias()).isEqualTo("/myidm");
+    }
+
+    @Test
+    public void testServletAliasWithTrailingSlash() {
+        // Should remove trailing slash
+        System.setProperty(ServletComponent.OPENIDM_CONTEXT_PATH_PROPERTY, "/myidm/");
+        assertThat(ServletComponent.getServletAlias()).isEqualTo("/myidm");
+    }
+
+    @Test
+    public void testServletAliasConstants() {
+        assertThat(ServletComponent.OPENIDM_CONTEXT_PATH_PROPERTY).isEqualTo("openidm.context.path");
+        assertThat(ServletComponent.OPENIDM_CONTEXT_PATH_DEFAULT).isEqualTo("/openidm");
+    }
+}
diff --git a/openidm-servlet-registrator/src/main/java/org/forgerock/openidm/servletregistration/impl/ServletRegistrationSingleton.java b/openidm-servlet-registrator/src/main/java/org/forgerock/openidm/servletregistration/impl/ServletRegistrationSingleton.java
index 345ed61151..1973c3f6f6 100644
--- a/openidm-servlet-registrator/src/main/java/org/forgerock/openidm/servletregistration/impl/ServletRegistrationSingleton.java
+++ b/openidm-servlet-registrator/src/main/java/org/forgerock/openidm/servletregistration/impl/ServletRegistrationSingleton.java
@@ -90,7 +90,26 @@ public class ServletRegistrationSingleton implements ServletRegistration {
 
     private static final String[] DEFAULT_SERVLET_NAME = new String[] { "OpenIDM REST" };
 
-    private static final String[] DEFAULT_SERVLET_URL_PATTERNS = new String[] { "/openidm/*", "/selfservice/*" };
+    /** System property name for the configurable REST context path. */
+    private static final String OPENIDM_CONTEXT_PATH_PROPERTY = "openidm.context.path";
+
+    /** Default REST context path. */
+    private static final String OPENIDM_CONTEXT_PATH_DEFAULT = "/openidm";
+
+    /**
+     * Returns the default servlet URL patterns, using the configured context path
+     * from the {@code openidm.context.path} system property (default: {@code /openidm}).
+     */
+    private static String[] getDefaultServletUrlPatterns() {
+        String contextPath = System.getProperty(OPENIDM_CONTEXT_PATH_PROPERTY, OPENIDM_CONTEXT_PATH_DEFAULT);
+        if (!contextPath.startsWith("/")) {
+            contextPath = "/" + contextPath;
+        }
+        if (contextPath.endsWith("/")) {
+            contextPath = contextPath.substring(0, contextPath.length() - 1);
+        }
+        return new String[] { contextPath + "/*", "/selfservice/*" };
+    }
 
     // Context of this scr component
     private BundleContext bundleContext;
@@ -212,7 +231,7 @@ public URL apply(JsonValue jsonValue) throws JsonValueException {
 
         // URL patterns to apply the filter to, e.g. one could also add "/openidmui/*");
         List<String> urlPatterns = config.get(SERVLET_FILTER_URL_PATTERNS)
-                .defaultTo(Arrays.asList(DEFAULT_SERVLET_URL_PATTERNS))
+                .defaultTo(Arrays.asList(getDefaultServletUrlPatterns()))
                 .asList(String.class);
 
         // Filter init params, a string to string map
diff --git a/openidm-shell/src/main/java/org/forgerock/openidm/shell/impl/RemoteCommandScope.java b/openidm-shell/src/main/java/org/forgerock/openidm/shell/impl/RemoteCommandScope.java
index 3baf5aa6b2..7d2e43f98b 100644
--- a/openidm-shell/src/main/java/org/forgerock/openidm/shell/impl/RemoteCommandScope.java
+++ b/openidm-shell/src/main/java/org/forgerock/openidm/shell/impl/RemoteCommandScope.java
@@ -57,10 +57,33 @@ public class RemoteCommandScope extends CustomCommandScope {
     private static final String IDM_PORT_DESC = "Port of OpenIDM REST service. This will override any port in --url.";
     private static final String IDM_PORT_METAVAR = "PORT";
 
+    /** System property for configuring the REST context path. */
+    private static final String OPENIDM_CONTEXT_PATH_PROPERTY = "openidm.context.path";
+
+    /** Compile-time default URL used in CLI parameter annotations. */
     private static final String IDM_URL_DEFAULT = "http://localhost:8080/openidm/";
+
     private static final String IDM_URL_DESC = "URL of OpenIDM REST service. Default " + IDM_URL_DEFAULT;
     private static final String IDM_URL_METAVAR = "URL";
 
+    /**
+     * Returns the effective default IDM URL, reading the {@code openidm.context.path} system
+     * property (default: {@code /openidm}) to construct the URL.
+     */
+    private static String getEffectiveIdmUrl(String url) {
+        if (!IDM_URL_DEFAULT.equals(url)) {
+            return url;
+        }
+        String contextPath = System.getProperty(OPENIDM_CONTEXT_PATH_PROPERTY, "/openidm");
+        if (!contextPath.startsWith("/")) {
+            contextPath = "/" + contextPath;
+        }
+        if (contextPath.endsWith("/")) {
+            contextPath = contextPath.substring(0, contextPath.length() - 1);
+        }
+        return "http://localhost:8080" + contextPath + "/";
+    }
+
     private static final String USER_PASS_DESC = "Server user and password";
     private static final String USER_PASS_METAVAR = "USER[:PASSWORD]";
     private static final String USER_PASS_DEFAULT = "";
@@ -144,7 +167,7 @@ private static String getPassword(final String userPass) {
      */
     private static String getUrl(final String url) {
         if (isNotBlank(url)) {
-            return url.endsWith("/") ? url : url + "/";
+            return getEffectiveIdmUrl(url.endsWith("/") ? url : url + "/");
         }
         throw new IllegalArgumentException("URL required");
     }
diff --git a/openidm-ui/openidm-ui-admin/src/main/js/config/validators/AdminValidators.js b/openidm-ui/openidm-ui-admin/src/main/js/config/validators/AdminValidators.js
index 23ef4bc269..0c7b6e55a2 100644
--- a/openidm-ui/openidm-ui-admin/src/main/js/config/validators/AdminValidators.js
+++ b/openidm-ui/openidm-ui-admin/src/main/js/config/validators/AdminValidators.js
@@ -16,8 +16,9 @@
 
 define([
     "jquery",
-    "underscore"
-], function ($, _) {
+    "underscore",
+    "org/forgerock/commons/ui/common/util/Constants"
+], function ($, _, constants) {
     var obj = {
         "changed": {
             "name": "Changed field",
@@ -39,8 +40,8 @@ define([
                     return;
                 }
 
-                if (v === "/openidm" || v === "/admin" ||  v === "/system") {
-                    callback(["The URL cannot be one of the following reserved names: \"openidm\", \"admin\" or \"system\"."]);
+                if (v === "/" + constants.context || v === "/admin" ||  v === "/system") {
+                    callback(["The URL cannot be one of the following reserved names: \"" + constants.context + "\", \"admin\" or \"system\"."]);
                     return;
                 }
 
diff --git a/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/delegates/AuditDelegate.js b/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/delegates/AuditDelegate.js
index 854fdfc5d4..01cfcd1605 100644
--- a/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/delegates/AuditDelegate.js
+++ b/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/delegates/AuditDelegate.js
@@ -20,7 +20,7 @@ define([
     "org/forgerock/commons/ui/common/main/AbstractDelegate"
 ], function($, constants, AbstractDelegate) {
 
-    var obj = new AbstractDelegate(constants.host + "/openidm/audit/");
+    var obj = new AbstractDelegate(constants.host + "/" + constants.context + "/audit/");
 
     obj.availableHandlers = function() {
         return obj.serviceCall({
diff --git a/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/delegates/ClusterDelegate.js b/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/delegates/ClusterDelegate.js
index 4add69f408..8b969e99e1 100644
--- a/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/delegates/ClusterDelegate.js
+++ b/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/delegates/ClusterDelegate.js
@@ -20,7 +20,7 @@ define([
     "org/forgerock/commons/ui/common/main/AbstractDelegate"
 ], function($, constants, AbstractDelegate) {
 
-    var obj = new AbstractDelegate(constants.host + "/openidm");
+    var obj = new AbstractDelegate(constants.host + "/" + constants.context);
 
     obj.getNodes = function() {
         return obj.serviceCall({
diff --git a/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/delegates/ConnectorDelegate.js b/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/delegates/ConnectorDelegate.js
index 74de9cc5e9..dde5cb05f4 100644
--- a/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/delegates/ConnectorDelegate.js
+++ b/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/delegates/ConnectorDelegate.js
@@ -22,7 +22,7 @@ define([
     "org/forgerock/commons/ui/common/main/EventManager"
 ], function($, _, constants, AbstractDelegate, eventManager) {
 
-    var obj = new AbstractDelegate(constants.host + "/openidm/system");
+    var obj = new AbstractDelegate(constants.host + "/" + constants.context + "/system");
 
     obj.connectorDelegateCache = {};
 
diff --git a/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/delegates/ExternalAccessDelegate.js b/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/delegates/ExternalAccessDelegate.js
index ef5dca25e2..fbf6c1a013 100644
--- a/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/delegates/ExternalAccessDelegate.js
+++ b/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/delegates/ExternalAccessDelegate.js
@@ -19,7 +19,7 @@ define([
     "org/forgerock/commons/ui/common/main/AbstractDelegate"
 ], function(constants, AbstractDelegate) {
 
-    var obj = new AbstractDelegate(constants.host + "/openidm/endpoint/oauthproxy");
+    var obj = new AbstractDelegate(constants.host + "/" + constants.context + "/endpoint/oauthproxy");
 
     obj.getToken = function(id, authCode, redirectUri, tokenUrl, connectorLocation) {
         var googleDetails = "grant_type=authorization_code&code=" +authCode +"&client_id=" +id  +"&redirect_uri=" +redirectUri,
@@ -48,7 +48,7 @@ define([
     obj.externalRestRequest = (url, method, body, headers) => {
         method = method || "GET";
         return obj.serviceCall({
-            serviceUrl: constants.host + "/openidm/external/rest",
+            serviceUrl: constants.host + "/" + constants.context + "/external/rest",
             url: "?_action=call",
             type: "POST",
             data: JSON.stringify({
diff --git a/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/delegates/MaintenanceDelegate.js b/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/delegates/MaintenanceDelegate.js
index 09e542c215..77037fecbd 100644
--- a/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/delegates/MaintenanceDelegate.js
+++ b/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/delegates/MaintenanceDelegate.js
@@ -21,7 +21,7 @@ define([
     "org/forgerock/commons/ui/common/main/AbstractDelegate"
 ], function($, _, constants, AbstractDelegate) {
 
-    var obj = new AbstractDelegate(constants.host + "/openidm/maintenance");
+    var obj = new AbstractDelegate(constants.host + "/" + constants.context + "/maintenance");
 
     obj.getStatus = function () {
         return obj.serviceCall({
diff --git a/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/delegates/ReconDelegate.js b/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/delegates/ReconDelegate.js
index fcc08fa8b9..90d6f31ec8 100644
--- a/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/delegates/ReconDelegate.js
+++ b/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/delegates/ReconDelegate.js
@@ -25,7 +25,7 @@ define([
     "org/forgerock/commons/ui/common/main/Router"
 ], function($, _, constants, AbstractDelegate, configuration, eventManager, spinner, router) {
 
-    var obj = new AbstractDelegate(constants.host + "/openidm/recon");
+    var obj = new AbstractDelegate(constants.host + "/" + constants.context + "/recon");
 
     obj.waitForAll = function (reconIds, suppressSpinner, progressCallback, delayTime) {
         var resultPromise = $.Deferred(),
@@ -149,7 +149,7 @@ define([
     obj.stopRecon = function (id, suppressSpinner) {
         return obj.serviceCall({
             "suppressSpinner": suppressSpinner,
-            "serviceUrl": "/openidm/recon/" + id,
+            "serviceUrl": "/" + constants.context + "/recon/" + id,
             "url": "?_action=cancel",
             "type": "POST"
         });
@@ -163,7 +163,7 @@ define([
             getTargetObj = _.bind(function(link){
                 return this.serviceCall({
                     "type": "GET",
-                    "serviceUrl": "/openidm/" + link.targetObjectId,
+                    "serviceUrl": "/" + constants.context + "/" + link.targetObjectId,
                     "url":  ""
                 }).then(function(targetObject){
                     newLinks.push({ sourceObjectId: link.sourceObjectId , targetObject: targetObject });
@@ -181,7 +181,7 @@ define([
         } else {
             this.serviceCall({
                 "type": "GET",
-                "serviceUrl": "/openidm/audit/recon",
+                "serviceUrl": "/" + constants.context + "/audit/recon",
                 "url":  "?_queryFilter=" + encodeURIComponent(queryFilter)
             }).then(function(qry){
                 if(qry.result.length){
@@ -205,7 +205,7 @@ define([
         var queryFilter = 'reconId eq "' + reconId + '" and ' + objectIdType + ' eq "' + objectId + '"';
         return obj.serviceCall({
             "type": "GET",
-            "serviceUrl": "/openidm/audit/recon",
+            "serviceUrl": "/" + constants.context + "/audit/recon",
             "url":  "?_queryFilter=" + encodeURIComponent(queryFilter)
         });
     };
diff --git a/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/delegates/SchedulerDelegate.js b/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/delegates/SchedulerDelegate.js
index c3198ec872..5f645f55fb 100644
--- a/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/delegates/SchedulerDelegate.js
+++ b/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/delegates/SchedulerDelegate.js
@@ -21,7 +21,7 @@ define([
     "org/forgerock/commons/ui/common/main/AbstractDelegate"
 ], function(_, $, constants, AbstractDelegate) {
 
-    var obj = new AbstractDelegate(constants.host + "/openidm/scheduler/job");
+    var obj = new AbstractDelegate(constants.host + "/" + constants.context + "/scheduler/job");
 
     obj.availableSchedules = function() {
         return obj.serviceCall({
diff --git a/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/delegates/ScriptDelegate.js b/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/delegates/ScriptDelegate.js
index a41be33b44..a95a067967 100644
--- a/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/delegates/ScriptDelegate.js
+++ b/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/delegates/ScriptDelegate.js
@@ -20,7 +20,7 @@ define([
     "org/forgerock/commons/ui/common/main/AbstractDelegate"
 ], function(_, constants, AbstractDelegate) {
 
-    var obj = new AbstractDelegate(constants.host + "/openidm/script");
+    var obj = new AbstractDelegate(constants.host + "/" + constants.context + "/script");
 
     obj.evalScript = function(script, additionalGlobals) {
         var scriptDetails = _.cloneDeep(script);
diff --git a/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/delegates/SecurityDelegate.js b/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/delegates/SecurityDelegate.js
index 0a663f0fc1..1c49f4b555 100644
--- a/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/delegates/SecurityDelegate.js
+++ b/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/delegates/SecurityDelegate.js
@@ -20,7 +20,7 @@ define([
     "org/forgerock/commons/ui/common/main/AbstractDelegate"
 ], function($, constants, AbstractDelegate) {
 
-    var obj = new AbstractDelegate(constants.host + "/openidm/security");
+    var obj = new AbstractDelegate(constants.host + "/" + constants.context + "/security");
 
     obj.getPublicKeyCert = function (storeType, alias) {
         var promise = $.Deferred();
diff --git a/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/delegates/SyncDelegate.js b/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/delegates/SyncDelegate.js
index 41a2016b67..2045c28772 100644
--- a/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/delegates/SyncDelegate.js
+++ b/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/delegates/SyncDelegate.js
@@ -26,7 +26,7 @@ define([
     "org/forgerock/openidm/ui/common/delegates/ConfigDelegate"
 ], function($, _, constants, AbstractDelegate, configuration, eventManager, configDelegate) {
 
-    var obj = new AbstractDelegate(constants.host + "/openidm/sync");
+    var obj = new AbstractDelegate(constants.host + "/" + constants.context + "/sync");
 
     obj.performAction = function (reconId, mapping, action, sourceId, targetId, linkType) {
         var params = {
@@ -69,13 +69,13 @@ define([
         } else {
 
             return obj.serviceCall({
-                "serviceUrl": constants.host + "/openidm/repo/link",
+                "serviceUrl": constants.host + "/" + constants.context + "/repo/link",
                 "url": "?_queryId=links-for-" + ordinal + "&linkType=" + linkType + "&" + ordinal + "=" + encodeURIComponent(id)
             }).then(function (qry) {
                 var i, deletePromises = [];
                 for (i=0;i<qry.result.length;i++) {
                     deletePromises.push(obj.serviceCall({
-                        "serviceUrl": constants.host + "/openidm/repo/link/",
+                        "serviceUrl": constants.host + "/" + constants.context + "/repo/link/",
                         "url" : qry.result[i]._id,
                         "type": "DELETE",
                         "headers": {
@@ -160,7 +160,7 @@ define([
     obj.mappingDetails = function(mapping){
         var promise = $.Deferred(),
             url = "",
-            serviceUrl = "/openidm/endpoint/mappingDetails",
+            serviceUrl = "/" + constants.context + "/endpoint/mappingDetails",
             doServiceCall = function(){
                 return obj.serviceCall({
                     "type": "GET",
diff --git a/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/delegates/WorkflowDelegate.js b/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/delegates/WorkflowDelegate.js
index 44c2c03eca..3e115e34cd 100644
--- a/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/delegates/WorkflowDelegate.js
+++ b/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/delegates/WorkflowDelegate.js
@@ -19,7 +19,7 @@ define([
     "org/forgerock/commons/ui/common/main/AbstractDelegate"
 ], function(constants, AbstractDelegate) {
 
-    var obj = new AbstractDelegate(constants.host + "/openidm/workflow/processdefinition");
+    var obj = new AbstractDelegate(constants.host + "/" + constants.context + "/workflow/processdefinition");
 
     obj.availableWorkflows = function() {
         var errorHandlers =  {
diff --git a/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/mapping/association/DataAssociationManagementView.js b/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/mapping/association/DataAssociationManagementView.js
index aa2ce2544a..b800519afa 100644
--- a/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/mapping/association/DataAssociationManagementView.js
+++ b/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/mapping/association/DataAssociationManagementView.js
@@ -31,6 +31,7 @@ define([
     "org/forgerock/commons/ui/common/main/AbstractCollection",
     "org/forgerock/commons/ui/common/main/ServiceInvoker",
     "org/forgerock/commons/ui/common/components/Messages",
+    "org/forgerock/commons/ui/common/util/Constants",
     "backgrid-paginator",
     "backgrid-selectall"
 ], function($, _,
@@ -47,7 +48,8 @@ define([
             BackgridUtils,
             AbstractCollection,
             ServiceInvoker,
-            Messages) {
+            Messages,
+            constants) {
 
     var DataAssociationManagementView = MappingAdminAbstractView.extend({
         template: "templates/admin/mapping/association/DataAssociationManagementTemplate.html",
@@ -288,7 +290,7 @@ define([
                 grid_id = "#analysisGrid",
                 pager_id = grid_id + '-paginator',
                 ReconCollection = AbstractCollection.extend({
-                    url: "/openidm/endpoint/reconResults",
+                    url: "/" + constants.context + "/endpoint/reconResults",
                     queryParams: {
                         _queryId: "reconResults",
                         source: this.mapping.source,
diff --git a/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/mapping/util/MappingUtils.js b/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/mapping/util/MappingUtils.js
index a77b88a198..08334bc36f 100644
--- a/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/mapping/util/MappingUtils.js
+++ b/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/mapping/util/MappingUtils.js
@@ -243,7 +243,7 @@ define([
         concatPromise(() => {
             return resourceDelegate.serviceCall({
                 "type": "POST",
-                "serviceUrl": "/openidm/repo/links",
+                "serviceUrl": "/" + constants.context + "/repo/links",
                 "url":  "?_action=command&commandId=delete-mapping-links&mapping=" + mappingName
             });
         });
diff --git a/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/settings/SettingsView.js b/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/settings/SettingsView.js
index 70d2566db4..0bf3212660 100644
--- a/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/settings/SettingsView.js
+++ b/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/settings/SettingsView.js
@@ -50,7 +50,7 @@ define([
         render: function(args, callback) {
             this.data.tabName = args[0] || "audit";
 
-            this.data.maintenanceModeDelegate = new AbstractDelegate(Constants.host + "/openidm/maintenance");
+            this.data.maintenanceModeDelegate = new AbstractDelegate(Constants.host + "/" + Constants.context + "/maintenance");
 
             this.data.maintenanceModeDelegate.serviceCall({
                 url: "?_action=status",
diff --git a/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/user/EditUserView.js b/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/user/EditUserView.js
index 45becb35d8..05f2ca94f5 100644
--- a/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/user/EditUserView.js
+++ b/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/user/EditUserView.js
@@ -69,7 +69,7 @@ function ($, _,
         if ($(e.currentTarget).attr("disabled") !== "disabled") {
 
             ResourceDelegate.serviceCall({
-                serviceUrl: "/openidm/managed/user",
+                serviceUrl: "/" + constants.context + "/managed/user",
                 url: "/" + this.objectId + "?_action=resetPassword",
                 type: "POST",
                 success: (e) => {
diff --git a/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/workflow/ActiveProcessesView.js b/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/workflow/ActiveProcessesView.js
index b5121dc42c..556a44b310 100644
--- a/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/workflow/ActiveProcessesView.js
+++ b/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/workflow/ActiveProcessesView.js
@@ -53,7 +53,7 @@ define([
 
             this.parentRender(_.bind(function() {
                 var processGrid,
-                    ProcessModel = AbstractModel.extend({ "url": "/openidm/workflow/processinstance" }),
+                    ProcessModel = AbstractModel.extend({ "url": "/" + constants.context + "/workflow/processinstance" }),
                     Process = AbstractCollection.extend({ model: ProcessModel });
 
                 this.model.processes = new Process();
@@ -69,7 +69,7 @@ define([
                     });
                 });
 
-                this.model.processes.url = "/openidm/workflow/processinstance?_queryId=filtered-query";
+                this.model.processes.url = "/" + constants.context + "/workflow/processinstance?_queryId=filtered-query";
                 this.model.processes.state.pageSize = null;
                 this.model.processes.state.sortKey = "-startTime";
 
@@ -228,9 +228,9 @@ define([
             }
 
             if(filterString.length > 0) {
-                this.model.processes.url = "/openidm/workflow/processinstance?" + filterString;
+                this.model.processes.url = "/" + constants.context + "/workflow/processinstance?" + filterString;
             } else {
-                this.model.processes.url = "/openidm/workflow/processinstance?_queryId=query-all-ids";
+                this.model.processes.url = "/" + constants.context + "/workflow/processinstance?_queryId=query-all-ids";
             }
 
             this.model.processes.getFirstPage();
diff --git a/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/workflow/ProcessDefinitionView.js b/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/workflow/ProcessDefinitionView.js
index 5ff664d3ff..a45c15e4a0 100644
--- a/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/workflow/ProcessDefinitionView.js
+++ b/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/workflow/ProcessDefinitionView.js
@@ -23,7 +23,7 @@ define([
     "org/forgerock/commons/ui/common/main/AbstractModel",
     "org/forgerock/openidm/ui/admin/util/WorkflowUtils"
 ], function(_, AbstractView, eventManager, constants, UIUtils, AbstractModel, WorkflowUtils) {
-    var ProcessModel = AbstractModel.extend({ url: "/openidm/workflow/processdefinition" }),
+    var ProcessModel = AbstractModel.extend({ url: "/" + constants.context + "/workflow/processdefinition" }),
         ProcessDefinitionView = AbstractView.extend({
             template: "templates/admin/workflow/ProcessDefinitionViewTemplate.html",
 
@@ -39,7 +39,7 @@ define([
 
                     this.data.processDefinition = this.model.toJSON();
 
-                    this.data.diagramUrl = "/openidm/workflow/processdefinition/" + this.model.id + "?_fields=/diagram&_mimeType=image/png";
+                    this.data.diagramUrl = "/" + constants.context + "/workflow/processdefinition/" + this.model.id + "?_fields=/diagram&_mimeType=image/png";
 
                     this.parentRender(_.bind(function(){
 
diff --git a/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/workflow/ProcessDefinitionsView.js b/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/workflow/ProcessDefinitionsView.js
index e53fc45a28..0617c9a737 100644
--- a/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/workflow/ProcessDefinitionsView.js
+++ b/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/workflow/ProcessDefinitionsView.js
@@ -18,12 +18,14 @@ define([
     "jquery",
     "underscore",
     "org/forgerock/openidm/ui/admin/util/AdminAbstractView",
+    "org/forgerock/commons/ui/common/util/Constants",
     "org/forgerock/commons/ui/common/main/AbstractModel",
     "org/forgerock/commons/ui/common/main/AbstractCollection",
     "backgrid",
     "org/forgerock/openidm/ui/admin/util/BackgridUtils"
 ], function($, _,
             AdminAbstractView,
+            constants,
             AbstractModel,
             AbstractCollection,
             Backgrid,
@@ -40,11 +42,11 @@ define([
             this.parentRender(_.bind(function(){
                 this.parentRender(_.bind(function() {
                     var processDefinitionGrid,
-                        ProcessDefinitionModel = AbstractModel.extend({ "url": "/openidm/workflow/processdefinition" }),
+                        ProcessDefinitionModel = AbstractModel.extend({ "url": "/" + constants.context + "/workflow/processdefinition" }),
                         Process = AbstractCollection.extend({ model: ProcessDefinitionModel });
 
                     this.model.processes = new Process();
-                    this.model.processes.url = "/openidm/workflow/processdefinition?_queryId=filtered-query";
+                    this.model.processes.url = "/" + constants.context + "/workflow/processdefinition?_queryId=filtered-query";
                     this.model.processes.state.pageSize = null;
 
                     processDefinitionGrid = new Backgrid.Grid({
diff --git a/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/workflow/ProcessHistoryView.js b/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/workflow/ProcessHistoryView.js
index 4e9ef0aa91..8ff66ced74 100644
--- a/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/workflow/ProcessHistoryView.js
+++ b/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/workflow/ProcessHistoryView.js
@@ -53,7 +53,7 @@ define([
 
             this.parentRender(_.bind(function() {
                 var processGrid,
-                    ProcessModel = AbstractModel.extend({ "url": "/openidm/workflow/processinstance/history" }),
+                    ProcessModel = AbstractModel.extend({ "url": "/" + constants.context + "/workflow/processinstance/history" }),
                     Process = AbstractCollection.extend({ model: ProcessModel });
 
                 this.model.processes = new Process();
@@ -69,7 +69,7 @@ define([
                     });
                 });
 
-                this.model.processes.url = "/openidm/workflow/processinstance/history?_queryId=filtered-query&finished=true";
+                this.model.processes.url = "/" + constants.context + "/workflow/processinstance/history?_queryId=filtered-query&finished=true";
                 this.model.processes.state.pageSize = null;
                 this.model.processes.state.sortKey = "-startTime";
 
@@ -221,7 +221,7 @@ define([
                 filterString = filterString + "&processDefinitionKey=" + this.model.processTypeFilter;
             }
 
-            this.model.processes.url = "/openidm/workflow/processinstance/history?" + filterString;
+            this.model.processes.url = "/" + constants.context + "/workflow/processinstance/history?" + filterString;
 
             this.model.processes.getFirstPage();
         }
diff --git a/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/workflow/ProcessInstanceView.js b/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/workflow/ProcessInstanceView.js
index d96c715935..30df0271c9 100644
--- a/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/workflow/ProcessInstanceView.js
+++ b/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/workflow/ProcessInstanceView.js
@@ -39,9 +39,9 @@ define([
             BackgridUtils,
             UIUtils) {
 
-    var ProcessInstanceModel = AbstractModel.extend({ url: "/openidm/workflow/processinstance" }),
-        ProcessDefinitionModel = AbstractModel.extend({ url: "/openidm/workflow/processdefinition" }),
-        UserModel = AbstractModel.extend({ url: "/openidm/managed/user" }),
+    var ProcessInstanceModel = AbstractModel.extend({ url: "/" + constants.context + "/workflow/processinstance" }),
+        ProcessDefinitionModel = AbstractModel.extend({ url: "/" + constants.context + "/workflow/processdefinition" }),
+        UserModel = AbstractModel.extend({ url: "/" + constants.context + "/managed/user" }),
         TaskInstanceCollection = AbstractCollection.extend({
             mode: "client"
         }),
@@ -81,7 +81,7 @@ define([
                     if (this.data.processInstance.startUserId) {
                         startedBy.id = this.data.processInstance.startUserId;
                         if (startedBy.id === 'openidm-admin') {
-                            startedBy.url = '/openidm/repo/internal/user';
+                            startedBy.url = '/' + constants.context + '/repo/internal/user';
                         }
                         fetchArr.push(startedBy.fetch());
                     }
@@ -97,9 +97,9 @@ define([
                         if (this.data.processDefinition.processDiagramResourceName) {
                             this.data.showDiagram = true;
                             if (!this.model.get("endTime")) {
-                                this.data.diagramUrl = "/openidm/workflow/processinstance/" + this.model.id + "?_fields=/diagram&_mimeType=image/png";
+                                this.data.diagramUrl = "/" + constants.context + "/workflow/processinstance/" + this.model.id + "?_fields=/diagram&_mimeType=image/png";
                             } else {
-                                this.data.diagramUrl = "/openidm/workflow/processdefinition/" + this.data.processDefinition._id + "?_fields=/diagram&_mimeType=image/png";
+                                this.data.diagramUrl = "/" + constants.context + "/workflow/processdefinition/" + this.data.processDefinition._id + "?_fields=/diagram&_mimeType=image/png";
                             }
                         }
 
diff --git a/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/workflow/ProcessListView.js b/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/workflow/ProcessListView.js
index 7050b1888d..2cfc745be1 100644
--- a/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/workflow/ProcessListView.js
+++ b/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/workflow/ProcessListView.js
@@ -17,12 +17,14 @@
 define([
     "underscore",
     "org/forgerock/openidm/ui/admin/util/AdminAbstractView",
+    "org/forgerock/commons/ui/common/util/Constants",
     "org/forgerock/openidm/ui/admin/workflow/ActiveProcessesView",
     "org/forgerock/openidm/ui/admin/workflow/ProcessDefinitionsView",
     "org/forgerock/openidm/ui/admin/workflow/ProcessHistoryView",
     "org/forgerock/commons/ui/common/main/AbstractCollection"
 ], function(_,
             AdminAbstractView,
+            constants,
             ActiveProcessesView,
             ProcessDefinitionsView,
             ProcessHistoryView,
@@ -40,7 +42,7 @@ define([
 
             this.parentRender(_.bind(function(){
                 this.model.processDefinitions = new AbstractCollection();
-                this.model.processDefinitions.url =  "/openidm/workflow/processdefinition?_queryId=filtered-query";
+                this.model.processDefinitions.url =  "/" + constants.context + "/workflow/processdefinition?_queryId=filtered-query";
 
                 this.model.processDefinitions.getFirstPage().then(function(processDefinitions){
                     processDefinition = _.chain(processDefinitions.result)
diff --git a/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/workflow/TaskInstanceView.js b/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/workflow/TaskInstanceView.js
index 20b1ddcf78..ecb3815103 100644
--- a/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/workflow/TaskInstanceView.js
+++ b/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/workflow/TaskInstanceView.js
@@ -25,9 +25,9 @@ define([
     "org/forgerock/commons/ui/common/main/AbstractModel",
     "org/forgerock/openidm/ui/admin/util/WorkflowUtils"
 ], function($, _, Handlebars, AbstractView, eventManager, constants, UIUtils, AbstractModel, WorkflowUtils) {
-    var TaskModel = AbstractModel.extend({ url: "/openidm/workflow/taskinstance" }),
-        ProcessModel = AbstractModel.extend({ url: "/openidm/workflow/processdefinition" }),
-        UserModel = AbstractModel.extend({ url: "/openidm/managed/user" }),
+    var TaskModel = AbstractModel.extend({ url: "/" + constants.context + "/workflow/taskinstance" }),
+        ProcessModel = AbstractModel.extend({ url: "/" + constants.context + "/workflow/processdefinition" }),
+        UserModel = AbstractModel.extend({ url: "/" + constants.context + "/managed/user" }),
         TaskInstanceView = AbstractView.extend({
             template: "templates/admin/workflow/TaskInstanceViewTemplate.html",
 
diff --git a/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/workflow/TaskListView.js b/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/workflow/TaskListView.js
index 3ef0b10d46..a2b5259f53 100644
--- a/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/workflow/TaskListView.js
+++ b/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/workflow/TaskListView.js
@@ -50,16 +50,16 @@ define([
         render: function(args, callback) {
             this.parentRender(_.bind(function() {
                 var tasksGrid,
-                    TaskInstanceModel = AbstractModel.extend({ url: "/openidm/workflow/taskinstance" }),
+                    TaskInstanceModel = AbstractModel.extend({ url: "/" + constants.context + "/workflow/taskinstance" }),
                     TaskModel = AbstractCollection.extend({
                         model: TaskInstanceModel,
-                        url: "/openidm/workflow/taskinstance?_queryId=filtered-query"
+                        url: "/" + constants.context + "/workflow/taskinstance?_queryId=filtered-query"
                     }),
                     Tasks = new TaskModel();
 
                 this.model = new TaskInstanceModel();
 
-                Tasks.url = "/openidm/workflow/taskinstance?_queryId=filtered-query";
+                Tasks.url = "/" + constants.context + "/workflow/taskinstance?_queryId=filtered-query";
                 Tasks.setSorting("-createTime");
                 Tasks.state.pageSize = null;
 
@@ -146,11 +146,11 @@ define([
                     preload: true,
                     onChange: _.bind(function(value) {
                         if(value === "anyone") {
-                            Tasks.url = "/openidm/workflow/taskinstance?_queryId=filtered-query";
+                            Tasks.url = "/" + constants.context + "/workflow/taskinstance?_queryId=filtered-query";
                         } else if(value === "unassigned") {
-                            Tasks.url = "/openidm/workflow/taskinstance?_queryId=filtered-query&unassigned=true";
+                            Tasks.url = "/" + constants.context + "/workflow/taskinstance?_queryId=filtered-query&unassigned=true";
                         } else {
-                            Tasks.url = "/openidm/workflow/taskinstance?_queryId=filtered-query&assignee=" + value;
+                            Tasks.url = "/" + constants.context + "/workflow/taskinstance?_queryId=filtered-query&assignee=" + value;
                         }
 
                         Tasks.getFirstPage();
diff --git a/openidm-ui/openidm-ui-common/src/main/js/org/forgerock/openidm/ui/common/delegates/ConfigDelegate.js b/openidm-ui/openidm-ui-common/src/main/js/org/forgerock/openidm/ui/common/delegates/ConfigDelegate.js
index 57e89eccbb..eed5dd55a6 100644
--- a/openidm-ui/openidm-ui-common/src/main/js/org/forgerock/openidm/ui/common/delegates/ConfigDelegate.js
+++ b/openidm-ui/openidm-ui-common/src/main/js/org/forgerock/openidm/ui/common/delegates/ConfigDelegate.js
@@ -23,7 +23,7 @@ define([
     "org/forgerock/commons/ui/common/main/EventManager"
 ], function($, _, constants, AbstractDelegate, conf, eventManager) {
 
-    var obj = new AbstractDelegate(constants.host + "/openidm/config");
+    var obj = new AbstractDelegate(constants.host + "/" + constants.context + "/config");
 
     obj.serviceCall = function (callParams) {
 
diff --git a/openidm-ui/openidm-ui-common/src/main/js/org/forgerock/openidm/ui/common/delegates/InfoDelegate.js b/openidm-ui/openidm-ui-common/src/main/js/org/forgerock/openidm/ui/common/delegates/InfoDelegate.js
index 841c3bcc67..83e9ecb9dc 100644
--- a/openidm-ui/openidm-ui-common/src/main/js/org/forgerock/openidm/ui/common/delegates/InfoDelegate.js
+++ b/openidm-ui/openidm-ui-common/src/main/js/org/forgerock/openidm/ui/common/delegates/InfoDelegate.js
@@ -19,7 +19,7 @@ define([
     "org/forgerock/commons/ui/common/main/AbstractDelegate"
 ], function(constants, AbstractDelegate) {
 
-    var obj = new AbstractDelegate(constants.host + "/openidm/info/");
+    var obj = new AbstractDelegate(constants.host + "/" + constants.context + "/info/");
 
     obj.getVersion = function() {
         return obj.serviceCall({
diff --git a/openidm-ui/openidm-ui-common/src/main/js/org/forgerock/openidm/ui/common/delegates/InternalUserDelegate.js b/openidm-ui/openidm-ui-common/src/main/js/org/forgerock/openidm/ui/common/delegates/InternalUserDelegate.js
index 79ccf2e8a5..4a0d019ed0 100644
--- a/openidm-ui/openidm-ui-common/src/main/js/org/forgerock/openidm/ui/common/delegates/InternalUserDelegate.js
+++ b/openidm-ui/openidm-ui-common/src/main/js/org/forgerock/openidm/ui/common/delegates/InternalUserDelegate.js
@@ -21,7 +21,7 @@ define([
     "org/forgerock/commons/ui/common/main/EventManager"
 ], function(constants, AbstractDelegate, configuration, eventManager) {
 
-    var obj = new AbstractDelegate(constants.host + "/openidm/repo/internal/user");
+    var obj = new AbstractDelegate(constants.host + "/" + constants.context + "/repo/internal/user");
 
     obj.patchSelectedUserAttributes = function(id, rev, patchDefinitionObject, successCallback, errorCallback, noChangesCallback) {
         //PATCH for repo is unsupported
diff --git a/openidm-ui/openidm-ui-common/src/main/js/org/forgerock/openidm/ui/common/delegates/PolicyDelegate.js b/openidm-ui/openidm-ui-common/src/main/js/org/forgerock/openidm/ui/common/delegates/PolicyDelegate.js
index 26c6e983f6..0729821739 100644
--- a/openidm-ui/openidm-ui-common/src/main/js/org/forgerock/openidm/ui/common/delegates/PolicyDelegate.js
+++ b/openidm-ui/openidm-ui-common/src/main/js/org/forgerock/openidm/ui/common/delegates/PolicyDelegate.js
@@ -22,7 +22,7 @@ define([
     "org/forgerock/commons/ui/common/main/EventManager"
 ], function(_, constants, AbstractDelegate, configuration, eventManager) {
 
-    var obj = new AbstractDelegate(constants.host + "/openidm/policy");
+    var obj = new AbstractDelegate(constants.host + "/" + constants.context + "/policy");
 
     obj.readEntity = function (baseEntity) {
         if (baseEntity === "selfservice/registration") {
diff --git a/openidm-ui/openidm-ui-common/src/main/js/org/forgerock/openidm/ui/common/delegates/ResourceDelegate.js b/openidm-ui/openidm-ui-common/src/main/js/org/forgerock/openidm/ui/common/delegates/ResourceDelegate.js
index 7b1ca5cff7..15022a45b4 100644
--- a/openidm-ui/openidm-ui-common/src/main/js/org/forgerock/openidm/ui/common/delegates/ResourceDelegate.js
+++ b/openidm-ui/openidm-ui-common/src/main/js/org/forgerock/openidm/ui/common/delegates/ResourceDelegate.js
@@ -24,7 +24,7 @@ define([
     "org/forgerock/commons/ui/common/util/ObjectUtil"
 ], function($, _, constants, AbstractDelegate, configDelegate, messagesManager, ObjectUtil) {
 
-    var obj = new AbstractDelegate(constants.host + "/openidm/");
+    var obj = new AbstractDelegate(constants.host + "/" + constants.context + "/");
 
     obj.getSchema = function(args){
         var objectType = args[0],
@@ -145,7 +145,7 @@ define([
 
     obj.linkedView = function(id, resourcePath) {
         return obj.serviceCall({
-            serviceUrl: constants.host + "/openidm/endpoint/linkedView/" + resourcePath,
+            serviceUrl: constants.host + "/" + constants.context + "/endpoint/linkedView/" + resourcePath,
             url: id,
             type: "GET"
         });
diff --git a/openidm-ui/openidm-ui-common/src/main/js/org/forgerock/openidm/ui/common/delegates/SearchDelegate.js b/openidm-ui/openidm-ui-common/src/main/js/org/forgerock/openidm/ui/common/delegates/SearchDelegate.js
index c25b469901..db881d3953 100644
--- a/openidm-ui/openidm-ui-common/src/main/js/org/forgerock/openidm/ui/common/delegates/SearchDelegate.js
+++ b/openidm-ui/openidm-ui-common/src/main/js/org/forgerock/openidm/ui/common/delegates/SearchDelegate.js
@@ -20,7 +20,7 @@ define([
     "org/forgerock/commons/ui/common/main/AbstractDelegate"
 ], function(_, constants, AbstractDelegate) {
 
-    var obj = new AbstractDelegate(constants.host + "/openidm");
+    var obj = new AbstractDelegate(constants.host + "/" + constants.context);
 
     obj.searchResults = function (resource, props, searchString, comparisonOperator, additionalQuery) {
         var maxPageSize = 10;
diff --git a/openidm-ui/openidm-ui-common/src/main/js/org/forgerock/openidm/ui/common/delegates/SocialDelegate.js b/openidm-ui/openidm-ui-common/src/main/js/org/forgerock/openidm/ui/common/delegates/SocialDelegate.js
index e78e1d6549..b46d96b45a 100644
--- a/openidm-ui/openidm-ui-common/src/main/js/org/forgerock/openidm/ui/common/delegates/SocialDelegate.js
+++ b/openidm-ui/openidm-ui-common/src/main/js/org/forgerock/openidm/ui/common/delegates/SocialDelegate.js
@@ -27,7 +27,7 @@ define([
     Constants,
     OAuth) {
 
-    var obj = new AbstractDelegate(Constants.host + "/openidm/identityProviders");
+    var obj = new AbstractDelegate(Constants.host + "/" + Constants.context + "/identityProviders");
 
     obj.loginProviders = function () {
         var headers = {},
@@ -38,7 +38,7 @@ define([
 
         return obj.serviceCall({
             url: "",
-            serviceUrl: "/openidm/authentication",
+            serviceUrl: "/" + Constants.context + "/authentication",
             type: "get",
             headers: headers
         }).then((results) => {
@@ -82,7 +82,7 @@ define([
     obj.getAuthToken = function (provider, code, redirect_uri) {
         return this.serviceCall({
             "type": "POST",
-            "serviceUrl": "/openidm/authentication",
+            "serviceUrl": "/" + Constants.context + "/authentication",
             "url": "?_action=getAuthToken",
             "data": JSON.stringify({
                 provider: provider,
diff --git a/openidm-ui/openidm-ui-common/src/main/js/org/forgerock/openidm/ui/common/delegates/SystemHealthDelegate.js b/openidm-ui/openidm-ui-common/src/main/js/org/forgerock/openidm/ui/common/delegates/SystemHealthDelegate.js
index 64a9b3ea9d..32012a29a2 100644
--- a/openidm-ui/openidm-ui-common/src/main/js/org/forgerock/openidm/ui/common/delegates/SystemHealthDelegate.js
+++ b/openidm-ui/openidm-ui-common/src/main/js/org/forgerock/openidm/ui/common/delegates/SystemHealthDelegate.js
@@ -20,7 +20,7 @@ define([
     "org/forgerock/commons/ui/common/main/EventManager"
 ], function(constants, AbstractDelegate, eventManager) {
 
-    var obj = new AbstractDelegate(constants.host + "/openidm/health");
+    var obj = new AbstractDelegate(constants.host + "/" + constants.context + "/health");
 
     obj.connectorDelegateCache = {};
 
diff --git a/openidm-ui/openidm-ui-common/src/main/js/org/forgerock/openidm/ui/common/notifications/NotificationDelegate.js b/openidm-ui/openidm-ui-common/src/main/js/org/forgerock/openidm/ui/common/notifications/NotificationDelegate.js
index 7994d3734f..e4439b9b3f 100644
--- a/openidm-ui/openidm-ui-common/src/main/js/org/forgerock/openidm/ui/common/notifications/NotificationDelegate.js
+++ b/openidm-ui/openidm-ui-common/src/main/js/org/forgerock/openidm/ui/common/notifications/NotificationDelegate.js
@@ -21,7 +21,7 @@ define([
     "org/forgerock/commons/ui/common/main/EventManager"
 ], function(constants, AbstractDelegate, configuration, eventManager) {
 
-    var obj = new AbstractDelegate(constants.host + "/openidm/endpoint/usernotifications");
+    var obj = new AbstractDelegate(constants.host + "/" + constants.context + "/endpoint/usernotifications");
 
     obj.getNotificationsForUser = function(successCallback, errorCallback) {
         obj.serviceCall({
diff --git a/openidm-ui/openidm-ui-common/src/main/js/org/forgerock/openidm/ui/common/workflow/WorkflowDelegate.js b/openidm-ui/openidm-ui-common/src/main/js/org/forgerock/openidm/ui/common/workflow/WorkflowDelegate.js
index 0db80b9660..8904bdca65 100644
--- a/openidm-ui/openidm-ui-common/src/main/js/org/forgerock/openidm/ui/common/workflow/WorkflowDelegate.js
+++ b/openidm-ui/openidm-ui-common/src/main/js/org/forgerock/openidm/ui/common/workflow/WorkflowDelegate.js
@@ -22,11 +22,11 @@ define([
 
     var obj = {}, taskManagementUrl, processManagementUrl, taskDefinitionUrl, processDefinitionUrl, endpointUrl, processDefinitionsEndpointUrl;
 
-    taskManagementUrl       =   "/openidm/workflow/taskinstance";
-    processManagementUrl    =   "/openidm/workflow/processinstance";
-    processDefinitionUrl = "/openidm/workflow/processdefinition";
-    endpointUrl = "/openidm/endpoint/gettasksview";
-    processDefinitionsEndpointUrl = "/openidm/endpoint/getprocessesforuser";
+    taskManagementUrl       =   "/" + constants.context + "/workflow/taskinstance";
+    processManagementUrl    =   "/" + constants.context + "/workflow/processinstance";
+    processDefinitionUrl = "/" + constants.context + "/workflow/processdefinition";
+    endpointUrl = "/" + constants.context + "/endpoint/gettasksview";
+    processDefinitionsEndpointUrl = "/" + constants.context + "/endpoint/getprocessesforuser";
 
 
     obj.startProccess = function(proccessNameKey, params, successCallback, errorCallback) {
diff --git a/openidm-ui/openidm-ui-common/src/test/qunit/tests/org/forgerock/openidm/ui/common/util/ConstantsTest.js b/openidm-ui/openidm-ui-common/src/test/qunit/tests/org/forgerock/openidm/ui/common/util/ConstantsTest.js
index dba1f757a1..09fb068fba 100644
--- a/openidm-ui/openidm-ui-common/src/test/qunit/tests/org/forgerock/openidm/ui/common/util/ConstantsTest.js
+++ b/openidm-ui/openidm-ui-common/src/test/qunit/tests/org/forgerock/openidm/ui/common/util/ConstantsTest.js
@@ -2,4 +2,15 @@ define([
     "org/forgerock/openidm/ui/common/util/Constants"
 ], function (Constants) {
     QUnit.module('Constants Tests');
+
+    QUnit.test("Constants.context defaults to 'openidm'", function (assert) {
+        assert.equal(Constants.context, "openidm",
+            "The default context should be 'openidm'");
+    });
+
+    QUnit.test("Constants.context produces correct REST API path prefix", function (assert) {
+        var contextPath = "/" + Constants.context;
+        assert.equal(contextPath, "/openidm",
+            "The default REST API path prefix should be '/openidm'");
+    });
 });
\ No newline at end of file
diff --git a/openidm-zip/src/main/resources/conf/system.properties b/openidm-zip/src/main/resources/conf/system.properties
index 22e3e08bc7..dc53fa0293 100644
--- a/openidm-zip/src/main/resources/conf/system.properties
+++ b/openidm-zip/src/main/resources/conf/system.properties
@@ -9,6 +9,11 @@ launcher.project.url=&{launcher.project.url}
 
 # Example bootstrap setting to set on command line or in this file
 
+# REST context path for the OpenIDM API. Default is /openidm.
+# Change this to serve the REST API under a different path (e.g., /myidm).
+# This can also be set via the JVM argument: -Dopenidm.context.path=/myidm
+# openidm.context.path=/openidm
+
 # To disable the JSON file monitoring you need to uncomment this line
 # openidm.fileinstall.enabled=false
 

From 81b026fe6d80c4d120daba4ed8d24e8009fe0082 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Tue, 31 Mar 2026 13:46:49 +0000
Subject: [PATCH 3/5] Add openidm.context.path documentation to integrators
 guide

Agent-Logs-Url: https://github.com/OpenIdentityPlatform/OpenIDM/sessions/09144507-08e1-47e9-8c8e-fa167bc6fa76

Co-authored-by: vharseko <6818498+vharseko@users.noreply.github.com>
---
 .../integrators-guide/appendix-rest.adoc      |  5 ++++
 .../integrators-guide/chap-configuration.adoc | 29 +++++++++++++++++++
 2 files changed, 34 insertions(+)

diff --git a/openidm-doc/src/main/asciidoc/integrators-guide/appendix-rest.adoc b/openidm-doc/src/main/asciidoc/integrators-guide/appendix-rest.adoc
index 9a4eaf7aa3..9f070730d0 100644
--- a/openidm-doc/src/main/asciidoc/integrators-guide/appendix-rest.adoc
+++ b/openidm-doc/src/main/asciidoc/integrators-guide/appendix-rest.adoc
@@ -82,6 +82,11 @@ Note that for LDAP resources, you should not map the LDAP `dn` to the OpenIDM `u
 ...
 ----
 
+[NOTE]
+====
+The `/openidm` context path shown in all URI examples throughout this guide is the default value. You can change it by setting the `openidm.context.path` system property in `conf/system.properties` or as a JVM argument (for example, `-Dopenidm.context.path=/myidm`). For more information, see xref:chap-configuration.adoc#configuring-rest-context-path["Configuring the REST Context Path"] in the __Integrator's Guide__.
+====
+
 
 [#rest-object-identifier]
 === Object Identifiers
diff --git a/openidm-doc/src/main/asciidoc/integrators-guide/chap-configuration.adoc b/openidm-doc/src/main/asciidoc/integrators-guide/chap-configuration.adoc
index 8ded4b15ec..860bdd7de0 100644
--- a/openidm-doc/src/main/asciidoc/integrators-guide/chap-configuration.adoc
+++ b/openidm-doc/src/main/asciidoc/integrators-guide/chap-configuration.adoc
@@ -152,6 +152,35 @@ felix.fileinstall.enableConfigSave=false
 ----
 
 
+[#configuring-rest-context-path]
+==== Configuring the REST Context Path
+
+By default, the OpenIDM REST API is available under the `/openidm` context path (for example, `\https://localhost:8443/openidm/`). You can change this base path by setting the `openidm.context.path` system property.
+
+To set a custom REST context path, edit the `conf/system.properties` file and uncomment or add the following line, replacing `/openidm` with your preferred path:
+
+[source]
+----
+openidm.context.path=/openidm
+----
+
+Alternatively, you can pass the property as a JVM argument when starting OpenIDM:
+
+[source, console]
+----
+$ OPENIDM_OPTS="-Dopenidm.context.path=/myidm" ./startup.sh
+----
+
+The path must begin with a `/` and must not end with `/`. If the value provided does not start with a `/`, one is added automatically.
+
+After changing this property, the REST API will be accessible under the new path, for example `\https://localhost:8443/myidm/config`, and the Admin UI and Self-Service UI will automatically use the configured path for all API calls.
+
+[NOTE]
+====
+Changing the context path affects all REST API endpoints, the Admin UI, and the Self-Service UI. Ensure that any external integrations, load balancer rules, or documentation referring to the `/openidm` path are updated accordingly.
+====
+
+
 [#configuring-proxy]
 ==== Communicating Through a Proxy Server
 

From 5e4f102a937fc8050dfee135126dc3995046d603 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Tue, 31 Mar 2026 13:56:22 +0000
Subject: [PATCH 4/5] Update copyright year to 2024-2026 in modified docs files

Agent-Logs-Url: https://github.com/OpenIdentityPlatform/OpenIDM/sessions/e03b9d05-a47d-47c4-bdba-5f38d059f841

Co-authored-by: vharseko <6818498+vharseko@users.noreply.github.com>
---
 .../src/main/asciidoc/integrators-guide/appendix-rest.adoc      | 2 +-
 .../src/main/asciidoc/integrators-guide/chap-configuration.adoc | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/openidm-doc/src/main/asciidoc/integrators-guide/appendix-rest.adoc b/openidm-doc/src/main/asciidoc/integrators-guide/appendix-rest.adoc
index 9f070730d0..7d1e3f0748 100644
--- a/openidm-doc/src/main/asciidoc/integrators-guide/appendix-rest.adoc
+++ b/openidm-doc/src/main/asciidoc/integrators-guide/appendix-rest.adoc
@@ -12,7 +12,7 @@
   information: "Portions copyright [year] [name of copyright owner]".
  
   Copyright 2017 ForgeRock AS.
-  Portions Copyright 2024-2025 3A Systems LLC.
+  Portions Copyright 2024-2026 3A Systems LLC.
 ////
 
 :figure-caption!:
diff --git a/openidm-doc/src/main/asciidoc/integrators-guide/chap-configuration.adoc b/openidm-doc/src/main/asciidoc/integrators-guide/chap-configuration.adoc
index 860bdd7de0..83dfe05552 100644
--- a/openidm-doc/src/main/asciidoc/integrators-guide/chap-configuration.adoc
+++ b/openidm-doc/src/main/asciidoc/integrators-guide/chap-configuration.adoc
@@ -12,7 +12,7 @@
   information: "Portions copyright [year] [name of copyright owner]".
  
   Copyright 2017 ForgeRock AS.
-  Portions Copyright 2024-2025 3A Systems LLC.
+  Portions Copyright 2024-2026 3A Systems LLC.
 ////
 
 :figure-caption!:

From 9d963ed4832d122fa17b7c06cc0a820cc82ec3fc Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Tue, 31 Mar 2026 14:01:40 +0000
Subject: [PATCH 5/5] Add/update Portions copyright 2026 3A Systems LLC in all
 PR-changed files

Agent-Logs-Url: https://github.com/OpenIdentityPlatform/OpenIDM/sessions/e00159d5-da69-4e8a-be0c-81fd8a547f3c

Co-authored-by: vharseko <6818498+vharseko@users.noreply.github.com>
---
 .../forgerock/openidm/servlet/internal/ServletComponent.java    | 2 +-
 .../openidm/servlet/internal/ServletComponentTest.java          | 2 +-
 .../servletregistration/impl/ServletRegistrationSingleton.java  | 2 +-
 .../org/forgerock/openidm/shell/impl/RemoteCommandScope.java    | 1 +
 .../src/main/js/config/validators/AdminValidators.js            | 1 +
 .../org/forgerock/openidm/ui/admin/delegates/AuditDelegate.js   | 1 +
 .../org/forgerock/openidm/ui/admin/delegates/ClusterDelegate.js | 1 +
 .../forgerock/openidm/ui/admin/delegates/ConnectorDelegate.js   | 1 +
 .../openidm/ui/admin/delegates/ExternalAccessDelegate.js        | 1 +
 .../forgerock/openidm/ui/admin/delegates/MaintenanceDelegate.js | 1 +
 .../org/forgerock/openidm/ui/admin/delegates/ReconDelegate.js   | 1 +
 .../forgerock/openidm/ui/admin/delegates/SchedulerDelegate.js   | 1 +
 .../org/forgerock/openidm/ui/admin/delegates/ScriptDelegate.js  | 1 +
 .../forgerock/openidm/ui/admin/delegates/SecurityDelegate.js    | 1 +
 .../js/org/forgerock/openidm/ui/admin/delegates/SyncDelegate.js | 1 +
 .../forgerock/openidm/ui/admin/delegates/WorkflowDelegate.js    | 1 +
 .../admin/mapping/association/DataAssociationManagementView.js  | 1 +
 .../org/forgerock/openidm/ui/admin/mapping/util/MappingUtils.js | 1 +
 .../js/org/forgerock/openidm/ui/admin/settings/SettingsView.js  | 1 +
 .../main/js/org/forgerock/openidm/ui/admin/user/EditUserView.js | 1 +
 .../forgerock/openidm/ui/admin/workflow/ActiveProcessesView.js  | 1 +
 .../openidm/ui/admin/workflow/ProcessDefinitionView.js          | 1 +
 .../openidm/ui/admin/workflow/ProcessDefinitionsView.js         | 1 +
 .../forgerock/openidm/ui/admin/workflow/ProcessHistoryView.js   | 1 +
 .../forgerock/openidm/ui/admin/workflow/ProcessInstanceView.js  | 1 +
 .../org/forgerock/openidm/ui/admin/workflow/ProcessListView.js  | 1 +
 .../org/forgerock/openidm/ui/admin/workflow/TaskInstanceView.js | 1 +
 .../js/org/forgerock/openidm/ui/admin/workflow/TaskListView.js  | 1 +
 .../org/forgerock/openidm/ui/common/delegates/ConfigDelegate.js | 1 +
 .../org/forgerock/openidm/ui/common/delegates/InfoDelegate.js   | 1 +
 .../openidm/ui/common/delegates/InternalUserDelegate.js         | 1 +
 .../org/forgerock/openidm/ui/common/delegates/PolicyDelegate.js | 1 +
 .../forgerock/openidm/ui/common/delegates/ResourceDelegate.js   | 1 +
 .../org/forgerock/openidm/ui/common/delegates/SearchDelegate.js | 1 +
 .../org/forgerock/openidm/ui/common/delegates/SocialDelegate.js | 1 +
 .../openidm/ui/common/delegates/SystemHealthDelegate.js         | 1 +
 .../openidm/ui/common/notifications/NotificationDelegate.js     | 1 +
 .../forgerock/openidm/ui/common/workflow/WorkflowDelegate.js    | 1 +
 38 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/openidm-api-servlet/src/main/java/org/forgerock/openidm/servlet/internal/ServletComponent.java b/openidm-api-servlet/src/main/java/org/forgerock/openidm/servlet/internal/ServletComponent.java
index f844be7abe..848611ddc5 100644
--- a/openidm-api-servlet/src/main/java/org/forgerock/openidm/servlet/internal/ServletComponent.java
+++ b/openidm-api-servlet/src/main/java/org/forgerock/openidm/servlet/internal/ServletComponent.java
@@ -12,7 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2013-2016 ForgeRock AS.
- * Portions Copyrighted 2024-2025 3A Systems LLC.
+ * Portions Copyrighted 2024-2026 3A Systems LLC.
  */
 package org.forgerock.openidm.servlet.internal;
 
diff --git a/openidm-api-servlet/src/test/java/org/forgerock/openidm/servlet/internal/ServletComponentTest.java b/openidm-api-servlet/src/test/java/org/forgerock/openidm/servlet/internal/ServletComponentTest.java
index 84db58d187..c44266a5b7 100644
--- a/openidm-api-servlet/src/test/java/org/forgerock/openidm/servlet/internal/ServletComponentTest.java
+++ b/openidm-api-servlet/src/test/java/org/forgerock/openidm/servlet/internal/ServletComponentTest.java
@@ -11,7 +11,7 @@
  * Header, with the fields enclosed by brackets [] replaced by your own identifying
  * information: "Portions copyright [year] [name of copyright owner]".
  *
- * Copyright 2025 3A Systems LLC.
+ * Copyright 2025-2026 3A Systems LLC.
  */
 
 package org.forgerock.openidm.servlet.internal;
diff --git a/openidm-servlet-registrator/src/main/java/org/forgerock/openidm/servletregistration/impl/ServletRegistrationSingleton.java b/openidm-servlet-registrator/src/main/java/org/forgerock/openidm/servletregistration/impl/ServletRegistrationSingleton.java
index 1973c3f6f6..879be7308d 100644
--- a/openidm-servlet-registrator/src/main/java/org/forgerock/openidm/servletregistration/impl/ServletRegistrationSingleton.java
+++ b/openidm-servlet-registrator/src/main/java/org/forgerock/openidm/servletregistration/impl/ServletRegistrationSingleton.java
@@ -21,7 +21,7 @@
  * your own identifying information:
  * "Portions Copyrighted [year] [name of copyright owner]"
  *
- * Portions Copyrighted 2024-2025 3A Systems LLC.
+ * Portions Copyrighted 2024-2026 3A Systems LLC.
  */
 
 package org.forgerock.openidm.servletregistration.impl;
diff --git a/openidm-shell/src/main/java/org/forgerock/openidm/shell/impl/RemoteCommandScope.java b/openidm-shell/src/main/java/org/forgerock/openidm/shell/impl/RemoteCommandScope.java
index 7d2e43f98b..1661df019b 100644
--- a/openidm-shell/src/main/java/org/forgerock/openidm/shell/impl/RemoteCommandScope.java
+++ b/openidm-shell/src/main/java/org/forgerock/openidm/shell/impl/RemoteCommandScope.java
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2011-2016 ForgeRock AS.
+ * Portions copyright 2026 3A Systems LLC.
  */
 package org.forgerock.openidm.shell.impl;
 
diff --git a/openidm-ui/openidm-ui-admin/src/main/js/config/validators/AdminValidators.js b/openidm-ui/openidm-ui-admin/src/main/js/config/validators/AdminValidators.js
index 0c7b6e55a2..7e775b1b01 100644
--- a/openidm-ui/openidm-ui-admin/src/main/js/config/validators/AdminValidators.js
+++ b/openidm-ui/openidm-ui-admin/src/main/js/config/validators/AdminValidators.js
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2015-2016 ForgeRock AS.
+ * Portions copyright 2026 3A Systems LLC.
  */
 
 define([
diff --git a/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/delegates/AuditDelegate.js b/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/delegates/AuditDelegate.js
index 01cfcd1605..1f7fb2f75f 100644
--- a/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/delegates/AuditDelegate.js
+++ b/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/delegates/AuditDelegate.js
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2015-2016 ForgeRock AS.
+ * Portions copyright 2026 3A Systems LLC.
  */
 
 define([
diff --git a/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/delegates/ClusterDelegate.js b/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/delegates/ClusterDelegate.js
index 8b969e99e1..bdb00a9b9e 100644
--- a/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/delegates/ClusterDelegate.js
+++ b/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/delegates/ClusterDelegate.js
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2015-2016 ForgeRock AS.
+ * Portions copyright 2026 3A Systems LLC.
  */
 
 define([
diff --git a/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/delegates/ConnectorDelegate.js b/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/delegates/ConnectorDelegate.js
index dde5cb05f4..6c81086f09 100644
--- a/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/delegates/ConnectorDelegate.js
+++ b/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/delegates/ConnectorDelegate.js
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2014-2016 ForgeRock AS.
+ * Portions copyright 2026 3A Systems LLC.
  */
 
 define([
diff --git a/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/delegates/ExternalAccessDelegate.js b/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/delegates/ExternalAccessDelegate.js
index fbf6c1a013..7aa65671fb 100644
--- a/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/delegates/ExternalAccessDelegate.js
+++ b/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/delegates/ExternalAccessDelegate.js
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2014-2016 ForgeRock AS.
+ * Portions copyright 2026 3A Systems LLC.
  */
 
 define([
diff --git a/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/delegates/MaintenanceDelegate.js b/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/delegates/MaintenanceDelegate.js
index 77037fecbd..715f6812cf 100644
--- a/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/delegates/MaintenanceDelegate.js
+++ b/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/delegates/MaintenanceDelegate.js
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2015-2016 ForgeRock AS.
+ * Portions copyright 2026 3A Systems LLC.
  */
 
 define([
diff --git a/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/delegates/ReconDelegate.js b/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/delegates/ReconDelegate.js
index 90d6f31ec8..1e883e5a6d 100644
--- a/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/delegates/ReconDelegate.js
+++ b/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/delegates/ReconDelegate.js
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2011-2016 ForgeRock AS.
+ * Portions copyright 2026 3A Systems LLC.
  */
 
 define([
diff --git a/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/delegates/SchedulerDelegate.js b/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/delegates/SchedulerDelegate.js
index 5f645f55fb..9cdd06c654 100644
--- a/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/delegates/SchedulerDelegate.js
+++ b/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/delegates/SchedulerDelegate.js
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2014-2016 ForgeRock AS.
+ * Portions copyright 2026 3A Systems LLC.
  */
 
 define([
diff --git a/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/delegates/ScriptDelegate.js b/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/delegates/ScriptDelegate.js
index a95a067967..7a8b71e952 100644
--- a/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/delegates/ScriptDelegate.js
+++ b/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/delegates/ScriptDelegate.js
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2015-2016 ForgeRock AS.
+ * Portions copyright 2026 3A Systems LLC.
  */
 
 define([
diff --git a/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/delegates/SecurityDelegate.js b/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/delegates/SecurityDelegate.js
index 1c49f4b555..ca622288cf 100644
--- a/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/delegates/SecurityDelegate.js
+++ b/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/delegates/SecurityDelegate.js
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2014-2016 ForgeRock AS.
+ * Portions copyright 2026 3A Systems LLC.
  */
 
 define([
diff --git a/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/delegates/SyncDelegate.js b/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/delegates/SyncDelegate.js
index 2045c28772..ceef5fabdd 100644
--- a/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/delegates/SyncDelegate.js
+++ b/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/delegates/SyncDelegate.js
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2014-2016 ForgeRock AS.
+ * Portions copyright 2026 3A Systems LLC.
  */
 
 /* eslint no-eval: 0 */
diff --git a/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/delegates/WorkflowDelegate.js b/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/delegates/WorkflowDelegate.js
index 3e115e34cd..4041d96298 100644
--- a/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/delegates/WorkflowDelegate.js
+++ b/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/delegates/WorkflowDelegate.js
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2015-2016 ForgeRock AS.
+ * Portions copyright 2026 3A Systems LLC.
  */
 
 define([
diff --git a/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/mapping/association/DataAssociationManagementView.js b/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/mapping/association/DataAssociationManagementView.js
index b800519afa..356daf94a8 100644
--- a/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/mapping/association/DataAssociationManagementView.js
+++ b/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/mapping/association/DataAssociationManagementView.js
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2015-2016 ForgeRock AS.
+ * Portions copyright 2026 3A Systems LLC.
  */
 
 define([
diff --git a/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/mapping/util/MappingUtils.js b/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/mapping/util/MappingUtils.js
index 08334bc36f..55b04ea265 100644
--- a/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/mapping/util/MappingUtils.js
+++ b/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/mapping/util/MappingUtils.js
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2011-2016 ForgeRock AS.
+ * Portions copyright 2026 3A Systems LLC.
  */
 
 define([
diff --git a/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/settings/SettingsView.js b/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/settings/SettingsView.js
index 0bf3212660..9ddad5f693 100644
--- a/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/settings/SettingsView.js
+++ b/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/settings/SettingsView.js
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2016 ForgeRock AS.
+ * Portions copyright 2026 3A Systems LLC.
  */
 
 define([
diff --git a/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/user/EditUserView.js b/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/user/EditUserView.js
index 05f2ca94f5..9261afffa2 100644
--- a/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/user/EditUserView.js
+++ b/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/user/EditUserView.js
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2015-2016 ForgeRock AS.
+ * Portions copyright 2026 3A Systems LLC.
  */
 
 define([
diff --git a/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/workflow/ActiveProcessesView.js b/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/workflow/ActiveProcessesView.js
index 556a44b310..e75a7811eb 100644
--- a/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/workflow/ActiveProcessesView.js
+++ b/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/workflow/ActiveProcessesView.js
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2015-2016 ForgeRock AS.
+ * Portions copyright 2026 3A Systems LLC.
  */
 
 define([
diff --git a/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/workflow/ProcessDefinitionView.js b/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/workflow/ProcessDefinitionView.js
index a45c15e4a0..a8168d4927 100644
--- a/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/workflow/ProcessDefinitionView.js
+++ b/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/workflow/ProcessDefinitionView.js
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2011-2016 ForgeRock AS.
+ * Portions copyright 2026 3A Systems LLC.
  */
 
 define([
diff --git a/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/workflow/ProcessDefinitionsView.js b/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/workflow/ProcessDefinitionsView.js
index 0617c9a737..1f87978b86 100644
--- a/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/workflow/ProcessDefinitionsView.js
+++ b/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/workflow/ProcessDefinitionsView.js
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2015-2016 ForgeRock AS.
+ * Portions copyright 2026 3A Systems LLC.
  */
 
 define([
diff --git a/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/workflow/ProcessHistoryView.js b/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/workflow/ProcessHistoryView.js
index 8ff66ced74..6805dd40cd 100644
--- a/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/workflow/ProcessHistoryView.js
+++ b/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/workflow/ProcessHistoryView.js
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2015-2016 ForgeRock AS.
+ * Portions copyright 2026 3A Systems LLC.
  */
 
 define([
diff --git a/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/workflow/ProcessInstanceView.js b/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/workflow/ProcessInstanceView.js
index 30df0271c9..deb6ecc8a2 100644
--- a/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/workflow/ProcessInstanceView.js
+++ b/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/workflow/ProcessInstanceView.js
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2011-2016 ForgeRock AS.
+ * Portions copyright 2026 3A Systems LLC.
  */
 
 define([
diff --git a/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/workflow/ProcessListView.js b/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/workflow/ProcessListView.js
index 2cfc745be1..1e8fdd62f3 100644
--- a/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/workflow/ProcessListView.js
+++ b/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/workflow/ProcessListView.js
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2015-2016 ForgeRock AS.
+ * Portions copyright 2026 3A Systems LLC.
  */
 
 define([
diff --git a/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/workflow/TaskInstanceView.js b/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/workflow/TaskInstanceView.js
index ecb3815103..8dcbda2932 100644
--- a/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/workflow/TaskInstanceView.js
+++ b/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/workflow/TaskInstanceView.js
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2011-2016 ForgeRock AS.
+ * Portions copyright 2026 3A Systems LLC.
  */
 
 define([
diff --git a/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/workflow/TaskListView.js b/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/workflow/TaskListView.js
index a2b5259f53..d710d5111a 100644
--- a/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/workflow/TaskListView.js
+++ b/openidm-ui/openidm-ui-admin/src/main/js/org/forgerock/openidm/ui/admin/workflow/TaskListView.js
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2015-2016 ForgeRock AS.
+ * Portions copyright 2026 3A Systems LLC.
  */
 
 define([
diff --git a/openidm-ui/openidm-ui-common/src/main/js/org/forgerock/openidm/ui/common/delegates/ConfigDelegate.js b/openidm-ui/openidm-ui-common/src/main/js/org/forgerock/openidm/ui/common/delegates/ConfigDelegate.js
index eed5dd55a6..b0665ea0c8 100644
--- a/openidm-ui/openidm-ui-common/src/main/js/org/forgerock/openidm/ui/common/delegates/ConfigDelegate.js
+++ b/openidm-ui/openidm-ui-common/src/main/js/org/forgerock/openidm/ui/common/delegates/ConfigDelegate.js
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2016 ForgeRock AS.
+ * Portions copyright 2026 3A Systems LLC.
  */
 
 define([
diff --git a/openidm-ui/openidm-ui-common/src/main/js/org/forgerock/openidm/ui/common/delegates/InfoDelegate.js b/openidm-ui/openidm-ui-common/src/main/js/org/forgerock/openidm/ui/common/delegates/InfoDelegate.js
index 83e9ecb9dc..fca3f0d987 100644
--- a/openidm-ui/openidm-ui-common/src/main/js/org/forgerock/openidm/ui/common/delegates/InfoDelegate.js
+++ b/openidm-ui/openidm-ui-common/src/main/js/org/forgerock/openidm/ui/common/delegates/InfoDelegate.js
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2015-2016 ForgeRock AS.
+ * Portions copyright 2026 3A Systems LLC.
  */
 
 define([
diff --git a/openidm-ui/openidm-ui-common/src/main/js/org/forgerock/openidm/ui/common/delegates/InternalUserDelegate.js b/openidm-ui/openidm-ui-common/src/main/js/org/forgerock/openidm/ui/common/delegates/InternalUserDelegate.js
index 4a0d019ed0..23cdc7f347 100644
--- a/openidm-ui/openidm-ui-common/src/main/js/org/forgerock/openidm/ui/common/delegates/InternalUserDelegate.js
+++ b/openidm-ui/openidm-ui-common/src/main/js/org/forgerock/openidm/ui/common/delegates/InternalUserDelegate.js
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2011-2016 ForgeRock AS.
+ * Portions copyright 2026 3A Systems LLC.
  */
 
 define([
diff --git a/openidm-ui/openidm-ui-common/src/main/js/org/forgerock/openidm/ui/common/delegates/PolicyDelegate.js b/openidm-ui/openidm-ui-common/src/main/js/org/forgerock/openidm/ui/common/delegates/PolicyDelegate.js
index 0729821739..b9237576f7 100644
--- a/openidm-ui/openidm-ui-common/src/main/js/org/forgerock/openidm/ui/common/delegates/PolicyDelegate.js
+++ b/openidm-ui/openidm-ui-common/src/main/js/org/forgerock/openidm/ui/common/delegates/PolicyDelegate.js
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2011-2016 ForgeRock AS.
+ * Portions copyright 2026 3A Systems LLC.
  */
 
 define([
diff --git a/openidm-ui/openidm-ui-common/src/main/js/org/forgerock/openidm/ui/common/delegates/ResourceDelegate.js b/openidm-ui/openidm-ui-common/src/main/js/org/forgerock/openidm/ui/common/delegates/ResourceDelegate.js
index 15022a45b4..e7843b277a 100644
--- a/openidm-ui/openidm-ui-common/src/main/js/org/forgerock/openidm/ui/common/delegates/ResourceDelegate.js
+++ b/openidm-ui/openidm-ui-common/src/main/js/org/forgerock/openidm/ui/common/delegates/ResourceDelegate.js
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2011-2016 ForgeRock AS.
+ * Portions copyright 2026 3A Systems LLC.
  */
 
 define([
diff --git a/openidm-ui/openidm-ui-common/src/main/js/org/forgerock/openidm/ui/common/delegates/SearchDelegate.js b/openidm-ui/openidm-ui-common/src/main/js/org/forgerock/openidm/ui/common/delegates/SearchDelegate.js
index db881d3953..7f6a59c626 100644
--- a/openidm-ui/openidm-ui-common/src/main/js/org/forgerock/openidm/ui/common/delegates/SearchDelegate.js
+++ b/openidm-ui/openidm-ui-common/src/main/js/org/forgerock/openidm/ui/common/delegates/SearchDelegate.js
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2015-2016 ForgeRock AS.
+ * Portions copyright 2026 3A Systems LLC.
  */
 
 define([
diff --git a/openidm-ui/openidm-ui-common/src/main/js/org/forgerock/openidm/ui/common/delegates/SocialDelegate.js b/openidm-ui/openidm-ui-common/src/main/js/org/forgerock/openidm/ui/common/delegates/SocialDelegate.js
index b46d96b45a..9d27d64a32 100644
--- a/openidm-ui/openidm-ui-common/src/main/js/org/forgerock/openidm/ui/common/delegates/SocialDelegate.js
+++ b/openidm-ui/openidm-ui-common/src/main/js/org/forgerock/openidm/ui/common/delegates/SocialDelegate.js
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2014-2016 ForgeRock AS.
+ * Portions copyright 2026 3A Systems LLC.
  */
 
 define([
diff --git a/openidm-ui/openidm-ui-common/src/main/js/org/forgerock/openidm/ui/common/delegates/SystemHealthDelegate.js b/openidm-ui/openidm-ui-common/src/main/js/org/forgerock/openidm/ui/common/delegates/SystemHealthDelegate.js
index 32012a29a2..b5fa08283e 100644
--- a/openidm-ui/openidm-ui-common/src/main/js/org/forgerock/openidm/ui/common/delegates/SystemHealthDelegate.js
+++ b/openidm-ui/openidm-ui-common/src/main/js/org/forgerock/openidm/ui/common/delegates/SystemHealthDelegate.js
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2015-2016 ForgeRock AS.
+ * Portions copyright 2026 3A Systems LLC.
  */
 
 define([
diff --git a/openidm-ui/openidm-ui-common/src/main/js/org/forgerock/openidm/ui/common/notifications/NotificationDelegate.js b/openidm-ui/openidm-ui-common/src/main/js/org/forgerock/openidm/ui/common/notifications/NotificationDelegate.js
index e4439b9b3f..843d20154d 100644
--- a/openidm-ui/openidm-ui-common/src/main/js/org/forgerock/openidm/ui/common/notifications/NotificationDelegate.js
+++ b/openidm-ui/openidm-ui-common/src/main/js/org/forgerock/openidm/ui/common/notifications/NotificationDelegate.js
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2011-2016 ForgeRock AS.
+ * Portions copyright 2026 3A Systems LLC.
  */
 
 define([
diff --git a/openidm-ui/openidm-ui-common/src/main/js/org/forgerock/openidm/ui/common/workflow/WorkflowDelegate.js b/openidm-ui/openidm-ui-common/src/main/js/org/forgerock/openidm/ui/common/workflow/WorkflowDelegate.js
index 8904bdca65..408c17bf84 100644
--- a/openidm-ui/openidm-ui-common/src/main/js/org/forgerock/openidm/ui/common/workflow/WorkflowDelegate.js
+++ b/openidm-ui/openidm-ui-common/src/main/js/org/forgerock/openidm/ui/common/workflow/WorkflowDelegate.js
@@ -12,6 +12,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2011-2016 ForgeRock AS.
+ * Portions copyright 2026 3A Systems LLC.
  */
 
 define([