Skip to content
This repository has been archived by the owner on Nov 9, 2022. It is now read-only.

Fixed #459: copied all command line settings from mlcp.sh #480

Merged
merged 1 commit into from
Jul 13, 2015
Merged

Fixed #459: copied all command line settings from mlcp.sh #480

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions deploy/lib/server_config.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand Down