Skip to content

Commit

Permalink
marklogic-community#612 update init command to allow for ML9
Browse files Browse the repository at this point in the history
  • Loading branch information
dmcassel committed May 19, 2016
1 parent 40121c3 commit eb9a836
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions deploy/lib/server_config.rb
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ def self.init
server_version = find_arg(['--server-version'])

# Check for required --server-version argument value
if (!server_version.present? || server_version == '--server-version' || !(%w(4 5 6 7 8).include? server_version))
if (!server_version.present? || server_version == '--server-version' || !(%w(4 5 6 7 8 9).include? server_version))
server_version = prompt_server_version
end

Expand Down Expand Up @@ -240,7 +240,7 @@ def self.init
elsif app_type == "rest"
# rest applications don't use Roxy's MVC structure, so they can use MarkLogic's rewriter and error handler
# Note: ML8 rest uses the new native rewriter
rewriter_name = (server_version == "8") ? "rewriter.xml" : "rewriter.xqy"
rewriter_name = (server_version.to_i >= 8) ? "rewriter.xml" : "rewriter.xqy"
properties_file.gsub!(/url-rewriter=\/roxy\/rewrite.xqy/, "url-rewriter=/MarkLogic/rest-api/" + rewriter_name)
properties_file.gsub!(/error-handler=\/roxy\/error.xqy/, "error-handler=/MarkLogic/rest-api/error-handler.xqy")
end
Expand Down Expand Up @@ -306,7 +306,7 @@ def self.prompt_server_version
else
puts 'Required option --server-version=[version] not specified with valid value.
What is the version number of the target MarkLogic server? [5, 6, 7, or 8]'
What is the version number of the target MarkLogic server? [5, 6, 7, 8, or 9]'
server_version = STDIN.gets.chomp.to_i
server_version = 8 if server_version == 0
server_version
Expand Down

0 comments on commit eb9a836

Please sign in to comment.