Author: mehdi
Date: Wed Sep 26 08:50:07 2012
New Revision: 1390331
URL: http://svn.apache.org/viewvc?rev=1390331&view=rev
Log:
Bugzilla#53887: A revert of r1325624 as the java.awt.headless JVM argument
should be enabled by the user
Modified:
xmlgraphics/fop/trunk/fop
xmlgraphics/fop/trunk/fop.bat
xmlgraphics/fop/trunk/fop.js
Modified: xmlgraphics/fop/trunk/fop
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop?rev=1390331&r1=1390330&r2=1390331&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop (original)
+++ xmlgraphics/fop/trunk/fop Wed Sep 26 08:50:07 2012
@@ -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
Modified: xmlgraphics/fop/trunk/fop.bat
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop.bat?rev=1390331&r1=1390330&r2=1390331&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop.bat (original)
+++ xmlgraphics/fop/trunk/fop.bat Wed Sep 26 08:50:07 2012
@@ -58,7 +58,7 @@ set LIBDIR=%LOCAL_FOP_HOME%lib
set LOCALCLASSPATH=%FOP_HYPHENATION_PATH%
for %%l in (%LOCAL_FOP_HOME%build\*.jar %LIBDIR%\*.jar) do set
LOCALCLASSPATH=!LOCALCLASSPATH!;%%l
-set JAVAOPTS=-Denv.windir=%WINDIR% -Djava.awt.headless=true
+set JAVAOPTS=-Denv.windir=%WINDIR%
if "%JAVA_HOME%" == "" goto noJavaHome
if not exist "%JAVA_HOME%\bin\java.exe" goto noJavaHome
Modified: xmlgraphics/fop/trunk/fop.js
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop.js?rev=1390331&r1=1390330&r2=1390331&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop.js (original)
+++ xmlgraphics/fop/trunk/fop.js Wed Sep 26 08:50:07 2012
@@ -18,7 +18,6 @@
// rpm_mode is irrelevant on Windows
// var rpm_mode=true;
-var java_exec_args = "-Djava.awt.headless=true";
var fop_exec_args = "";
var no_config=false;
var fop_exec_debug=false;
@@ -63,7 +62,6 @@ function read_args() {
WScript.Echo("keepopen: " + keep_open);
WScript.Echo("noconfig: " + no_config);
WScript.Echo("help: " + show_help);
- WScript.Echo("java arguments: " + java_exec_args);
WScript.Echo("fop arguments: " + fop_exec_args);
}
}
@@ -222,7 +220,6 @@ function get_local_classpath() {
// Execute fop via shell.Exec
function fop_exec() {
var fop_exec_command = "\"" + javacmd + "\" "
- + java_exec_args + " "
+ (config.Exists("JAVA_OPTS")?config.Item("JAVA_OPTS") + " ":"")
+ (config.Exists("LOGCHOICE")?config.Item("LOGCHOICE") + " ":"")
+ (config.Exists("LOGLEVEL")?config.Item("LOGLEVEL") + " ":"")
@@ -255,7 +252,6 @@ function fop_exec() {
function fop_run() {
var fop_exec_command = "cmd /" + (keep_open?"K":"C") + " \""
+ "\"" + javacmd + "\" "
- + java_exec_args + " "
+ (config.Exists("JAVA_OPTS")?config.Item("JAVA_OPTS") + " ":"")
+ (config.Exists("LOGCHOICE")?config.Item("LOGCHOICE") + " ":"")
+ (config.Exists("LOGLEVEL")?config.Item("LOGLEVEL") + " ":"")
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
