diff --git a/installation/source/java/ch/systemsx/cisd/openbis/installer/izpack/ExecuteSetupScriptsAction.java b/installation/source/java/ch/systemsx/cisd/openbis/installer/izpack/ExecuteSetupScriptsAction.java index 08a92941655d568cad475e3b628111e64e480825..d412c949c728117cc306d349b1beedb4e0d8bb51 100644 --- a/installation/source/java/ch/systemsx/cisd/openbis/installer/izpack/ExecuteSetupScriptsAction.java +++ b/installation/source/java/ch/systemsx/cisd/openbis/installer/izpack/ExecuteSetupScriptsAction.java @@ -182,10 +182,28 @@ public class ExecuteSetupScriptsAction extends AbstractScriptExecutor implements private void executRestoreConfigScript(AutomatedInstallData data) { String script = getAdminScript(data, RESTORE_CONFIG_FROM_BACKUP_SCRIPT); - String backupConfigFolder = - data.getVariable(GlobalInstallationContext.BACKUP_FOLDER_VARNAME) - + "/config-backup"; + String backupConfigFolder = data.getVariable(GlobalInstallationContext.BACKUP_FOLDER_VARNAME) + "/config-backup"; executeAdminScript(null, script, backupConfigFolder); + restoreCustomPagesFolder(data); + } + + private void restoreCustomPagesFolder(AutomatedInstallData data) + { + File backupCustomPagesFolder = new File(data.getVariable(GlobalInstallationContext.BACKUP_FOLDER_VARNAME) + "/openBIS-server/jetty/webapps/openbis/custom"); + if(!backupCustomPagesFolder.exists()) { + return; + } + System.out.println("Starting restoration of backup Pages Folder: " + backupCustomPagesFolder.getAbsolutePath()); + File justInstalledPagesFolder = new File(data.getVariable(GlobalInstallationContext.BACKUP_FOLDER_VARNAME) + "/../../servers/openBIS-server/jetty/webapps/openbis/custom"); + try + { + FileUtils.deleteDirectory(justInstalledPagesFolder); + FileUtils.copyDirectory(backupCustomPagesFolder, justInstalledPagesFolder); + System.out.println("Finished restoration of backup pages folder."); + } catch (IOException e) + { + System.out.println("Error restoring custom pages folder. "); + } } private void executePostInstallationScript(AutomatedInstallData data)