From 5e0abe5e44e443626c39c2f94567499b566dc257 Mon Sep 17 00:00:00 2001 From: Geert Josten Date: Mon, 6 Jul 2015 15:54:29 +0200 Subject: [PATCH] Fixed #459: copied all command line settings from mlcp.sh --- deploy/lib/server_config.rb | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/deploy/lib/server_config.rb b/deploy/lib/server_config.rb index 61391cc4..344e108b 100644 --- a/deploy/lib/server_config.rb +++ b/deploy/lib/server_config.rb @@ -1085,7 +1085,10 @@ def mlcp # Find all jars required for running MLCP. At least: jars = Dir.glob(ServerConfig.expand_path("#{mlcp_home}/lib/*.jar")) - classpath = jars.join(path_separator) + confdir = ServerConfig.expand_path("#{mlcp_home}/conf") + classpath = "#{confdir}#{path_separator}#{jars.join(path_separator)}" + + vmargs = %Q{"-DCONTENTPUMP_HOME=#{mlcp_home}" -Dfile.encoding=UTF-8 -Dxcc.txn.compatible=true "-Djava.library.path=#{mlcp_home}/lib/native" #{@properties['ml.mlcp-vmargs']} } ARGV.each do |arg| if arg == "-option_file" @@ -1131,9 +1134,9 @@ def mlcp args = ARGV.join(" ") - runme = %Q{java -cp "#{classpath}" #{@properties['ml.mlcp-vmargs']} com.marklogic.contentpump.ContentPump #{args} #{connection_string}} + runme = %Q{java -cp "#{classpath}" #{vmargs} com.marklogic.contentpump.ContentPump #{args} #{connection_string}} else - runme = %Q{java -cp "#{classpath}" com.marklogic.contentpump.ContentPump} + runme = %Q{java -cp "#{classpath}" #{vmargs} com.marklogic.contentpump.ContentPump} end logger.debug runme