src/macosx/bundle/appbundler/src/com/oracle/appbundler/AppBundlerTask.java

*** 254,264 ****
              contentsDirectory.mkdir();
  
              File macOSDirectory = new File(contentsDirectory, "MacOS");
              macOSDirectory.mkdir();
  
!             File javaDirectory = new File(contentsDirectory, "JavaVM");
              javaDirectory.mkdir();
  
              File classesDirectory = new File(javaDirectory, "Classes");
              classesDirectory.mkdir();
  
--- 254,264 ----
              contentsDirectory.mkdir();
  
              File macOSDirectory = new File(contentsDirectory, "MacOS");
              macOSDirectory.mkdir();
  
!             File javaDirectory = new File(contentsDirectory, "Java");
              javaDirectory.mkdir();
  
              File classesDirectory = new File(javaDirectory, "Classes");
              classesDirectory.mkdir();
  
*** 353,374 ****
              writeProperty(xout, "CFBundleShortVersionString", shortVersion);
              writeProperty(xout, "CFBundleSignature", signature);
              writeProperty(xout, "CFBundleVersion", "1");
              writeProperty(xout, "NSHumanReadableCopyright", copyright);
  
-             // Start Java properties
-             writeKey(xout, "JavaVM");
-             xout.writeStartElement(DICT_TAG);
- 
              // Write runtime
!             writeProperty(xout, "Runtime", runtime.getName());
  
              // Write main class name
!             writeProperty(xout, "MainClassName", mainClassName);
  
              // Write options
!             writeKey(xout, "Options");
  
              xout.writeStartElement(ARRAY_TAG);
              xout.writeCharacters("\n");
  
              for (String option : options) {
--- 353,370 ----
              writeProperty(xout, "CFBundleShortVersionString", shortVersion);
              writeProperty(xout, "CFBundleSignature", signature);
              writeProperty(xout, "CFBundleVersion", "1");
              writeProperty(xout, "NSHumanReadableCopyright", copyright);
  
              // Write runtime
!             writeProperty(xout, "JVMRuntime", runtime.getName());
  
              // Write main class name
!             writeProperty(xout, "JVMMainClassName", mainClassName);
  
              // Write options
!             writeKey(xout, "JVMOptions");
  
              xout.writeStartElement(ARRAY_TAG);
              xout.writeCharacters("\n");
  
              for (String option : options) {
*** 377,387 ****
  
              xout.writeEndElement();
              xout.writeCharacters("\n");
  
              // Write arguments
!             writeKey(xout, "Arguments");
  
              xout.writeStartElement(ARRAY_TAG);
              xout.writeCharacters("\n");
  
              for (String argument : arguments) {
--- 373,383 ----
  
              xout.writeEndElement();
              xout.writeCharacters("\n");
  
              // Write arguments
!             writeKey(xout, "JVMArguments");
  
              xout.writeStartElement(ARRAY_TAG);
              xout.writeCharacters("\n");
  
              for (String argument : arguments) {
*** 389,402 ****
              }
  
              xout.writeEndElement();
              xout.writeCharacters("\n");
  
-             // End Java properties
-             xout.writeEndElement();
-             xout.writeCharacters("\n");
- 
              // End root dictionary
              xout.writeEndElement();
              xout.writeCharacters("\n");
  
              // End root element
--- 385,394 ----