Added support for "JavaX" Plist key // fixes #9

Author: tofi86

CHANGELOG.md

@@ -1,6 +1,9 @@
 ChangeLog
 ---------
 
+### v0.9.0 (2015-05-15)
+* added support for `JavaX` Plist key (fixes #9)
+
 ### v0.8.1 (2015-03-26)
 * Bugfix for `JVMVersion` key present but no JVMs in `/usr/libexec/java_home`
 

README.md

@@ -12,16 +12,23 @@ Whilst developing some Java apps for Mac OS X I was facing the problem of suppor
 **Is there some difference, you might ask?** Yes, there is!
 
 1. The spot in the file system where the JRE or JDK is stored is different:
- * Apple Java 1.5/1.6: `/System/Library/Java/JavaVirtualMachines/`
- * Oracle Java 1.7/1.8: `/Library/Internet Plug-Ins/JavaAppletPlugin.plugin/Contents/`
+  * Apple Java 1.5/1.6: `/System/Library/Java/JavaVirtualMachines/`
+  * Oracle JRE 1.7/1.8: `/Library/Internet Plug-Ins/JavaAppletPlugin.plugin/Contents/`
+  * Oracle JDK 1.7/1.8: `/System/Library/Java/JavaVirtualMachines/`
 
 2. Mac Apps built with tools designed for Apple's Java (like Apple's JarBundler or the [ANT task "Jarbundler"](http://informagen.com/JarBundler/)) won't work on Macs with Oracle Java 7 and no Apple Java installed.
- * This is because the Apple `JavaApplicationStub` only works for Apple's Java and their `Info.plist` style to store Java properties.
- * To support Oracle Java 7 you would need to built a separate App package with Oracles [ANT task "Appbundler"](https://java.net/projects/appbundler).
- * Thus you would need the user to know which Java distribution he has installed on his Mac. Not very user friendly...
+  * This is because the Apple `JavaApplicationStub` only works for Apple's Java and their `Info.plist` style to store Java properties.
+  * To support Oracle Java 7 you would need to built a separate App package with Oracles [ANT task "Appbundler"](https://java.net/projects/appbundler).
+  * Thus you would need the user to know which Java distribution he has installed on his Mac. Not very user friendly...
 
 3. Oracle uses a different syntax to store Java properties in the applications `Info.plist` file. A Java app packaged as a Mac app with Oracles Appbundler also needs a different `JavaApplicationStub` and therefore won't work on systems with Apple's Java...
 
+4. Starting with Mac OS X 10.10 *(Yosemite)*, app packages won't open up anymore if they contain the *deprecated* Plist `Java` dictionary. This isn't confirmed by Apple, but [issue #9](https://github.com/tofi86/universalJavaApplicationStub/issues/9) leads to this assumption:
+  * Apple seems to declare the `Java` dictionary as *deprecated* and requires the old Apple Java 6 to be installed. Otherwise the app doesn't open.
+  * If Java 7/8 is installed, Apple doesn't accept those java versions as suitable
+  * Apple prompts for JRE 6 download even before the `JavaApplicationStub` is executed. This is why we can't intercept at this level and need to replace the `Java` dictionary by a `JavaX` dictionary.
+  * This requires the use of my JarBundler fork (see below for more details)
+
 *So why, oh why, couldn't Oracle just use the old style of storing Java properties in `Info.plist` and offer a universal JavaApplicationStub?!* :rage:
 
 Well, since I can't write such a script in C, C# or whatever fancy language, I wrote it as a shell script. And it works! ;-)
@@ -71,12 +78,14 @@ What you need to do
 -------------------
 
 Use whichever ANT task you like:
-* the great opensource ["Jarbundler"](http://informagen.com/JarBundler/)
-  * my JarBundler [fork on github](https://github.com/tofi86/Jarbundler) which supports *MixedLocalization*
+* the opensource ["Jarbundler"](http://informagen.com/JarBundler/) *(not recommended anymore)*
+* my JarBundler [fork on github](https://github.com/tofi86/Jarbundler) which supports the newly introduced `JavaX` key *(recommended)*
 * Oracle's opensource ["Appbundler"](https://java.net/projects/appbundler)
   * or [*infinitekind*'s fork](https://bitbucket.org/infinitekind/appbundler/overview)
 
-### JarBundler example
+### Original JarBundler (v2.3) example
+*Might lead to compatibility issues. See below for details...*
+
 Just place the `universalJavaApplicationStub` from this repo in your build resources folder and link it in your ANT task (attribute `stubfile`):
 ```XML
 <jarbundler
@@ -91,8 +100,32 @@ Just place the `universalJavaApplicationStub` from this repo in your build resou
 
 The ANT task will care about the rest...
 
-You should get a fully functional Mac Application Bundle working with both Java distributions from Apple and Oracle.
+You should get a functional Mac Application Bundle working with both Java distributions from Apple and Oracle **but with possible incompatibilities to Mac OS X 10.10:**
+
+:exclamation: **Attention:**
+> Using the "old" JarBundler <= v2.3 might result in [issue #9](https://github.com/tofi86/universalJavaApplicationStub/issues/9) *(Mac OS X 10.10 asking to install deprecated Apple JRE 6 instead of using a newer Java version)*
+> 
+> If you don't want to care about compatibility issues between OS X and Java versions, better use my JarBundler fork (see next example).
+
+### My JarBundler fork (v2.4) example
+Download the latest release of my JarBundler fork [from it's github repo](https://github.com/tofi86/Jarbundler) and replace your old JarBundler library with the new one.
+
+Then place the `universalJavaApplicationStub` from this repo in your build resources folder and link it in your ANT task (attribute `stubfile`). Don't forget to set the newly introduced `useJavaXKey` option:
+```XML
+<jarbundler
+	name="Your-App"
+	shortname="Your Application"
+	icon="${resources.dir}/icon.icns"
+	stubfile="${resources.dir}/universalJavaApplicationStub"
+	useJavaXKey="true"
+	... >
+	
+</jarbundler>
+```
+
+The ANT task will care about the rest...
 
+You should get a fully functional Mac Application Bundle working with both Java distributions from Apple and Oracle and all Mac OS X versions.
 
 ### Appbundler example
 Just place the `universalJavaApplicationStub` from this repo in your build resources folder and link it in your ANT task (attribute `executableName` from [*infinitekind*'s fork](https://bitbucket.org/infinitekind/appbundler/overview)):
@@ -110,7 +143,7 @@ Just place the `universalJavaApplicationStub` from this repo in your build resou
 
 The ANT task will care about the rest...
 
-You should get a fully functional Mac Application Bundle working with both Java distributions from Apple and Oracle.
+You should get a fully functional Mac Application Bundle working with both Java distributions from Apple and Oracle and all Mac OS X versions.
 
 
 Missing Features

src/universalJavaApplicationStub

@@ -13,8 +13,8 @@
 #                                                                                #
 # @author    Tobias Fischer                                                      #
 # @url       https://github.com/tofi86/universalJavaApplicationStub              #
-# @date      2015-03-26                                                          #
-# @version   0.8.1                                                               #
+# @date      2015-05-15                                                          #
+# @version   0.9.0                                                               #
 #                                                                                #
 #                                                                                #
 ##################################################################################
@@ -116,6 +116,15 @@ CFBundleIconFile=`/usr/libexec/PlistBuddy -c "print :CFBundleIconFile" "${InfoPl
 # check Info.plist for Apple style Java keys -> if key :Java is present, parse in apple mode
 /usr/libexec/PlistBuddy -c "print :Java" "${InfoPlistFile}" > /dev/null 2>&1
 exitcode=$?
+JavaKey=":Java"
+
+# if no :Java key is present, check Info.plist for universalJavaApplication style JavaX keys -> if key :JavaX is present, parse in apple mode
+if [ $exitcode -ne 0 ]; then
+	/usr/libexec/PlistBuddy -c "print :JavaX" "${InfoPlistFile}" > /dev/null 2>&1
+	exitcode=$?
+	JavaKey=":JavaX"
+fi
+
 
 # read Info.plist in Apple style if exit code returns 0 (true, :Java key is present)
 if [ $exitcode -eq 0 ]; then
@@ -130,7 +139,7 @@ if [ $exitcode -eq 0 ]; then
 
 
 	# read the Java WorkingDirectory
-	JVMWorkDir=`/usr/libexec/PlistBuddy -c "print :Java:WorkingDirectory" "${InfoPlistFile}" 2> /dev/null | xargs`
+	JVMWorkDir=`/usr/libexec/PlistBuddy -c "print ${JavaKey}:WorkingDirectory" "${InfoPlistFile}" 2> /dev/null | xargs`
 
 	# set Working Directory based upon Plist info
 	if [[ ! -z ${JVMWorkDir} ]]; then
@@ -145,36 +154,36 @@ if [ $exitcode -eq 0 ]; then
 
 
 	# read the MainClass name
-	JVMMainClass=`/usr/libexec/PlistBuddy -c "print :Java:MainClass" "${InfoPlistFile}" 2> /dev/null`
+	JVMMainClass=`/usr/libexec/PlistBuddy -c "print ${JavaKey}:MainClass" "${InfoPlistFile}" 2> /dev/null`
 
 	# read the JVM Options
-	JVMOptions=`/usr/libexec/PlistBuddy -c "print :Java:Properties" "${InfoPlistFile}" 2> /dev/null | grep " =" | sed 's/^ */-D/g' | tr '\n' ' ' | sed 's/  */ /g' | sed 's/ = /=/g' | xargs`
+	JVMOptions=`/usr/libexec/PlistBuddy -c "print ${JavaKey}:Properties" "${InfoPlistFile}" 2> /dev/null | grep " =" | sed 's/^ */-D/g' | tr '\n' ' ' | sed 's/  */ /g' | sed 's/ = /=/g' | xargs`
 
 	# read StartOnMainThread
-	JVMStartOnMainThread=`/usr/libexec/PlistBuddy -c "print :Java:StartOnMainThread" "${InfoPlistFile}" 2> /dev/null`
+	JVMStartOnMainThread=`/usr/libexec/PlistBuddy -c "print ${JavaKey}:StartOnMainThread" "${InfoPlistFile}" 2> /dev/null`
 	if [ "${JVMStartOnMainThread}" == "true" ]; then
 		echo ${JVMStartOnMainThread} > ~/Desktop/test.txt
 		JVMOptions+=" -XstartOnFirstThread"
 	fi
 
 	# read the ClassPath in either Array or String style
-	JVMClassPath_RAW=`/usr/libexec/PlistBuddy -c "print :Java:ClassPath" "${InfoPlistFile}" 2> /dev/null`
+	JVMClassPath_RAW=`/usr/libexec/PlistBuddy -c "print ${JavaKey}:ClassPath" "${InfoPlistFile}" 2> /dev/null`
 	if [[ $JVMClassPath_RAW == *Array* ]] ; then
-		JVMClassPath=.`/usr/libexec/PlistBuddy -c "print :Java:ClassPath" "${InfoPlistFile}" 2> /dev/null | grep "    " | sed 's/^ */:/g' | tr -d '\n' | xargs`
+		JVMClassPath=.`/usr/libexec/PlistBuddy -c "print ${JavaKey}:ClassPath" "${InfoPlistFile}" 2> /dev/null | grep "    " | sed 's/^ */:/g' | tr -d '\n' | xargs`
 	else
 		JVMClassPath=${JVMClassPath_RAW}
 	fi
 	# expand variables $APP_PACKAGE, $JAVAROOT, $USER_HOME
 	JVMClassPath=`eval "echo ${JVMClassPath}"`
 
 	# read the JVM Default Options
-	JVMDefaultOptions=`/usr/libexec/PlistBuddy -c "print :Java:VMOptions" "${InfoPlistFile}" 2> /dev/null | xargs`
+	JVMDefaultOptions=`/usr/libexec/PlistBuddy -c "print ${JavaKey}:VMOptions" "${InfoPlistFile}" 2> /dev/null | xargs`
 
 	# read the JVM Arguments
-	JVMArguments=`/usr/libexec/PlistBuddy -c "print :Java:Arguments" "${InfoPlistFile}" 2> /dev/null | xargs`
+	JVMArguments=`/usr/libexec/PlistBuddy -c "print ${JavaKey}:Arguments" "${InfoPlistFile}" 2> /dev/null | xargs`
 
     # read the Java version we want to find
-    JVMVersion=`/usr/libexec/PlistBuddy -c "print :Java:JVMVersion" "${InfoPlistFile}" 2> /dev/null | xargs`
+    JVMVersion=`/usr/libexec/PlistBuddy -c "print ${JavaKey}:JVMVersion" "${InfoPlistFile}" 2> /dev/null | xargs`
 
 # read Info.plist in Oracle style
 else