Merge pull request #15 from oracle/release-2.4.0

Release 2.4.0

Author: mriccell

.gitignore

@@ -35,6 +35,10 @@ frontend/**/.idea
 frontend/libs
 frontend/src/css/images
 frontend/oraclejetconfig.json
+frontend/electron-test/NewWDTModelFile.yml
+frontend/electron-test/electronTest.log
+frontend/electron-test/node_modules/
+frontend/electron-test/package-lock.json
 .vscode/*
 client.log.*
 /bin/
@@ -50,3 +54,4 @@ electron/node_modules/**
 
 hugo/*/docs/
 hugo/*/.vscode/
+hugo/*/.hugo_build.lock

THIRD_PARTY_LICENSES.txt

@@ -9,7 +9,7 @@
   <parent>
     <artifactId>console-backend</artifactId>
     <groupId>com.oracle.weblogic</groupId>
-    <version>2.3.0</version>
+    <version>2.4.0</version>
   </parent>
 
   <packaging>pom</packaging>

assembly/pom.xml

@@ -19,7 +19,7 @@ umask 000
 cp -rp /build.in/. /build
 cd /build
 export ALREADY_IN_DOCKER=true
-./build-electron.sh
+./build-electron.sh $*
 rm -rf /build.in/electron/dist
 cp -rp electron/dist /build.in/electron
 !
@@ -32,59 +32,6 @@ cp -rp electron/dist /build.in/electron
     --entrypoint=/tmp/script \
     ${ELECTRON_BUILDER_IMAGE:-electronuserland/builder:12}
 }
-get_java() {
-  case "$(java --version 2>/dev/null)" in
-  *OpenJDK*11*)
-    return
-  esac
-  echo Downloading and installing OpenJDK >&2
-  mkdir -p $tmp/java
-  (
-    cd $tmp/java
-    case "$os" in
-    linux)
-      curl -O ${DOWNLOAD_JAVA_URL:-https://download.java.net/java/GA/jdk11/9/GPL/openjdk-11.0.2_linux-x64_bin.tar.gz}
-      tar xof *
-      echo "$PWD"/*/bin
-      ;;
-    darwin)
-      curl -O ${DOWNLOAD_JAVA_URL:-https://download.java.net/java/GA/jdk11/9/GPL/openjdk-11.0.2_osx-x64_bin.tar.gz}
-      tar xof *
-      echo "$PWD"/*/Contents/Home/bin
-      ;;
-    windows)
-      web -i get "${DOWNLOAD_JAVA_URL:-https://download.java.net/java/GA/jdk11/9/GPL/openjdk-11.0.2_windows-x64_bin.zip}" > openjdk.zip
-      unzip -q *
-      echo "$PWD"/*/bin
-    esac
-  )
-}
-
-get_node() {
-  case "$(node --version 2>/dev/null)" in
-  *14.*)
-    return
-  esac
-  echo Downloading and installing NodeJS >&2
-  mkdir -p $tmp/node
-  (
-    cd $tmp/node
-    case "$os" in
-    linux|darwin)
-      # Get it internally now for speed and reliability
-      curl -O ${DOWNLOAD_NODE_URL:-https://nodejs.org/dist/v14.16.0/node-v14.16.0-$os-x64.tar.gz}
-      tar xof *
-      echo "$PWD"/*/bin
-      ;;
-    windows)
-      # Get it internally now for speed and reliability
-      web -i get "${DOWNLOAD_NODE_URL:-https://nodejs.org/dist/v14.16.0/node-v14.16.0-win-x64.zip}" > node.zip
-      unzip -q *.zip
-      rm -f *.zip
-      echo "$PWD"/*
-    esac
-  )
-}
 
 # If we're running inside docker, copy the output out at the end
 copyout() {
@@ -127,21 +74,23 @@ then
   case "$os" in
   linux)
     rm -rf electron/dist electron/extraFiles
-    doit_docker
+    doit_docker "$@"
     exit 0
   esac
 fi
 
-NEW_JAVA_BIN="$(get_java)"
+# Legally, the thing we ship must be openjdk
+NEW_JAVA_BIN="$(run/get_java --openjdk)"
 if [ -n "$NEW_JAVA_BIN" ]
 then
   PATH="$NEW_JAVA_BIN$pathsep$PATH"
 fi
 
-NEW_NODE="$(get_node)"
-if [ -n "$NEW_NODE" ]
+# For some reason, electron build is failing with 16.  Just use 14 for now.
+NEW_NPM="$(run/get_npm.14)"
+if [ -n "$NEW_NPM" ]
 then
-  PATH="$NEW_NODE$pathsep$PATH"
+  PATH="$NEW_NPM$pathsep$PATH"
 fi
 
 $NPM_PREP_COMMANDS
@@ -172,17 +121,29 @@ mkdir -p "$extra"/backend
 cp -rp ../runnable/* "$extra"/backend
 cp -p package.json "$extra"
 
-npm run dist
+npm run dist "$@"
+
+case "$os" in
+darwin)
+  # Create a second copy of the executable for use by WKT UI, so that Mac OS thinks
+  # that they are two separate programs and let's you run them.
+  cd dist/mac
+  cp -p "WebLogic Remote Console.app/Contents/MacOS/WebLogic Remote Console" "WebLogic Remote Console.app/Contents/MacOS/Embeddable Remote Console"
+  zip ../*.zip "WebLogic Remote Console.app/Contents/MacOS/Embeddable Remote Console"
+  cd ../..
+esac
 
 if set | grep -q CODESIGNBUREAU
 then
   case "$os" in
   darwin)
     ./signMac dist/mac/"WebLogic Remote Console.app" signed/mac/"WebLogic Remote Console.app"
-    "$(npm bin)/electron-builder" -p never --mac dmg --pd="signed/mac/WebLogic Remote Console.app"
+    # Regenerate using the signed version
+    "$(npm bin)/electron-builder" -p never --pd="signed/mac/WebLogic Remote Console.app"
     ;;
   windows)
     rm -rf "$tmp"/*
+    mkdir -p "$tmp"
     mv dist/*.exe "$tmp"
     java -jar CSS-Client.jar sign -user weblogic_remote_console_grp -global_uid lfeigen -signed_location "dist" -sign_method microsoft -file_to_sign "$tmp"/*.exe
     chmod +x dist/*.exe

build-electron.sh

@@ -6,7 +6,7 @@
 
   <groupId>com.oracle.weblogic.console-backend</groupId>
   <artifactId>build-tools</artifactId>
-  <version>2.3.0</version>
+  <version>2.4.0</version>
   <name>Build Tools</name>
 
   <properties>