From cd68c195c87eb7afabd95d017de2edddf00a7c42 Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Mon, 07 Jan 2008 12:54:54 +0000
Subject: [PATCH] Fix for issue 2780.
---
opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/upgrader/Upgrader.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/upgrader/Upgrader.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/upgrader/Upgrader.java
index 26ec629..9247880 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/upgrader/Upgrader.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/upgrader/Upgrader.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Portions Copyright 2007 Sun Microsystems, Inc.
+ * Portions Copyright 2008 Sun Microsystems, Inc.
*/
package org.opends.quicksetup.upgrader;
@@ -139,6 +139,7 @@
// Files that will be ignored during backup
static final String[] FILES_TO_IGNORE_DURING_BACKUP = {
TOOLS_PROPERTIES, // tools.properties
+ RELATIVE_JAVA_PROPERTIES_FILE, // java.properties
ADSContext.getAdminLDIFFile() // admin-backend.ldif
};
@@ -1357,7 +1358,7 @@
Stage stage = getStage();
Installation installation = getInstallation();
File root = installation.getRootDirectory();
- stage.move(root);
+ stage.move(root, new UpgradeFileFilter(getStageDirectory()));
// The bits should now be of the new version. Have
// the installation update the build information so
--
Gitblit v1.10.0