Mercurial > hg > release > icedtea-web-1.4
changeset 647:dc7889501235
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.
| author | Jiri Vanek <jvanek@redhat.com> |
|---|---|
| date | Thu, 21 Mar 2013 18:14:53 +0100 |
| parents | f8546db82ac2 |
| children | 8a7fa31629d0 |
| files | ChangeLog launcher/itweb-settings.in launcher/javaws.in |
| diffstat | 3 files changed, 28 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- 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@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@redhat.com> * tests/reproducers/simple/JSToJGet/testcases/JSToJGetTest.java:
--- 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} \
--- 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=()