From e39a001d3ba7f04212d7eb9e1e7cf5b57e6e98f7 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Thu, 01 Aug 2013 15:26:46 +0000
Subject: [PATCH] Change visibility of various classes and methods in the upgrader so that it can be used for embedded upgrades.
---
opendj-sdk/opends/src/server/org/opends/server/tools/upgrade/UpgradeUtils.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/upgrade/UpgradeUtils.java b/opendj-sdk/opends/src/server/org/opends/server/tools/upgrade/UpgradeUtils.java
index d439e78..d4071a4 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/upgrade/UpgradeUtils.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/upgrade/UpgradeUtils.java
@@ -117,7 +117,7 @@
*
* @return the path of the installation of the directory server.
*/
- public static String getInstallPathFromClasspath()
+ static String getInstallPathFromClasspath()
{
String installPath = DirectoryServer.getServerRoot();
if (installPath != null)
@@ -173,7 +173,7 @@
* The installation path
* @return the path of the installation of the directory server.
*/
- public static String getInstancePathFromInstallPath(final String installPath)
+ static String getInstancePathFromInstallPath(final String installPath)
{
String instancePathFileName = Installation.INSTANCE_LOCATION_PATH;
final File configureScriptPath =
@@ -239,7 +239,7 @@
* File to get the path
* @return the absolute path for the given file.
*/
- public static String getPath(File f)
+ static String getPath(File f)
{
String path = null;
if (f != null)
@@ -274,7 +274,7 @@
* the relative path.
* @return the absolute path for the given parentPath and relativePath.
*/
- public static String getPath(final String parentPath,
+ static String getPath(final String parentPath,
final String relativePath)
{
return getPath(new File(new File(parentPath), relativePath));
@@ -287,7 +287,7 @@
* @return <CODE>true</CODE> if we are running under windows and
* <CODE>false</CODE> otherwise.
*/
- public static boolean isWindows()
+ static boolean isWindows()
{
return SetupUtils.isWindows();
}
@@ -299,7 +299,7 @@
* @return <CODE>true</CODE> if we are running under Unix and
* <CODE>false</CODE> otherwise.
*/
- public static boolean isUnix()
+ static boolean isUnix()
{
return SetupUtils.isUnix();
}
@@ -313,7 +313,7 @@
* possible child 0f <code>ancestor</code>
* @return return true if ancestor is a parent of descendant
*/
- static public boolean isParentOf(final File ancestor, File descendant)
+ static boolean isParentOf(final File ancestor, File descendant)
{
if (ancestor != null)
{
@@ -338,7 +338,7 @@
* path in the file system; <code>false</code> otherwise or if
* either of the files are null
*/
- public static boolean isDescendant(File descendant, File path) {
+ static boolean isDescendant(File descendant, File path) {
boolean isDescendant = false;
if (descendant != null && path != null) {
File parent = descendant.getParentFile();
--
Gitblit v1.10.0