#136 Sort properties so that the longer ones will match when doing su…

…bstitutions
marklogic-community · Sep 16, 2013 · a919326 · a919326
1 parent 4296854
commit a919326
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/deploy/lib/server_config.rb b/deploy/lib/server_config.rb
@@ -94,7 +94,7 @@ def get_properties
 
   def info
     logger.info "Properties:"
-    @properties.each do |k, v|
+    @properties.sort {|x,y| y <=> x}.each do |k, v|
       logger.info k + ": " + v
     end
   end
@@ -1365,7 +1365,10 @@ def build_config(config_file)
     else
       config.gsub!("@ml.rewrite-resolves-globally", "")
     end
-    @properties.each do |k, v|
+    # @properties.each do |k, v|
+    #   config.gsub!("@#{k}", v)
+    # end
+    @properties.sort {|x,y| y <=> x}.each do |k, v|
       config.gsub!("@#{k}", v)
     end