aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--launcher/javaws.in20
2 files changed, 23 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index ab670d2..d4ee12f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-03-28 Omair Majid <[email protected]>
+
+ * launcher/javaws.in: Split out -J arguments and pass it to the JVM.
+
2011-03-28 Deepak Bhole <[email protected]>
* netx/net/sourceforge/jnlp/PluginBridge.java
diff --git a/launcher/javaws.in b/launcher/javaws.in
index 1265174..22d0120 100644
--- a/launcher/javaws.in
+++ b/launcher/javaws.in
@@ -7,8 +7,26 @@ CLASSNAME=net.sourceforge.jnlp.runtime.Boot
BINARY_LOCATION=@JAVAWS_BIN_LOCATION@
PROGRAM_NAME=javaws
+JAVA_ARGS=
+ARGS=
+
+while [ "$#" -gt "0" ]; do
+ case "$1" in
+ -J*)
+ JAVA_ARGS="${JAVA_ARGS} ${1##-J}"
+ ;;
+ *)
+ ARGS="${ARGS} $1"
+ ;;
+ esac
+ shift
+done
+
${JAVA} ${LAUNCHER_BOOTCLASSPATH} ${LAUNCHER_FLAGS} \
+ ${JAVA_ARGS} \
-Dicedtea-web.bin.name=${PROGRAM_NAME} \
-Dicedtea-web.bin.location=${BINARY_LOCATION} \
${CLASSNAME} \
- $@
+ ${ARGS}
+
+exit $?