X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fruntime%2FInitUtils.java;fp=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fruntime%2FInitUtils.java;h=986f7914d03a7d56edbaea56d6edb31fe5e295b4;hb=e2ffdf6872592aa22d0de2b0ec69ee4eca698c45;hp=821808017644b9dcd17089cd426809b2d73c7a66;hpb=d74f9b604d0132a6b66c7a2dc189be2c2798b7c4;p=lgpl%2Fargeo-commons.git diff --git a/org.argeo.cms/src/org/argeo/cms/internal/runtime/InitUtils.java b/org.argeo.cms/src/org/argeo/cms/internal/runtime/InitUtils.java index 821808017..986f7914d 100644 --- a/org.argeo.cms/src/org/argeo/cms/internal/runtime/InitUtils.java +++ b/org.argeo.cms/src/org/argeo/cms/internal/runtime/InitUtils.java @@ -24,7 +24,7 @@ import org.apache.commons.io.FileUtils; import org.argeo.api.cms.CmsConstants; import org.argeo.api.cms.CmsLog; import org.argeo.cms.internal.http.InternalHttpConstants; -import org.argeo.osgi.useradmin.UserAdminConf; +import org.argeo.util.directory.DirectoryConf; /** * Interprets framework properties in order to generate the initial deploy @@ -201,13 +201,13 @@ public class InitUtils { u = new URI(uri); } else throw new IllegalArgumentException("Cannot interpret " + uri + " as an uri"); - } else if (u.getScheme().equals(UserAdminConf.SCHEME_FILE)) { + } else if (u.getScheme().equals(DirectoryConf.SCHEME_FILE)) { u = new File(u).getCanonicalFile().toURI(); } } catch (Exception e) { throw new RuntimeException("Cannot interpret " + uri + " as an uri", e); } - Dictionary properties = UserAdminConf.uriAsProperties(u.toString()); + Dictionary properties = DirectoryConf.uriAsProperties(u.toString()); res.add(properties); }