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

@@ -254,11 +254,11 @@
             contentsDirectory.mkdir();
 
             File macOSDirectory = new File(contentsDirectory, "MacOS");
             macOSDirectory.mkdir();
 
-            File javaDirectory = new File(contentsDirectory, "JavaVM");
+            File javaDirectory = new File(contentsDirectory, "Java");
             javaDirectory.mkdir();
 
             File classesDirectory = new File(javaDirectory, "Classes");
             classesDirectory.mkdir();
 

@@ -353,22 +353,18 @@
             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());
+            writeProperty(xout, "JVMRuntime", runtime.getName());
 
             // Write main class name
-            writeProperty(xout, "MainClassName", mainClassName);
+            writeProperty(xout, "JVMMainClassName", mainClassName);
 
             // Write options
-            writeKey(xout, "Options");
+            writeKey(xout, "JVMOptions");
 
             xout.writeStartElement(ARRAY_TAG);
             xout.writeCharacters("\n");
 
             for (String option : options) {

@@ -377,11 +373,11 @@
 
             xout.writeEndElement();
             xout.writeCharacters("\n");
 
             // Write arguments
-            writeKey(xout, "Arguments");
+            writeKey(xout, "JVMArguments");
 
             xout.writeStartElement(ARRAY_TAG);
             xout.writeCharacters("\n");
 
             for (String argument : arguments) {

@@ -389,14 +385,10 @@
             }
 
             xout.writeEndElement();
             xout.writeCharacters("\n");
 
-            // End Java properties
-            xout.writeEndElement();
-            xout.writeCharacters("\n");
-
             // End root dictionary
             xout.writeEndElement();
             xout.writeCharacters("\n");
 
             // End root element