From 425b5fb7535455664d964688aee46c4ce24f5cb9 Mon Sep 17 00:00:00 2001 From: Geert Josten Date: Thu, 30 Apr 2015 10:27:37 +0200 Subject: [PATCH 1/2] Fixed #359: added separate mlcp user/pass properties --- deploy/default.properties | 2 ++ deploy/lib/server_config.rb | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/deploy/default.properties b/deploy/default.properties index 40d5a6a6..ba5f5b36 100644 --- a/deploy/default.properties +++ b/deploy/default.properties @@ -201,6 +201,8 @@ local-server=localhost # mlcp-home=/usr/local/mlcp mlcp-vmargs=-Xmx512m +mlcp-user=${user} +mlcp-password=${password} # # Temporary fix to support MarkLogic 8 EA2 diff --git a/deploy/lib/server_config.rb b/deploy/lib/server_config.rb index 067584cf..03599ceb 100644 --- a/deploy/lib/server_config.rb +++ b/deploy/lib/server_config.rb @@ -989,9 +989,11 @@ def mlcp end end + @ml_username = @properties['ml.mlcp-user'] + @ml_password = @properties['ml.mlcp-password'] if ARGV.length > 0 password_prompt - connection_string = %Q{ -username #{@properties['ml.user']} -password #{@ml_password} -host #{@properties['ml.server']} -port #{@properties['ml.xcc-port']}} + connection_string = %Q{ -username #{@ml_username} -password #{@ml_password} -host #{@properties['ml.server']} -port #{@properties['ml.xcc-port']}} args = ARGV.join(" ") From 274234f1d7793c329137d1e843a55c932b092dfc Mon Sep 17 00:00:00 2001 From: Geert Josten Date: Thu, 30 Apr 2015 15:21:38 +0200 Subject: [PATCH 2/2] Adjusted default user/pass as suggested by Paxton --- deploy/lib/server_config.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deploy/lib/server_config.rb b/deploy/lib/server_config.rb index 03599ceb..205d0ccd 100644 --- a/deploy/lib/server_config.rb +++ b/deploy/lib/server_config.rb @@ -989,8 +989,8 @@ def mlcp end end - @ml_username = @properties['ml.mlcp-user'] - @ml_password = @properties['ml.mlcp-password'] + @ml_username = @properties['ml.mlcp-user'] || @properties['ml.user'] + @ml_password = @properties['ml.mlcp-password'] || @ml_password if ARGV.length > 0 password_prompt connection_string = %Q{ -username #{@ml_username} -password #{@ml_password} -host #{@properties['ml.server']} -port #{@properties['ml.xcc-port']}}