Merge pull request #73 from oracle/release-2.4.14

TheFrogPad · web-flow · commit 421eab3e3b0b · 2024-12-20T15:02:34.000-05:00
Release 2.4.14
diff --git a/assembly/pom.xml b/assembly/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <artifactId>console-backend</artifactId>
     <groupId>com.oracle.weblogic</groupId>
-    <version>2.4.13</version>
+    <version>2.4.14</version>
   </parent>
 
   <packaging>pom</packaging>
diff --git a/build-tools/pom.xml b/build-tools/pom.xml
@@ -6,13 +6,13 @@
 
   <groupId>com.oracle.weblogic.console-backend</groupId>
   <artifactId>build-tools</artifactId>
-  <version>2.4.13</version>
+  <version>2.4.14</version>
   <name>Build Tools</name>
 
   <parent>
       <groupId>com.oracle.weblogic</groupId>
       <artifactId>console-backend</artifactId>
-      <version>2.4.13</version>
+      <version>2.4.14</version>
   </parent>
 
   <properties>
diff --git a/electron/app/js/settings-editor.js b/electron/app/js/settings-editor.js
@@ -23,10 +23,10 @@ const SettingsEditor = (() => {
   let beforeEditingPreferences;
   const scratchPath = `${app.getPath('userData')}/scratch-settings.json`;
 
-  let dontNeedStore = (preferences) => {
+  const dontNeedStoreFile = (preferences) => {
     if (!preferences.networking.trustStoreType)
       return true;
-    if (!preferences.networking.trustStoreType === '')
+    if (preferences.networking.trustStoreType === '')
       return true;
     if (/^Windows-[A-Z]+$/.test(preferences.networking.trustStoreType))
       return true;
@@ -35,6 +35,13 @@ const SettingsEditor = (() => {
     return false;
   };
 
+  function trustStoreTypeRequiresStore() {
+    // This looks a little weird, but this is how the "hide function" is
+    // invoked in electron-preferences and this is a quick way of sharing
+    // the code.
+    return !dontNeedStoreFile(preferences._preferences);
+  }
+
   function load() {
     const path = ConfigJSON.getPath();
     let data = {};
@@ -58,8 +65,8 @@ const SettingsEditor = (() => {
       else if (key === 'javax.net.ssl.trustStore') {
         preferences.value('networking.trustStore', data[key]);
       }
-      else if (key === 'javax.net.ssl.trustStoreKey') {
-        preferences.value('networking.trustStoreKey', data[key]);
+      else if (key === 'javax.net.ssl.trustStorePassword') {
+        preferences.value('networking.trustStorePassword', data[key]);
       }
       else if (key === 'console.connectTimeoutMillis') {
         preferences.value('networking.connectTimeoutMillis', data[key]);
@@ -90,10 +97,10 @@ const SettingsEditor = (() => {
     const path = ConfigJSON.getPath();
     let data = {};
     addValue(data, 'proxy', preferences.value('networking.proxy'));
-    if (!dontNeedStore) {
-      addValue(data, 'javax.net.ssl.trustStoreType', preferences.value('networking.trustStoreType'));
+    addValue(data, 'javax.net.ssl.trustStoreType', preferences.value('networking.trustStoreType'));
+    if (trustStoreTypeRequiresStore()) {
       addValue(data, 'javax.net.ssl.trustStore', preferences.value('networking.trustStore'));
-      addValue(data, 'javax.net.ssl.trustStoreKey', preferences.value('networking.trustStoreKey'));
+      addValue(data, 'javax.net.ssl.trustStorePassword', preferences.value('networking.trustStorePassword'));
     }
     addValue(data, 'console.connectTimeoutMillis', preferences.value('networking.connectTimeoutMillis'));
     addValue(data, 'console.readTimeoutMillis', preferences.value('networking.readTimeoutMillis'));
@@ -207,13 +214,13 @@ const SettingsEditor = (() => {
                       key: 'trustStore',
                       buttonLabel: `${I18NUtils.get('wrc-electron.menus.settings.trust-store.path.button.label')}`,
                       type: 'file',
-                      hideFunction: dontNeedStore
+                      hideFunction: dontNeedStoreFile
                     },
                     {
                       label: `${I18NUtils.get('wrc-electron.menus.settings.trust-store.key.label')}`,
-                      key: 'trustStoreKey',
+                      key: 'trustStorePassword',
                       type: 'text',
-                      hideFunction: dontNeedStore
+                      hideFunction: dontNeedStoreFile
                     },
                     {
                       label: `${I18NUtils.get('wrc-electron.menus.settings.connect-timeout.label')}`,
diff --git a/electron/package-lock.json b/electron/package-lock.json
diff --git a/electron/package.json b/electron/package.json
@@ -2,7 +2,7 @@
   "name": "weblogic-remote-console",
   "productName": "WebLogic Remote Console",
   "homepage": "https://github.com/oracle/weblogic-remote-console",
-  "version": "2.4.13",
+  "version": "2.4.14",
   "main": "app/main.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
diff --git a/frontend/pom.xml b/frontend/pom.xml
@@ -10,7 +10,7 @@
   <parent>
     <groupId>com.oracle.weblogic</groupId>
     <artifactId>console-backend</artifactId>
-    <version>2.4.13</version>
+    <version>2.4.14</version>
   </parent>
 
   <packaging>pom</packaging>
diff --git a/frontend/src/js/jet-composites/wrc-frontend/config/console-frontend-jet.yaml b/frontend/src/js/jet-composites/wrc-frontend/config/console-frontend-jet.yaml
@@ -2,7 +2,7 @@
 # Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
 
 name: WebLogic Remote Console
-version: '2.4.13'
+version: '2.4.14'
 kind: remote
 console-backend:
   name: Oracle WebLogic Console Backend Microprofile Server
diff --git a/installer/pom.xml b/installer/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <artifactId>console-backend</artifactId>
     <groupId>com.oracle.weblogic</groupId>
-    <version>2.4.13</version>
+    <version>2.4.14</version>
   </parent>
 
   <packaging>pom</packaging>
diff --git a/pom.xml b/pom.xml
@@ -10,7 +10,7 @@
 
     <groupId>com.oracle.weblogic</groupId>
     <artifactId>console-backend</artifactId>
-    <version>2.4.13</version>
+    <version>2.4.14</version>
     <description>Oracle WebLogic Console Backend Parent</description>
     <packaging>pom</packaging>
 
@@ -34,7 +34,7 @@
         <version.jersey>2.45</version.jersey>
         <version.junit.jupiter>5.5.1</version.junit.jupiter>
         <version.snakeyaml>2.3</version.snakeyaml>
-        <version.console.backend>2.4.13</version.console.backend>
+        <version.console.backend>2.4.14</version.console.backend>
 
         <version.plugin.dependency-check>7.0.4</version.plugin.dependency-check>
         <version.plugin.maven-compiler>3.7.0</version.plugin.maven-compiler>
@@ -199,7 +199,7 @@
                             <!-- Below looks like an old version of jquery, but it is actually
                               support for working with old versions of jquery
                             -->
-                            <exclude>console-assembly-2.4.13.jar: jquery-1-7.js</exclude>
+                            <exclude>console-assembly-2.4.14.jar: jquery-1-7.js</exclude>
                         </excludes>
                         <formats>
                             <format>ALL</format>
diff --git a/resource-bundles/pom.xml b/resource-bundles/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>com.oracle.weblogic</groupId>
         <artifactId>console-backend</artifactId>
-        <version>2.4.13</version>
+        <version>2.4.14</version>
     </parent>
 
     <packaging>jar</packaging>
@@ -27,7 +27,7 @@
         <dependency>
             <groupId>com.oracle.weblogic</groupId>
             <artifactId>console-backend-server</artifactId>
-            <version>2.4.13</version>
+            <version>2.4.14</version>
         </dependency>
     </dependencies>
 
diff --git a/resources/pom.xml b/resources/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>com.oracle.weblogic</groupId>
         <artifactId>console-backend</artifactId>
-        <version>2.4.13</version>
+        <version>2.4.14</version>
     </parent>
 
     <packaging>jar</packaging>
diff --git a/resources/src/main/resources/ForeignConnectionFactoryBean/create-form.yaml b/resources/src/main/resources/ForeignConnectionFactoryBean/create-form.yaml
@@ -1,7 +1,8 @@
-# Copyright (c) 2020, 2021, Oracle Corporation and/or its affiliates.
+# Copyright (c) 2020, 2024, Oracle Corporation and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 introductionHTML: Create a new Foreign Connection Factory
 properties:
 - name: Name
 - name: LocalJNDIName
+- name: RemoteJNDIName
diff --git a/resources/src/main/resources/ForeignConnectionFactoryBean/type.yaml b/resources/src/main/resources/ForeignConnectionFactoryBean/type.yaml
@@ -1,8 +1,9 @@
-# Copyright (c) 2020, 2021, Oracle Corporation and/or its affiliates.
+# Copyright (c) 2020, 2024, Oracle Corporation and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 properties:
 - name: LocalJNDIName
   required: true
 
 - name: RemoteJNDIName
+  required: true
   offlineName: RemoteJndiName
diff --git a/resources/src/main/resources/ForeignDestinationBean/create-form.yaml b/resources/src/main/resources/ForeignDestinationBean/create-form.yaml
@@ -1,7 +1,8 @@
-# Copyright (c) 2020, 2021, Oracle Corporation and/or its affiliates.
+# Copyright (c) 2020, 2024, Oracle Corporation and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 introductionHTML: Create a new Foreign Destination
 properties:
 - name: Name
 - name: LocalJNDIName
+- name: RemoteJNDIName
diff --git a/resources/src/main/resources/ForeignDestinationBean/type.yaml b/resources/src/main/resources/ForeignDestinationBean/type.yaml
@@ -1,8 +1,9 @@
-# Copyright (c) 2020, 2021, Oracle Corporation and/or its affiliates.
+# Copyright (c) 2020, 2024, Oracle Corporation and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 properties:
 - name: LocalJNDIName
   required: true
 
 - name: RemoteJNDIName
+  required: true
   offlineName: RemoteJndiName
diff --git a/server/pom.xml b/server/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>com.oracle.weblogic</groupId>
         <artifactId>console-backend</artifactId>
-        <version>2.4.13</version>
+        <version>2.4.14</version>
     </parent>
 
     <packaging>jar</packaging>
diff --git a/server/src/main/java/weblogic/remoteconsole/server/ConsoleBackendRuntimeConfig.java b/server/src/main/java/weblogic/remoteconsole/server/ConsoleBackendRuntimeConfig.java
@@ -202,7 +202,7 @@ public static String getSsoDomainLoginUri() {
   }
 
   public static String getVersion() {
-    return "2.4.13";
+    return "2.4.14";
   }
 
   public static String getProxy() {
diff --git a/weblogic-bean-types/pom.xml b/weblogic-bean-types/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>com.oracle.weblogic</groupId>
         <artifactId>console-backend</artifactId>
-        <version>2.4.13</version>
+        <version>2.4.14</version>
     </parent>
 
     <packaging>jar</packaging>
