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

Commit

Permalink
Fix bug with CORB unable to to use a password other than whats suppli…
Browse files Browse the repository at this point in the history
…ed in the properties file
  • Loading branch information
RobertSzkutak committed Mar 3, 2016
1 parent 9f6ed53 commit bde1971
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions deploy/lib/server_config.rb
Expand Up @@ -1133,7 +1133,8 @@ def xqsync
end

def corb
encoded_password = url_encode(@properties['ml.password'])
password_prompt
encoded_password = url_encode(@ml_password)
connection_string = %Q{xcc://#{@properties['ml.user']}:#{encoded_password}@#{@properties['ml.server']}:#{@properties['ml.xcc-port']}/#{@properties['ml.content-db']}}
collection_name = find_arg(['--collection']) || '""'
xquery_module = find_arg(['--modules'])
Expand Down Expand Up @@ -1240,11 +1241,11 @@ def mlcp

# PATH change only important for Windows, so always using ; and \
env_variables = {
"PATH" => "#{ENV['PATH']};#{mlcp_home}\\bin",
"PATH" => "#{ENV['PATH']};#{mlcp_home}\\bin",
"HADOOP_HOME" => mlcp_home
}
system(env_variables, runme)

logger.info ""

ARGV.clear
Expand Down

0 comments on commit bde1971

Please sign in to comment.