add feature to load multiple custom configuration files

Author: divino

deploy/lib/server_config.rb

@@ -1046,6 +1046,8 @@ def deploy
         deploy_triggers
       when 'rest-config'
         deploy_rest_config
+      when 'config'
+        deploy_config
       else
         raise HelpException.new("deploy", "Invalid WHAT")
     end
@@ -1863,12 +1865,12 @@ def modules_databases
   def deploy_modules
     deploy_src()
     deploy_rest()
+    deploy_config()
   end
 
   def deploy_src
     test_dir = @properties['ml.xquery-test.dir']
     xquery_dir = @properties['ml.xquery.dir']
-    # modules_db = @properties['ml.modules-db']
     app_config_file = File.join xquery_dir, "/app/config/config.xqy"
     test_config_file = File.join test_dir, "/test-config.xqy"
     load_html_as_xml = @properties['ml.load-html-as-xml']
@@ -1971,6 +1973,54 @@ def deploy_src
     end
   end
 
+  def deploy_config
+    xquery_dir = @properties['ml.xquery.dir']
+    app_configs = @properties['ml.application-conf-file']
+    total_count = 0
+
+    modules_databases.each do |dest_db|
+      if dest_db == "filesystem"
+        logger.info "Skipping deployment of configurations to #{dest_db}.."
+        break
+      end
+
+      src_permissions = permissions(@properties['ml.app-role'], Roxy::ContentCapability::ERU)
+
+      if ['rest', 'hybrid'].include? @properties["ml.app-type"]
+        # This app uses the REST API, so grant permissions to the rest roles. This allows REST extensions to call
+        # modules not deployed through the REST API.
+        # These roles are present in MarkLogic 6+.
+        src_permissions.push permissions('rest-admin', Roxy::ContentCapability::RU)
+        src_permissions.push permissions('rest-extension-user', Roxy::ContentCapability::EXECUTE)
+        src_permissions.flatten!
+      end
+
+      @logger.debug("source permissions: #{src_permissions}")
+
+      if app_configs.present?
+        logger.info "Deploying application configurations"
+        app_configs.split(',').each do |item|
+          buffer = File.read item
+          replace_properties(buffer, File.basename(item))
+          item_name = item
+          if item.start_with?("src/")
+            item_name = item[4, item.length]
+          end
+          item_name = '/' + item_name
+          logger.info "deploying application configuration #{item} with name #{item_name} on #{dest_db}"
+          total_count += xcc.load_buffer item_name,
+                                         buffer,
+                                         :db => dest_db,
+                                         :add_prefix => File.join(@properties["ml.modules-root"], "app/config/"),
+                                         :permissions => src_permissions
+        end
+        logger.info "Done deploying application configurations"
+      end
+
+      logger.info "\nLoaded #{total_count} #{pluralize(total_count, "document", "documents")} from #{xquery_dir} to #{xcc.hostname}:#{xcc.port}/#{dest_db} at #{DateTime.now.strftime('%m/%d/%Y %I:%M:%S %P')}\n"
+    end
+  end
+
   def deploy_rest
     # Deploy options, extensions to the REST API server
     if ['rest', 'hybrid'].include? @properties["ml.app-type"]

deploy/sample/build.sample.properties

@@ -208,3 +208,10 @@ mlcp-vmargs=-Xmx512m
 
 # enable the following to save and upload svn/git commit info upon deploy modules
 save-commit-info=false
+
+# enable the following to add custom configuration files
+# contents of the files will be replaces with data from the
+# properties files.
+#
+# multiple configuration files can be loaded by separating it with comma.
+# application-conf-file=src/app/config/custom-config.xqy

src/app/config/custom-config.xqy

@@ -0,0 +1,22 @@
+(:
+Copyright 2012-2015 MarkLogic Corporation
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+:)
+xquery version "1.0-ml";
+
+module namespace c = "http://marklogic.com/roxy/application-config";
+
+(: configured at deploy time by Roxy deployer :)
+declare variable $c:app-name := "@ml.app-name";
+