JBR-2957 notarize JBR and JBRSDK as APPL

This reverts commit d2ee9bd6

jb/project/tools/mac/scripts/notarize.sh

@@ -58,7 +58,7 @@ file="$APP_NAME.zip"
 
 log "Zipping $file..."
 rm -rf "$file"
-ditto -c -k --sequesterRsrc --keepParent "$APP_DIRECTORY/Contents" "$file"
+ditto -c -k --sequesterRsrc --keepParent "$APP_DIRECTORY" "$file"
 
 log "Notarizing $file..."
 rm -rf "altool.init.out" "altool.check.out"

jb/project/tools/mac/scripts/signapp.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -x
 
 #immediately exit script with an error if a command fails
 set -euo pipefail
@@ -32,8 +32,10 @@ mkdir "$BACKUP_JMODS"
 
 log "Unzipping $INPUT_FILE to $EXPLODED ..."
 tar -xzvf "$INPUT_FILE" --directory $EXPLODED
-rm "$INPUT_FILE"
 BUILD_NAME="$(ls "$EXPLODED")"
+sed -i '' s/BNDL/APPL/ $EXPLODED/$BUILD_NAME/Contents/Info.plist
+rm -f $EXPLODED/$BUILD_NAME/Contents/CodeResources
+rm "$INPUT_FILE"
 if test -d $EXPLODED/$BUILD_NAME/Contents/Home/jmods; then
   mv $EXPLODED/$BUILD_NAME/Contents/Home/jmods $BACKUP_JMODS
 fi
@@ -129,4 +131,4 @@ log "Zipping $BUILD_NAME to $INPUT_FILE ..."
   log "Finished zipping"
 )
 rm -rf "$EXPLODED"
-log "Done"
+log "Done"

src/java.desktop/share/classes/sun/awt/event/KeyEventProcessing.java

@@ -11,8 +11,7 @@ public class KeyEventProcessing {
     public final static String useNationalLayoutsOption = "com.sun.awt.use.national.layouts";
     @Native
     public final static boolean useNationalLayouts = "true".equals(
-            Util.getProperty(useNationalLayoutsOption,
-                FontUtilities.isMacOSX && !FontUtilities.isMacOSX_aarch64 ? "true" : "false"));
+            Util.getProperty(useNationalLayoutsOption, FontUtilities.isMacOSX ? "true" : "false"));
 
     // Used on windows to emulate latin OEM keys on cyrillic keyboards
     public final static String useLatinNonAlphaNumKeycodesOption = "com.sun.awt.useLatinNonAlphaNumKeycodes";

src/java.desktop/share/classes/sun/font/FontUtilities.java

@@ -50,7 +50,6 @@ public final class FontUtilities {
 
     public static boolean isMacOSX;
     public static boolean isMacOSX14;
-    public static boolean isMacOSX_aarch64;
 
     public static boolean useJDKScaler;
 
@@ -97,8 +96,6 @@ public final class FontUtilities {
                         } catch (NumberFormatException e) {
                         }
                      }
-                     String architecture = System.getProperty("os.arch");
-                     isMacOSX_aarch64 = "aarch64".equals(architecture);
                  }
                 /* If set to "jdk", use the JDK's scaler rather than
                  * the platform one. This may be a no-op on platforms where