From 2e08d2c0e9bede644be993ddaa28157c9f156c10 Mon Sep 17 00:00:00 2001
From: Violette Roche-Montane <violette.roche-montane@forgerock.com>
Date: Tue, 07 May 2013 13:50:59 +0000
Subject: [PATCH] svn merge https://svn.forgerock.org/opendj/trunk/opends@8851 https://svn.forgerock.org/opendj/branches/native-packaging@8851 .
---
opends/src/quicksetup/org/opends/quicksetup/installer/webstart/WebStartInstaller.java | 39 +--------------------------------------
1 files changed, 1 insertions(+), 38 deletions(-)
diff --git a/opends/src/quicksetup/org/opends/quicksetup/installer/webstart/WebStartInstaller.java b/opends/src/quicksetup/org/opends/quicksetup/installer/webstart/WebStartInstaller.java
index 8ec0f59..49ebad1 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/installer/webstart/WebStartInstaller.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/installer/webstart/WebStartInstaller.java
@@ -23,7 +23,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2011-2012 ForgeRock AS
+ * Portions Copyright 2011-2013 ForgeRock AS
*/
package org.opends.quicksetup.installer.webstart;
@@ -541,43 +541,6 @@
}
/**
- * {@inheritDoc}
- */
- protected String getOpenDSClassPath()
- {
- StringBuilder buf = new StringBuilder();
- String[] jars = getOpenDSJarPaths();
- for (int i = 0; i < jars.length; i++)
- {
- if (i != 0)
- {
- buf.append(System.getProperty("path.separator"));
- }
- buf.append(jars[i]);
- }
- return buf.toString();
- }
-
- /**
- * Returns the jar file paths in the installation. This is used to launch
- * command lines that require a classpath.
- * @return the jar file paths in the installation.
- */
- private String[] getOpenDSJarPaths()
- {
- String[] jarPaths =
- new String[Installation.OPEN_DS_JAR_RELATIVE_PATHS.length];
- File parentDir = new File(getUserData().getServerLocation());
- for (int i = 0; i < jarPaths.length; i++)
- {
- File f = new File(parentDir, Installation.OPEN_DS_JAR_RELATIVE_PATHS[i]);
- jarPaths[i] = f.getAbsolutePath();
- }
- return jarPaths;
-
- }
-
- /**
* Returns the name of the zip file name that contains all the installation.
* @return the name of the zip file name that contains all the installation.
*/
--
Gitblit v1.10.0