/hg/icedtea-web: Launchers made aware of custom set JRE

[jvanek at icedtea.classpath.org]

changeset dc7889501235 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=dc7889501235
author: Jiri Vanek <jvanek at redhat.com>
date: Thu Mar 21 18:14:53 2013 +0100

	Launchers made aware of custom set JRE

	* luncher/itweb-settings.in:
	* launcher/javaws.in:
	are now scanning ~/.icedtea/deployment.properties and /etc/.java/.deploy/deployment.properties for deployment.jre.dir property. If found, then its java and rt.jar are used to launch applications.


diffstat:

 ChangeLog                  |   9 +++++++++
 launcher/itweb-settings.in |   9 +++++++++
 launcher/javaws.in         |  10 ++++++++++
 3 files changed, 28 insertions(+), 0 deletions(-)

diffs (55 lines):

diff -r f8546db82ac2 -r dc7889501235 ChangeLog
--- a/ChangeLog	Wed Mar 20 18:14:02 2013 +0100
+++ b/ChangeLog	Thu Mar 21 18:14:53 2013 +0100
@@ -1,3 +1,12 @@
+2013-03-21  Jiri Vanek <jvanek at redhat.com>
+
+	Launchers made aware of custom set JRE
+	* launcher/itweb-settings.in:
+	* launcher/javaws.in:
+	are now scanning ~/.icedtea/deployment.properties and 
+	/etc/.java/.deploy/deployment.properties for deployment.jre.dir property.
+	If found, then its java and rt.jar are used to launch applications.
+
 2013-03-20  Jana Fabrikova <jfabriko at redhat.com>
 
 	* tests/reproducers/simple/JSToJGet/testcases/JSToJGetTest.java:
diff -r f8546db82ac2 -r dc7889501235 launcher/itweb-settings.in
--- a/launcher/itweb-settings.in	Wed Mar 20 18:14:02 2013 +0100
+++ b/launcher/itweb-settings.in	Thu Mar 21 18:14:53 2013 +0100
@@ -7,6 +7,15 @@
 BINARY_LOCATION=@ITWEB_SETTINGS_BIN_LOCATION@
 PROGRAM_NAME=itweb-settings
 
+CUSTOM_JRE_REGEX="^deployment.jre.dir *= *"
+CUSTOM_JRE=`grep "$CUSTOM_JRE_REGEX" ~/.icedtea/deployment.properties 2>/dev/null |  sed "s/$CUSTOM_JRE_REGEX//g"`
+if [ "x$CUSTOM_JRE" = "x" ] ; then
+  CUSTOM_JRE=`grep "$CUSTOM_JRE_REGEX" /etc/.java/.deploy/deployment.properties 2>/dev/null |  sed "s/$CUSTOM_JRE_REGEX//g"`
+fi;
+if [ "x$CUSTOM_JRE" != "x" ] ; then
+  JAVA=$CUSTOM_JRE/bin/java
+fi;
+
 ${JAVA} ${LAUNCHER_BOOTCLASSPATH} ${LAUNCHER_FLAGS} \
   -Dicedtea-web.bin.name=${PROGRAM_NAME} \
   -Dicedtea-web.bin.location=${BINARY_LOCATION} \
diff -r f8546db82ac2 -r dc7889501235 launcher/javaws.in
--- a/launcher/javaws.in	Wed Mar 20 18:14:02 2013 +0100
+++ b/launcher/javaws.in	Thu Mar 21 18:14:53 2013 +0100
@@ -9,6 +9,16 @@
 PROGRAM_NAME=javaws
 CP=@JRE@/lib/rt.jar
 
+CUSTOM_JRE_REGEX="^deployment.jre.dir *= *"
+CUSTOM_JRE=`grep "$CUSTOM_JRE_REGEX" ~/.icedtea/deployment.properties 2>/dev/null |  sed "s/$CUSTOM_JRE_REGEX//g"`
+if [ "x$CUSTOM_JRE" = "x" ] ; then
+  CUSTOM_JRE=`grep "$CUSTOM_JRE_REGEX" /etc/.java/.deploy/deployment.properties 2>/dev/null |  sed "s/$CUSTOM_JRE_REGEX//g"`
+fi;
+if [ "x$CUSTOM_JRE" != "x" ] ; then
+  JAVA=$CUSTOM_JRE/bin/java
+  CP=$CUSTOM_JRE/lib/rt.jar
+fi;
+
 JAVA_ARGS=( )
 ARGS=( )
 COMMAND=()