From 04ead8f1c81d759108686bbd4add4b9eee542c2e Mon Sep 17 00:00:00 2001
From: kenneth_suter <kenneth_suter@localhost>
Date: Wed, 11 Apr 2007 18:51:40 +0000
Subject: [PATCH] During schema and configuration upgrade, the server is started 'in process' without any connection handlers and the changes are made using an internal connection to the server. During configuration/schema updates:
---
opends/src/quicksetup/org/opends/quicksetup/util/ZipExtractor.java | 44 +-------------------------------------------
1 files changed, 1 insertions(+), 43 deletions(-)
diff --git a/opends/src/quicksetup/org/opends/quicksetup/util/ZipExtractor.java b/opends/src/quicksetup/org/opends/quicksetup/util/ZipExtractor.java
index f0b8301..6219fff 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/util/ZipExtractor.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/util/ZipExtractor.java
@@ -29,12 +29,10 @@
import org.opends.quicksetup.QuickSetupException;
import org.opends.quicksetup.Application;
-import org.opends.quicksetup.Installation;
import org.opends.quicksetup.i18n.ResourceProvider;
import java.io.InputStream;
import java.io.IOException;
-import java.io.File;
import java.util.zip.ZipInputStream;
import java.util.zip.ZipEntry;
import java.util.ArrayList;
@@ -228,7 +226,7 @@
}
} else
{
- String perm = getFileSystemPermissions(path);
+ String perm = Utils.getFileSystemPermissions(path);
ArrayList<String> list = permissions.get(perm);
if (list == null)
{
@@ -255,44 +253,4 @@
return "755";
}
- /**
- * Returns the file system permissions for a file.
- * @param path the file for which we want the file permissions.
- * @return the file system permissions for the file.
- */
- private String getFileSystemPermissions(String path)
- {
- // TODO We should get this dynamically during build?
- String perm;
-
- File file = new File(path);
- if (file.getParent().endsWith(
- File.separator + Installation.WINDOWS_BINARIES_PATH_RELATIVE) ||
- file.getParent().endsWith(
- File.separator + Installation.UNIX_BINARIES_PATH_RELATIVE))
- {
- if (path.endsWith(".bat"))
- {
- perm = "644";
- }
- else
- {
- perm = "755";
- }
- }
- else if (path.endsWith(".sh"))
- {
- perm = "755";
- } else if (path.endsWith(Installation.UNIX_SETUP_FILE_NAME) ||
- path.endsWith(Installation.UNIX_UNINSTALL_FILE_NAME) ||
- path.endsWith(Installation.UNIX_UPGRADE_FILE_NAME))
- {
- perm = "755";
- } else
- {
- perm = "644";
- }
- return perm;
- }
-
}
--
Gitblit v1.10.0