Bugzilla#53887: A revert of r1325624 as the java.awt.headless JVM argument should...

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1390331 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/fop b/fop
index aca642be7effac143c6b56bf8fc0f2ebc0a41326..3f2ac6f7deee3b722ada98285bf6bf3e604f1e43 100755 (executable)
--- a/fop
+++ b/fop
@@ -18,7 +18,6 @@
 # Shell script to run FOP, adapted from the Jakarta-Ant project.
 
 rpm_mode=true
-java_exec_args="-Djava.awt.headless=true"
 fop_exec_args=
 no_config=false
 fop_exec_debug=false
@@ -248,7 +247,7 @@ fi
 
 # Execute FOP using eval/exec to preserve spaces in paths,
 # java options, and FOP args
-fop_exec_command="exec \"$JAVACMD\" $java_exec_args $LOGCHOICE $LOGLEVEL -classpath \"$LOCALCLASSPATH\" $FOP_OPTS org.apache.fop.cli.Main $fop_exec_args"
+fop_exec_command="exec \"$JAVACMD\" $LOGCHOICE $LOGLEVEL -classpath \"$LOCALCLASSPATH\" $FOP_OPTS org.apache.fop.cli.Main $fop_exec_args"
 if $fop_exec_debug ; then
     echo $fop_exec_command
 fi

diff --git a/fop.bat b/fop.bat
index 54e93cca49c0be27b0a40160fbf24fc087708db5..3a0538d5ee0be92c7afbdbb2e32901f081775371 100644 (file)
--- a/fop.bat
+++ b/fop.bat
@@ -58,7 +58,7 @@ set LIBDIR=%LOCAL_FOP_HOME%lib
 set LOCALCLASSPATH=%FOP_HYPHENATION_PATH%\r
 for %%l in (%LOCAL_FOP_HOME%build\*.jar %LIBDIR%\*.jar) do set LOCALCLASSPATH=!LOCALCLASSPATH!;%%l\r
 \r
-set JAVAOPTS=-Denv.windir=%WINDIR% -Djava.awt.headless=true\r
+set JAVAOPTS=-Denv.windir=%WINDIR%\r
 \r
 if "%JAVA_HOME%" == "" goto noJavaHome\r
 if not exist "%JAVA_HOME%\bin\java.exe" goto noJavaHome\r

diff --git a/fop.js b/fop.js
index 34bd390e221b6101093249d78acec1b8079f2b8b..f92d06b4cff1a197267d8e4191bee1f120d9cbd3 100644 (file)
--- a/fop.js
+++ b/fop.js
@@ -18,7 +18,6 @@
 \r
 // rpm_mode is irrelevant on Windows\r
 // var rpm_mode=true;\r
-var java_exec_args = "-Djava.awt.headless=true";\r
 var fop_exec_args = "";\r
 var no_config=false;\r
 var fop_exec_debug=false;\r
@@ -63,7 +62,6 @@ function read_args() {
        WScript.Echo("keepopen: " + keep_open);\r
        WScript.Echo("noconfig: " + no_config);\r
        WScript.Echo("help: " + show_help);\r
-       WScript.Echo("java arguments: " + java_exec_args);\r
        WScript.Echo("fop arguments: " + fop_exec_args);\r
   }\r
 }\r
@@ -222,7 +220,6 @@ function get_local_classpath() {
 // Execute fop via shell.Exec\r
 function fop_exec() {\r
   var fop_exec_command = "\"" + javacmd + "\" "\r
-        + java_exec_args + " "\r
        + (config.Exists("JAVA_OPTS")?config.Item("JAVA_OPTS") + " ":"")\r
        + (config.Exists("LOGCHOICE")?config.Item("LOGCHOICE") + " ":"")\r
        + (config.Exists("LOGLEVEL")?config.Item("LOGLEVEL") + " ":"")\r
@@ -255,7 +252,6 @@ function fop_exec() {
 function fop_run() {\r
   var fop_exec_command = "cmd /" + (keep_open?"K":"C") + " \""\r
        + "\"" + javacmd + "\" " \r
-        + java_exec_args + " "\r
        + (config.Exists("JAVA_OPTS")?config.Item("JAVA_OPTS") + " ":"")\r
        + (config.Exists("LOGCHOICE")?config.Item("LOGCHOICE") + " ":"")\r
        + (config.Exists("LOGLEVEL")?config.Item("LOGLEVEL") + " ":"")\r