xlawrence 2005/08/31 09:59:55 CEST
Modified files:
core/src/java/org/jahia/bin JahiaConfigurationWizard.java
Log:
cleanup
Revision Changes Path
1.21 +13 -6
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.20&r2=1.21&f=h
Index: JahiaConfigurationWizard.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/bin/JahiaConfigurationWizard.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- JahiaConfigurationWizard.java 31 Aug 2005 07:46:13 -0000 1.20
+++ JahiaConfigurationWizard.java 31 Aug 2005 07:59:55 -0000 1.21
@@ -1,4 +1,4 @@
-// $Id: JahiaConfigurationWizard.java,v 1.20 2005/08/31 07:46:13 xlawrence
Exp $
+// $Id: JahiaConfigurationWizard.java,v 1.21 2005/08/31 07:59:55 xlawrence
Exp $
//
// ____.
// __/\ ______| |__/\. _______
@@ -1267,7 +1267,7 @@
//copySharedTemplates( defaultSite );
// and also the default site property...
- properties.setProperty("defaultSite", defaultSite);
+ properties.setProperty("defautSite", defaultSite);
// and also the xml templates files...
folderXMLtemplates();
@@ -2330,7 +2330,8 @@
* @param siteKey
* @param filePath
*/
- private boolean deployTemplate(String jahiaTemplateDiskPath, String
siteKey, String filePath, String rootFolder) {
+ private boolean deployTemplate(final String jahiaTemplateDiskPath, final
String siteKey,
+ final String filePath, final String
rootFolder) {
boolean success = true;
String fullPath;
@@ -2377,7 +2378,8 @@
try {
if (tmpFile != null && tmpFile.isFile()) {
JahiaArchiveFileHandler arch = new
JahiaArchiveFileHandler(classesFilePath);
-
arch.unzip(context.getRealPath(properties.getProperty("classDiskPath")) +
File.separator + "jahiatemplates");
+
arch.unzip(context.getRealPath(properties.getProperty("classDiskPath")) +
File.separator +
+ "jahiatemplates");
}
} catch (IOException ioe) {
String errMsg = "Failed creating JahiaArchiveFileHandler
on classes file ";
@@ -2409,11 +2411,15 @@
logger.debug("Installing web applications...");
// get the shared components folder
- final String sharedComponentsFolder = ((String)
values.get("server_jahiafiles_default")).substring(8, ((String)
values.get("server_jahiafiles_default")).length()) + File.separator + "var" +
File.separator + "shared_components";
+ final String sharedComponentsFolder = ((String)
values.get("server_jahiafiles_default")).
+ substring(8, ((String)
values.get("server_jahiafiles_default")).length()) + File.separator +
+ "var" + File.separator + "shared_components";
final File f = new File(context.getRealPath(sharedComponentsFolder));
// get the new components folder for the site, create it if not
exists
- final String newComponentsFolder = ((String)
values.get("server_jahiafiles_default")).substring(8, ((String)
values.get("server_jahiafiles_default")).length()) + File.separator + "var" +
File.separator + "new_webapps" + File.separator + siteKey;
+ final String newComponentsFolder = ((String)
values.get("server_jahiafiles_default")).
+ substring(8, ((String)
values.get("server_jahiafiles_default")).length()) + File.separator +
+ "var" + File.separator + "new_webapps" + File.separator +
siteKey;
final File newComponent = new
File(context.getRealPath(newComponentsFolder));
newComponent.mkdirs();
@@ -2422,6 +2428,7 @@
JahiaTools.copyFolderContent(f.getAbsolutePath(),
newComponent.getAbsolutePath());
} catch (Exception e) {
+ logger.error(e.getMessage(), e);
// msg..
}
