updates for ML9 - mostly new roxy version

Author: eouthwaite

deploy/build.properties

@@ -32,6 +32,7 @@ modules-prefix=/
 # the location of your marklogic configuration file
 #
 # config.file=${basedir}/deploy/ml-config.xml
+application-conf-file=
 
 #
 # the location of your triggers configuration file
@@ -161,7 +162,7 @@ app-type=rest
 # The major version of MarkLogic server you are using
 # 6, 7, 8
 #
-server-version=8
+server-version=9
 
 #
 # the location of your REST API options

deploy/default.properties

@@ -108,6 +108,9 @@ app-role=${app-name}-role
 content-db=${app-name}-content
 modules-db=${app-name}-modules
 
+# Note: purely for legacy support!
+app-modules-db=${modules-db}
+
 #
 # Number of forests to create per host in the group for the content-db
 #
@@ -193,6 +196,12 @@ install-xcc=true
 #
 use-https=false
 
+#
+# set this to true if you are accessing your rest server through
+# a proxy that uses https (but your rest server does not)
+#
+use-https-for-rest=false
+
 ## Security
 #
 # The authentication used for your appserver
@@ -210,13 +219,16 @@ ssl-certificate-template=
 #
 # The default values point to Roxy file
 #
-# url-rewriter=/roxy/rewrite.xqy
-# error-handler=/roxy/error.xqy
+url-rewriter=/roxy/rewrite.xqy
+error-handler=/roxy/error.xqy
 rewrite-resolves-globally=
 
 # Environments recognized by Roxy
 environments=local,dev,prod
 
+# Environments that can be wiped without confirmation
+wipe_environments=local
+
 #
 # The Major version of ML server across your environments (6, 7, or 8). You can override
 # this value in build.properties if all of your servers are the same version
@@ -260,3 +272,19 @@ http.retry-count=3
 http.open-timeout=5
 http.read-timeout=300
 http.retry-delay=15
+
+#
+# Application configuration files
+#
+application-conf-file=src/app/config/config.xqy
+
+# Verified restart config
+#
+verify_retry_max=5
+verify_retry_interval=10
+
+#
+# CPF Pipeline configuration file
+#
+# can be overridden from {env}.properties
+pipeline-config-file=${basedir}/deploy/pipeline-config.xml

deploy/lib/Help.rb

@@ -213,11 +213,14 @@ def self.restart
 
       General options:
         -v, [--verbose]  # Verbose output
+        --no-verify      # Skip verifying the restart
+        --legacy         # Don't use Management REST api
 
       Restart the MarkLogic process in the given environment on each host in the
       specified group. If no group is specified, restart the MarkLogic process
       on each host in the group to which the target host belongs. Use 'cluster'
-      to restart all hosts within the cluster to which the target belongs.
+      to restart all hosts within the cluster to which the target belongs. Restart
+      is verified by default, Management REST api is used if available.
     DOC
   end
 

deploy/lib/MLClient.rb

@@ -28,7 +28,7 @@ def MLClient.no_prompt=(no_prompt)
 
   def initialize(options)
     @ml_username = options[:user_name]
-    @ml_password = options[:password].xquery_unsafe
+    @ml_password = options[:password]
     @logger = options[:logger] || logger
     @request = {}
 
@@ -88,13 +88,15 @@ def build_request_params(url, verb)
     }
   end
 
-  def go(url, verb, headers = {}, params = nil, body = nil, xcc = false)
+  def go(url, verb, headers = nil, params = nil, body = nil, xcc = false)
     logger.debug(%Q{[#{verb.upcase}]\t#{url}})
     password_prompt
     request_params = build_request_params(url, verb)
     # configure headers
-    headers.each do |k, v|
-      request_params[:request][k] = v
+    if headers
+      headers.each do |k, v|
+        request_params[:request][k] = v
+      end
     end
 
     raise ExitException.new("Don't combine params and body. One or the other please") if (params && body)

deploy/lib/java/marklogic-xcc-9.0.1.jar

@@ -154,8 +154,6 @@ def need_help?
       if need_help? && Help.respond_to?(command)
         Help.doHelp(@logger, command)
         break
-      elsif command.start_with?("--ml.")
-        break
       elsif ServerConfig.instance_methods.include?(command.to_sym) || ServerConfig.instance_methods.include?(command)
         raise HelpException.new(command, "Missing environment for #{command}") if @properties["environment"].nil?
         raise ExitException.new("Missing ml-config.xml file. Check config.file property") if @properties["ml.config.file"].nil?