Merge pull request #424 from grtjn/359-non-admin-mlcp

Fixed #359: added separate mlcp user/pass properties
marklogic-community · Apr 30, 2015 · b75bb87 · b75bb87
2 parents 65b1dbd + 274234f
commit b75bb87
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git 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
@@ -1106,9 +1106,11 @@ def mlcp
       end
     end
 
+    @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 #{@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(" ")