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/macosx/classes/sun/lwawt/macosx/CPlatformResponder.java

@@ -46,7 +46,6 @@ import java.util.Locale;import java.util.MissingResourceException;import java.ut
 final class CPlatformResponder {
 
     private static final PlatformLogger keyboardLog = PlatformLogger.getLogger("sun.lwawt.macosx.CPlatformResponder");
-    private static final boolean USE_FOKIN_LOGIC = Boolean.getBoolean("cplatformresponder.use.fokin.logic"); // NOTE: will be removed when Fokin's fix reverted
 
     private final PlatformEventNotifier eventNotifier;
     private final boolean isNpapiCallback;
@@ -301,13 +300,10 @@ final class CPlatformResponder {
             characterToGetKeyCode = checkedChar;
         }
 
-        char testCharIgnoringModifiers = USE_FOKIN_LOGIC ? characterToGetKeyCode: nsEvent.getCharactersIgnoringModifiers() != null && nsEvent.getCharactersIgnoringModifiers().length() > 0 ?
-                    nsEvent.getCharactersIgnoringModifiers().charAt(0) : KeyEvent.CHAR_UNDEFINED;
-
         // We use char candidate if modifiers are not used
         // otherwise, we use char ignoring modifiers
         int[] in = new int[] {
-                testCharIgnoringModifiers,
+                characterToGetKeyCode,
                 nsEvent.isHasDeadKey() ? 1 : 0,
                 nsEvent.getModifierFlags(),
                 nsEvent.getKeyCode(),