Pax web 8 updates (#1056)

malmgrens4 · web-flow · commit a304cebddd0d · 2025-04-22T11:56:20.000-07:00
* Pax web 8 updates/ root context
diff --git a/ui-backend/audit/audit-application/src/main/java/org/codice/ddf/catalog/audit/application/AuditApplication.java b/ui-backend/audit/audit-application/src/main/java/org/codice/ddf/catalog/audit/application/AuditApplication.java
@@ -18,20 +18,15 @@
 import io.javalin.http.JavalinServlet;
 import java.io.IOException;
 import javax.servlet.ServletException;
-import javax.servlet.annotation.WebServlet;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import org.codice.ddf.catalog.javalin.utils.JavalinUtils;
 import org.jetbrains.annotations.NotNull;
 
-@WebServlet(
-  urlPatterns = {AuditApplication.LOOKUP_PATH + "/*"},
-  name = "AuditApplication"
-)
 public class AuditApplication extends HttpServlet {
 
-  static final String LOOKUP_PATH = "/audit";
+  static final String LOOKUP_PATH = "/search/catalog/internal/audit";
 
   private final Javalin javalin = JavalinUtils.create(LOOKUP_PATH);
 
diff --git a/ui-backend/audit/audit-application/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/ui-backend/audit/audit-application/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@@ -37,9 +37,9 @@
 
     <service ref="auditApplication" interface="javax.servlet.Servlet">
         <service-properties>
-            <entry key="osgi.http.whiteboard.servlet.pattern" value="/audit/*"/>
+            <entry key="osgi.http.whiteboard.servlet.pattern" value="/search/catalog/internal/audit/*"/>
             <entry key="osgi.http.whiteboard.servlet.name" value="auditServlet"/>
-            <entry key="osgi.http.whiteboard.context.select" value="(osgi.http.whiteboard.context.name=searchCatalogInternalContextHelper)"/>
+            <entry key="osgi.http.whiteboard.context.select" value="(osgi.http.whiteboard.context.path=/)"/>
         </service-properties>
     </service>
 
diff --git a/ui-backend/boolean-search/boolean-search-application/src/main/java/org/codice/ddf/catalog/search/application/BooleanSearchApplication.java b/ui-backend/boolean-search/boolean-search-application/src/main/java/org/codice/ddf/catalog/search/application/BooleanSearchApplication.java
@@ -5,7 +5,6 @@
 import io.javalin.http.JavalinServlet;
 import java.io.IOException;
 import javax.servlet.ServletException;
-import javax.servlet.annotation.WebServlet;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -14,13 +13,9 @@
 import org.codice.ddf.catalog.search.handlers.QueryHandler;
 import org.codice.ddf.catalog.search.handlers.SuggestionHandler;
 
-@WebServlet(
-  urlPatterns = {BooleanSearchApplication.BOOLEAN_SEARCH_PATH + "/*"},
-  name = "BooleanSearchApplication"
-)
 public class BooleanSearchApplication extends HttpServlet {
 
-  static final String BOOLEAN_SEARCH_PATH = "/boolean-search";
+  static final String BOOLEAN_SEARCH_PATH = "/search/catalog/internal/boolean-search";
 
   private final Javalin javalin = JavalinUtils.create(BOOLEAN_SEARCH_PATH);
 
diff --git a/ui-backend/boolean-search/boolean-search-application/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/ui-backend/boolean-search/boolean-search-application/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@@ -12,9 +12,9 @@
 
     <service ref="booleanSearchApplication" interface="javax.servlet.Servlet">
         <service-properties>
-            <entry key="osgi.http.whiteboard.servlet.pattern" value="/boolean-search/*"/>
+            <entry key="osgi.http.whiteboard.servlet.pattern" value="/search/catalog/internal/boolean-search/*"/>
             <entry key="osgi.http.whiteboard.servlet.name" value="booleanSearchServlet"/>
-            <entry key="osgi.http.whiteboard.context.select" value="(osgi.http.whiteboard.context.name=searchCatalogInternalContextHelper)"/>
+            <entry key="osgi.http.whiteboard.context.select" value="(osgi.http.whiteboard.context.path=/)"/>
         </service-properties>
     </service>
 
diff --git a/ui-backend/catalog-ui-oauth/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/ui-backend/catalog-ui-oauth/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@@ -30,9 +30,9 @@
 
     <service ref="sparkServlet" interface="javax.servlet.Servlet">
         <service-properties>
-            <entry key="osgi.http.whiteboard.servlet.pattern" value="/oauth/*"/>
+            <entry key="osgi.http.whiteboard.servlet.pattern" value="/search/catalog/internal/oauth/*"/>
             <entry key="osgi.http.whiteboard.servlet.name" value="oauthSparkServlet"/>
-            <entry key="osgi.http.whiteboard.context.select" value="(osgi.http.whiteboard.context.name=searchCatalogInternalContextHelper)"/>
+            <entry key="osgi.http.whiteboard.context.select" value="(osgi.http.whiteboard.context.path=/)"/>
             <entry key="osgi.http.whiteboard.servlet.asyncSupported" value="true"/>
         </service-properties>
     </service>
diff --git a/ui-backend/catalog-ui-search/src/main/java/org/codice/ddf/catalog/ui/ProxyContextHelper.java b/ui-backend/catalog-ui-search/src/main/java/org/codice/ddf/catalog/ui/ProxyContextHelper.java
diff --git a/ui-backend/catalog-ui-search/src/main/java/org/codice/ddf/catalog/ui/SearchCatalogInternalContextHelper.java b/ui-backend/catalog-ui-search/src/main/java/org/codice/ddf/catalog/ui/SearchCatalogInternalContextHelper.java
diff --git a/ui-backend/catalog-ui-search/src/main/resources/OSGI-INF/blueprint/endpoints.xml b/ui-backend/catalog-ui-search/src/main/resources/OSGI-INF/blueprint/endpoints.xml
@@ -38,13 +38,21 @@ Services (HTTP/WS) that catalog-ui-search provides for the UI
 
     <service ref="sparkServlet" interface="javax.servlet.Servlet">
         <service-properties>
-            <entry key="osgi.http.whiteboard.servlet.pattern" value="/*"/>
+            <entry key="osgi.http.whiteboard.servlet.pattern" value="/search/catalog/internal/*"/>
             <entry key="osgi.http.whiteboard.servlet.name" value="searchCatalogInternalServlet"/>
-            <entry key="osgi.http.whiteboard.context.select" value="(osgi.http.whiteboard.context.name=searchCatalogInternalContextHelper)"/>
+            <entry key="osgi.http.whiteboard.context.select" value="(osgi.http.whiteboard.context.path=/)"/>
             <entry key="osgi.http.whiteboard.servlet.asyncSupported" value="true"/>
         </service-properties>
     </service>
 
+    <service ref="socketServlet" interface="javax.servlet.Servlet">
+        <service-properties>
+            <entry key="osgi.http.whiteboard.servlet.pattern" value="/search/catalog/ws/*"/>
+            <entry key="osgi.http.whiteboard.servlet.name" value="websocketServlet"/>
+            <entry key="osgi.http.whiteboard.context.select" value="(osgi.http.whiteboard.context.path=/)"/>
+            <entry key="osgi.http.whiteboard.servlet.asyncSupported" value="true"/>
+        </service-properties>
+    </service>
 
     <!--
     =============================================================
@@ -54,9 +62,9 @@ Services (HTTP/WS) that catalog-ui-search provides for the UI
 
     <service interface="javax.servlet.Servlet">
         <service-properties>
-            <entry key="osgi.http.whiteboard.servlet.pattern" value="/*"/>
+            <entry key="osgi.http.whiteboard.servlet.pattern" value="/search/catalog/proxy/*"/>
             <entry key="osgi.http.whiteboard.servlet.name" value="searchCatalogProxyServlet"/>
-            <entry key="osgi.http.whiteboard.context.select" value="(osgi.http.whiteboard.context.name=searchCatalogProxyContextHelper)"/>
+            <entry key="osgi.http.whiteboard.context.select" value="(osgi.http.whiteboard.context.path=/)"/>
             <entry key="osgi.http.whiteboard.servlet.asyncSupported" value="true"/>
         </service-properties>
         <ref component-id="servlet"/>
diff --git a/ui-frontend/package.json b/ui-frontend/package.json
@@ -31,7 +31,7 @@
     "node": "20.x.x"
   },
   "devDependencies": {
-    "@connexta/ace": "git+https://github.com/connexta/ace.git#20166c642d60c5c67626f89108c6b72d1451e62f",
+    "@connexta/ace": "git+https://github.com/connexta/ace.git#3ae3c5c8c2deff00ad9912dc47fbea19d12e30dd",
     "exitzero": "^1.0.1",
     "mkdirp": "3.0.1",
     "rimraf": "6.0.1"
diff --git a/ui-frontend/packages/admin/package.json b/ui-frontend/packages/admin/package.json
@@ -13,7 +13,7 @@
     "node": "20.x.x"
   },
   "devDependencies": {
-    "@connexta/ace": "git+https://github.com/connexta/ace.git#20166c642d60c5c67626f89108c6b72d1451e62f",
+    "@connexta/ace": "git+https://github.com/connexta/ace.git#3ae3c5c8c2deff00ad9912dc47fbea19d12e30dd",
     "@types/dropzone": "5.0.6",
     "@types/lodash": "4.17.16",
     "@types/react": "16.9.34",
diff --git a/ui-frontend/packages/admin/yarn.lock b/ui-frontend/packages/admin/yarn.lock
@@ -858,9 +858,9 @@
     "@babel/helper-string-parser" "^7.25.9"
     "@babel/helper-validator-identifier" "^7.25.9"
 
-"@connexta/ace@git+https://github.com/connexta/ace.git#20166c642d60c5c67626f89108c6b72d1451e62f":
+"@connexta/ace@git+https://github.com/connexta/ace.git#3ae3c5c8c2deff00ad9912dc47fbea19d12e30dd":
   version "1.0.0"
-  resolved "git+https://github.com/connexta/ace.git#20166c642d60c5c67626f89108c6b72d1451e62f"
+  resolved "git+https://github.com/connexta/ace.git#3ae3c5c8c2deff00ad9912dc47fbea19d12e30dd"
   dependencies:
     "@babel/core" "7.26.0"
     "@babel/preset-env" "7.26.0"
@@ -7817,8 +7817,16 @@ stream-http@^3.2.0:
     readable-stream "^3.6.0"
     xtend "^4.0.2"
 
-"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
-  name string-width-cjs
+"string-width-cjs@npm:string-width@^4.2.0":
+  version "4.2.3"
+  resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz"
+  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
+  dependencies:
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^6.0.1"
+
+string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -7882,8 +7890,14 @@ string_decoder@~1.1.1:
   dependencies:
     safe-buffer "~5.1.0"
 
-"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
-  name strip-ansi-cjs
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
+  version "6.0.1"
+  resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz"
+  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
+  dependencies:
+    ansi-regex "^5.0.1"
+
+strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   version "6.0.1"
   resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz"
   integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -8826,8 +8840,16 @@ workerpool@^6.5.1:
   resolved "https://registry.npmjs.org/workerpool/-/workerpool-6.5.1.tgz"
   integrity sha512-Fs4dNYcsdpYSAfVxhnl1L5zTksjvOJxtC5hzMNl+1t9B8hTJTdKDyZ5ju7ztgPy+ft9tBFXoOlDNiOT9WUXZlA==
 
-"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
-  name wrap-ansi-cjs
+"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz"
+  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
+  dependencies:
+    ansi-styles "^4.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+
+wrap-ansi@^7.0.0:
   version "7.0.0"
   resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz"
   integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
diff --git a/ui-frontend/packages/catalog-ui-search/package.json b/ui-frontend/packages/catalog-ui-search/package.json
@@ -32,7 +32,7 @@
   },
   "peerDependencies": {},
   "devDependencies": {
-    "@connexta/ace": "git+https://github.com/connexta/ace.git#20166c642d60c5c67626f89108c6b72d1451e62f",
+    "@connexta/ace": "git+https://github.com/connexta/ace.git#3ae3c5c8c2deff00ad9912dc47fbea19d12e30dd",
     "@testing-library/jest-dom": "6.6.3",
     "@testing-library/dom": "10.4.0",
     "@testing-library/react": "16.0.1",
diff --git a/ui-frontend/packages/catalog-ui-search/yarn.lock b/ui-frontend/packages/catalog-ui-search/yarn.lock
@@ -906,9 +906,9 @@
   dependencies:
     commander "^2.15.1"
 
-"@connexta/ace@git+https://github.com/connexta/ace.git#20166c642d60c5c67626f89108c6b72d1451e62f":
+"@connexta/ace@git+https://github.com/connexta/ace.git#3ae3c5c8c2deff00ad9912dc47fbea19d12e30dd":
   version "1.0.0"
-  resolved "git+https://github.com/connexta/ace.git#20166c642d60c5c67626f89108c6b72d1451e62f"
+  resolved "git+https://github.com/connexta/ace.git#3ae3c5c8c2deff00ad9912dc47fbea19d12e30dd"
   dependencies:
     "@babel/core" "7.26.0"
     "@babel/preset-env" "7.26.0"
diff --git a/ui-frontend/packages/cesium-assets/package.json b/ui-frontend/packages/cesium-assets/package.json
@@ -20,7 +20,7 @@
   ],
   "context-path": "/search/catalog/cesium/assets",
   "devDependencies": {
-    "@connexta/ace": "git+https://github.com/connexta/ace.git#20166c642d60c5c67626f89108c6b72d1451e62f",
+    "@connexta/ace": "git+https://github.com/connexta/ace.git#3ae3c5c8c2deff00ad9912dc47fbea19d12e30dd",
     "mkdirp": "3.0.1",
     "npm": "10.9.2"
   }
diff --git a/ui-frontend/packages/cesium-assets/yarn.lock b/ui-frontend/packages/cesium-assets/yarn.lock
@@ -851,9 +851,9 @@
     "@babel/helper-string-parser" "^7.25.9"
     "@babel/helper-validator-identifier" "^7.25.9"
 
-"@connexta/ace@git+https://github.com/connexta/ace.git#20166c642d60c5c67626f89108c6b72d1451e62f":
+"@connexta/ace@git+https://github.com/connexta/ace.git#3ae3c5c8c2deff00ad9912dc47fbea19d12e30dd":
   version "1.0.0"
-  resolved "git+https://github.com/connexta/ace.git#20166c642d60c5c67626f89108c6b72d1451e62f"
+  resolved "git+https://github.com/connexta/ace.git#3ae3c5c8c2deff00ad9912dc47fbea19d12e30dd"
   dependencies:
     "@babel/core" "7.26.0"
     "@babel/preset-env" "7.26.0"
@@ -6452,7 +6452,16 @@ stream-http@^3.2.0:
     readable-stream "^3.6.0"
     xtend "^4.0.2"
 
-"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
+"string-width-cjs@npm:string-width@^4.2.0":
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
+  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
+  dependencies:
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^6.0.1"
+
+string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -6484,7 +6493,14 @@ string_decoder@~1.1.1:
   dependencies:
     safe-buffer "~5.1.0"
 
-"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
+  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
+  dependencies:
+    ansi-regex "^5.0.1"
+
+strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
   integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -7195,7 +7211,16 @@ workerpool@^6.5.1:
   resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.5.1.tgz#060f73b39d0caf97c6db64da004cd01b4c099544"
   integrity sha512-Fs4dNYcsdpYSAfVxhnl1L5zTksjvOJxtC5hzMNl+1t9B8hTJTdKDyZ5ju7ztgPy+ft9tBFXoOlDNiOT9WUXZlA==
 
-"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
+"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
+  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
+  dependencies:
+    ansi-styles "^4.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+
+wrap-ansi@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
   integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
diff --git a/ui-frontend/packages/logout/package.json b/ui-frontend/packages/logout/package.json
@@ -13,7 +13,7 @@
     "node": "20.x.x"
   },
   "devDependencies": {
-    "@connexta/ace": "git+https://github.com/connexta/ace.git#20166c642d60c5c67626f89108c6b72d1451e62f",
+    "@connexta/ace": "git+https://github.com/connexta/ace.git#3ae3c5c8c2deff00ad9912dc47fbea19d12e30dd",
     "@types/react": "19.0.10",
     "@types/react-dom": "19.0.04",
     "autoprefixer": "10.4.20",
diff --git a/ui-frontend/packages/logout/yarn.lock b/ui-frontend/packages/logout/yarn.lock
diff --git a/ui-frontend/yarn.lock b/ui-frontend/yarn.lock
