xlawrence 2005/08/31 12:34:12 CEST
Modified files:
core/src/java/org/jahia/bin JahiaConfigurationWizard.java
Log:
Fix WEBDAV store/Read problem
Revision Changes Path
1.22 +15 -3
jahia/core/src/java/org/jahia/bin/JahiaConfigurationWizard.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/bin/JahiaConfigurationWizard.java.diff?r1=1.21&r2=1.22&f=h
Index: JahiaConfigurationWizard.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/bin/JahiaConfigurationWizard.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- JahiaConfigurationWizard.java 31 Aug 2005 07:59:55 -0000 1.21
+++ JahiaConfigurationWizard.java 31 Aug 2005 10:34:12 -0000 1.22
@@ -1,4 +1,4 @@
-// $Id: JahiaConfigurationWizard.java,v 1.21 2005/08/31 07:59:55 xlawrence
Exp $
+// $Id: JahiaConfigurationWizard.java,v 1.22 2005/08/31 10:34:12 xlawrence
Exp $
//
// ____.
// __/\ ______| |__/\. _______
@@ -1332,6 +1332,19 @@
jahiaXml, values);
}
+ // Copy slide files to default site
+ final ServletContext context = config.getServletContext();
+ final PathResolver pathResolver = new
WebAppPathResolver(context);
+
+ final String slideContentDiskPath = "WEB-INF/var/content/slide/";
+ logger.debug("slideContentDiskPath: " + slideContentDiskPath);
+ JahiaTools.copyFolderContent(
+ pathResolver.resolvePath(slideContentDiskPath +
"myjahiasite" + File.separator + "store"),
+ pathResolver.resolvePath(slideContentDiskPath +
properties.getProperty("defautSite") + File.separator + "store"));
+ final File dir = new
File(pathResolver.resolvePath(slideContentDiskPath + "myjahiasite"));
+ logger.debug("Dir: " + dir.getAbsolutePath());
+ JahiaTools.deleteFile(dir);
+
// okay, everthing is okay... set error to false
error = false;
@@ -1900,7 +1913,7 @@
fileContent = fileContent.replaceAll("[EMAIL PROTECTED]@",
(String) values.get("siteservername"));
- fileContent = fileContent.replaceAll("[EMAIL PROTECTED]@",
+ fileContent = fileContent.replaceAll("[EMAIL PROTECTED]@",
(String) values.get("templates"));
final FileOutputStream fos = new FileOutputStream(object);
@@ -2231,7 +2244,6 @@
startFile = new File(originalContentFinal[i].toString());
JahiaTools.deleteFile(startFile);
}
-
}
} // end moveJahiaFiles
