Merge pull request #483 from grtjn/256-path-encoding

Fixed #256: applied explicit UTF-8 encoding on file paths for Windows

deploy/lib/server_config.rb

@@ -1435,9 +1435,9 @@ def capture_environment_config(full_config)
       # TODO: take content-forests-per-host into account properly, just taking first by default
       forests = quote_arglist(find_arg(['--forests']) || "#{@properties["ml.content-db"]},#{@properties["ml.content-db"]}-001-1,#{@properties["ml.modules-db"]},#{@properties["ml.triggers-db"]},#{@properties["ml.schemas-db"]},,#{@properties["ml.app-modules-db"]}")
       # TODO: include dav, xdbc, odbc servers?
-      servers = quote_arglist(find_arg(['--servers']) || "#{@properties["ml.app-name"]}")
+      servers = quote_arglist(find_arg(['--servers']) || "#{@properties["ml.app-name"]},#{@properties["ml.app-name"]}-xdbc,#{@properties["ml.app-name"]}-odbc,#{@properties["ml.app-name"]}-test,#{@properties["ml.app-name"]}-webdav")
       mimes = quote_arglist(find_arg(['--mime-types']) || "##none##")
-      users = quote_arglist(find_arg(['--users']) || "#{@properties["ml.app-name-user"]},#{@properties["ml.default-user"]}")
+      users = quote_arglist(find_arg(['--users']) || "#{@properties["ml.app-name"]}-user,#{@properties["ml.default-user"]}")
       roles = quote_arglist(find_arg(['--roles']) || "#{@properties["ml.app-role"]}")
     end
 

deploy/lib/xcc.rb

@@ -190,11 +190,11 @@ def get_files(path, options = {}, data = [])
           if File.directory?(full_path)
             get_files(full_path, options, data)
           else
-            data << full_path
+            data << full_path.encode("UTF-8")
           end
         end
       else
-        data = [path]
+        data = [path.encode("UTF-8")]
       end
       data
     end

deploy/lib/xquery/setup.xqy

@@ -5158,7 +5158,8 @@ declare function setup:get-users-by-name($names as xs:string*) as element(sec:us
   let $ids :=
     for $name in $names
       return setup:get-users-by-name-helper($name)
-   return setup:get-users($ids)
+  where $ids
+  return setup:get-users($ids)
 };
 
 declare function setup:get-users-by-name-helper($name as xs:string*) as xs:integer? {
@@ -5236,6 +5237,7 @@ declare function setup:get-roles-by-name($roles as xs:string*) as element(sec:ro
   let $ids :=
     for $role in $roles
       return setup:get-roles-by-name-helper($role)
+  where $ids
   return setup:get-roles($ids)
 };