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=1ca5e4a553842600f18a7a911d0a4d881012235a;hb=b843d903237a2a4192c40d8c933e71137284050b;hp=70ea9ec486e6838f526c5de3b6733eb0a93a5364;hpb=7974745f1de448353bf47012b5df36b451dce2fa;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 70ea9ec48..1ca5e4a55 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
@@ -238,15 +238,17 @@ public class InitUtils {
 				// TODO also uncompress archives
 				if (initDir.exists())
 					try {
-						FileUtils.copyDirectory(initDir, KernelUtils.getOsgiInstanceDir(), new FileFilter() {
+						// TODO use NIO utilities
+						FileUtils.copyDirectory(initDir, KernelUtils.getOsgiInstancePath("").toFile(),
+								new FileFilter() {
 
-							@Override
-							public boolean accept(File pathname) {
-								if (pathname.getName().equals(".svn") || pathname.getName().equals(".git"))
-									return false;
-								return true;
-							}
-						});
+									@Override
+									public boolean accept(File pathname) {
+										if (pathname.getName().equals(".svn") || pathname.getName().equals(".git"))
+											return false;
+										return true;
+									}
+								});
 						log.info("CMS initialized from " + initDir.getCanonicalPath());
 					} catch (IOException e) {
 						throw new RuntimeException("Cannot initialize from " + initDir, e);