From 6292beaede500c125091a84263ed7cda454ba299 Mon Sep 17 00:00:00 2001
From: Gaetan Boismal <gaetan.boismal@forgerock.com>
Date: Wed, 21 Oct 2015 16:05:43 +0000
Subject: [PATCH] OPENDJ-2348 PR-96 Remove webstart and netscape support
---
opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/JavaArgumentsDialog.java | 53 --
opendj-server-legacy/src/main/java/org/opends/quicksetup/CurrentInstallStatus.java | 105 +++---
opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/QuickSetupStepPanel.java | 12
opendj-server-legacy/src/main/java/org/opends/quicksetup/Application.java | 4
opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/GuiApplication.java | 74 -----
opendj-server-legacy/src/messages/org/opends/messages/quickSetup_es.properties | 6
opendj-server-legacy/src/messages/org/opends/messages/quickSetup_ja.properties | 6
opendj-server-legacy/src/main/java/org/opends/quicksetup/ReturnCode.java | 8
opendj-server-legacy/src/main/java/org/opends/quicksetup/SplashScreen.java | 3
opendj-server-legacy/pom.xml | 8
opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/Installer.java | 105 -------
opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/FieldName.java | 6
opendj-server-legacy/src/messages/org/opends/messages/quickSetup_zh_CN.properties | 6
opendj-server-legacy/src/main/java/org/opends/admin/ads/ADSContext.java | 3
opendj-server-legacy/src/main/java/org/opends/server/util/SetupUtils.java | 16 -
opendj-server-legacy/src/messages/org/opends/messages/quickSetup_fr.properties | 6
opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/InstallReviewPanel.java | 39 --
opendj-server-legacy/src/messages/org/opends/messages/quickSetup.properties | 13
opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/QuickSetup.java | 22 -
opendj-server-legacy/src/main/java/org/opends/quicksetup/LicenseFile.java | 54 ---
opendj-server-legacy/src/main/java/org/opends/quicksetup/util/Utils.java | 66 ---
opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/ServerSettingsPanel.java | 67 ----
/dev/null | 83 -----
opendj-server-legacy/src/main/resources/java-stubs/org/opends/server/util/DynamicConstants.java | 17 -
opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/InstallProgressStep.java | 12
opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/package-info.java | 8
opendj-server-legacy/src/messages/org/opends/messages/quickSetup_ko.properties | 4
opendj-server-legacy/src/messages/org/opends/messages/quickSetup_zh_TW.properties | 4
opendj-server-legacy/src/main/java/org/opends/quicksetup/ApplicationException.java | 1
opendj-server-legacy/src/messages/org/opends/messages/quickSetup_de.properties | 6
30 files changed, 105 insertions(+), 712 deletions(-)
diff --git a/opendj-server-legacy/pom.xml b/opendj-server-legacy/pom.xml
index f985a24..3a316df 100644
--- a/opendj-server-legacy/pom.xml
+++ b/opendj-server-legacy/pom.xml
@@ -728,8 +728,6 @@
<!-- Import je changelog since it is not shipped in the main jar -->
<Import-Package>
org.opends.server.replication.server.changelog.je,
- javax.jnlp,
- netscape.ldap,
${opendj.osgi.import}
</Import-Package>
</instructions>
@@ -797,8 +795,6 @@
<include>**/messages/MessageDescriptor.class</include>
<include>**/server/types/PublicAPI.class</include>
<include>**/server/types/StabilityLevel.class</include>
- <include>**/javax/jnlp/*</include>
- <include>**/netscape/ldap/*</include>
<include>**/build/tools/*</include>
</includes>
</configuration>
@@ -1053,8 +1049,6 @@
<exclude>*.app/**</exclude>
<exclude>java-stubs/**</exclude>
<exclude>bootstrap/**</exclude>
- <exclude>javax/jnlp/**</exclude>
- <exclude>netscape/**</exclude>
<exclude>META-INF/**</exclude>
<exclude>org/opends/dsml/**</exclude>
<exclude>**/*_ca_ES.properties</exclude>
@@ -1321,7 +1315,7 @@
<execution>
<id>check-src-and-tests-alternative</id>
<configuration>
- <excludes>generated/org/opends/server/snmp/**,org/opends/messages/**,**/server/admin/std/**,**/config/meta/**,**/config/client/**,**/config/server/**,**/dsml/protocol/**,javax/jnlp/**,netscape/ldap/**</excludes>
+ <excludes>generated/org/opends/server/snmp/**,org/opends/messages/**,**/server/admin/std/**,**/config/meta/**,**/config/client/**,**/config/server/**,**/dsml/protocol/**</excludes>
<configLocation>${project.build.outputDirectory}/org/forgerock/checkstyle/opends-checkstyle.xml</configLocation>
<headerLocation>${project.build.outputDirectory}/org/forgerock/checkstyle/opendj.sourceheader</headerLocation>
<suppressionsLocation>${project.build.outputDirectory}/org/forgerock/checkstyle/unit-test-suppressions.xml</suppressionsLocation>
diff --git a/opendj-server-legacy/resource/webstart/WEB-INF/web.xml b/opendj-server-legacy/resource/webstart/WEB-INF/web.xml
deleted file mode 100644
index 673ec71..0000000
--- a/opendj-server-legacy/resource/webstart/WEB-INF/web.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
-<web-app>
- <servlet>
- <servlet-name>JnlpDownloadServlet</servlet-name>
- <servlet-class>jnlp.sample.servlet.JnlpDownloadServlet</servlet-class>
- </servlet>
- <servlet-mapping>
- <servlet-name>JnlpDownloadServlet</servlet-name>
- <url-pattern>*.jnlp</url-pattern>
- </servlet-mapping>
-</web-app>
-
diff --git a/opendj-server-legacy/resource/webstart/create-webstart-standalone.sh b/opendj-server-legacy/resource/webstart/create-webstart-standalone.sh
deleted file mode 100755
index 9f3aaa7..0000000
--- a/opendj-server-legacy/resource/webstart/create-webstart-standalone.sh
+++ /dev/null
@@ -1,249 +0,0 @@
-#!/bin/sh
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
-# or http://forgerock.org/license/CDDLv1.0.html.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at legal-notices/CDDLv1_0.txt.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information:
-# Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Portions Copyright 2006-2010 Sun Microsystems Inc.
-# Copyright 2010-2015 ForgeRock AS
-
-# Determine the location to this script so that we know where we are in the
-# OpenDJ source tree.
-LAUNCH_DIR=`dirname "$0"`
-cd "${LAUNCH_DIR}"
-SCRIPT_DIR=`pwd`
-cd ../..
-ROOT_DIR=`pwd`
-cd "${SCRIPT_DIR}"
-echo "ROOT_DIR: ${ROOT_DIR}"
-
-if test -z "${PRODUCT_FILE}"
-then
- PRODUCT_FILE="${ROOT_DIR}/PRODUCT"
-fi
-echo "PRODUCT_FILE: ${PRODUCT_FILE}"
-
-if test -z "${PRODUCT_NAME}"
-then
- PRODUCT_NAME=`grep SHORT_NAME "${PRODUCT_FILE}" | cut -d= -f2`
-fi
-echo "PRODUCT_NAME: ${PRODUCT_NAME}"
-
-# Make sure that a few constants are defined that will be needed to build the
-# web start archive.
-if test -z "${PROTOCOL}"
-then
- PROTOCOL="http"
-fi
-echo "PROTOCOL: ${PROTOCOL}"
-
-if test -z "${ADDRESS}"
-then
- ADDRESS="www.forgerock.org"
-fi
-echo "ADDRESS: ${ADDRESS}"
-echo "PORT: ${PORT}"
-
-if test -z "${BASE_PATH}"
-then
- BASE_PATH="/downloads/opendj/latest/install"
-fi
-echo "BASE_PATH: ${BASE_PATH}"
-
-if test -z "${INSTALL_JNLP_FILENAME}"
-then
- INSTALL_JNLP_FILENAME="QuickSetup.jnlp"
-fi
-echo "INSTALL_JNLP_FILENAME: ${INSTALL_JNLP_FILENAME}"
-
-if test -z "${PORT}"
-then
- INSTALLER_URI="${PROTOCOL}://${ADDRESS}${BASE_PATH}"
-else
- INSTALLER_URI="${PROTOCOL}://${ADDRESS}:${PORT}${BASE_PATH}"
-fi
-
-VENDOR="http://www.forgerock.com/"
-HOMEPAGE="http://www.forgerock.com/opendj.html"
-
-# See if we can find the location of the dependencies in the Java environment.
-# If not, then fail.
-if test -z "${JAVA_HOME}"
-then
- JAVA_HOME=`java -cp "${ROOT_DIR}/resource" FindJavaHome 2> /dev/null`
- if test -z "${JAVA_HOME}"
- then
- echo "Please set JAVA_HOME to the root of a Java 7.0 installation."
- exit 1
- else
- export JAVA_HOME
- fi
-fi
-
-JAR="${JAVA_HOME}/bin/jar"
-if test ! -x "${JAR}"
-then
- echo "ERROR: Cannot find the ${JAR} utility."
- echo " Is JAVA_HOME set correctly?"
- echo " It should point to the root of a JDK (not a JRE) installation"
- exit 1
-fi
-
-JARSIGNER="${JAVA_HOME}/bin/jarsigner"
-if test ! -x "${JARSIGNER}"
-then
- echo "ERROR: Cannot find the ${JARSIGNER} utility."
- echo " Is JAVA_HOME set correctly?"
- echo " It should point to the root of a JDK (not a JRE) installation"
- exit 1
-fi
-
-# Make sure that the OpenDJ build directory exists. If not, then create it.
-
-if test -z "${BUILD_DIR}"
-then
- BUILD_DIR="${ROOT_DIR}/build"
-fi
-echo "BUILD_DIR: ${BUILD_DIR}"
-
-if test ! -d "${BUILD_DIR}"
-then
- echo "WARNING: ${BUILD_DIR} does not exist. Building the server ..."
- "${ROOT_DIR}/build.sh"
- EXIT_CODE=$?
- if test "${EXIT_CODE}" -ne 0
- then
- echo "ERROR: Build failed. Aborting creation of web start archive."
- exit ${EXIT_CODE}
- else
- echo "The server was built successfully."
- fi
-fi
-
-
-# Determine what the name should be for the OpenDJ zip file name, but without
-# the ".zip" extension.
-ZIP_FILEPATH=`ls "${BUILD_DIR}"/package/${PRODUCT_NAME}*.zip`
-ZIP_FILENAME=`basename "${ZIP_FILEPATH}"`
-ZIP_FILENAME_BASE=`echo "${ZIP_FILENAME}" | sed -e 's/\.zip//'`
-
-
-# Create the directory structure into which we will place the archive.
-echo "Creating the initial directory structure ..."
-WEBSTART_DIR="${BUILD_DIR}/webstart"
-INSTALL_DIR="${WEBSTART_DIR}/install"
-rm -rf "${INSTALL_DIR}"
-mkdir -p "${INSTALL_DIR}/lib"
-
-
-# Copy the static files from the script directory into the appropriate places
-# in the archive.
-echo "Copying static content into place ..."
-cp -Rp "${SCRIPT_DIR}/images" "${INSTALL_DIR}"
-find "${INSTALL_DIR}/images" -type d -name '.svn' -exec rm -rf {} \;
-
-
-# Copy the appropriate OpenDJ library files and make sure they are signed.
-PKG_LIB_DIR="${BUILD_DIR}/package/${ZIP_FILENAME_BASE}/lib"
-CERT_KEYSTORE="${ROOT_DIR}/tests/unit-tests-testng/resource/server.keystore"
-CERT_KEYSTORE_PIN="password"
-CERT_ALIAS="server-cert"
-for LIBFILE in "${PRODUCT_NAME}.jar" je.jar quicksetup.jar
-do
- echo "Signing ${LIBFILE} ..."
- cp "${PKG_LIB_DIR}/${LIBFILE}" "${INSTALL_DIR}/lib"
- "${JARSIGNER}" -keystore "${CERT_KEYSTORE}" -keypass "${CERT_KEYSTORE_PIN}" \
- -storepass "${CERT_KEYSTORE_PIN}" \
- "${INSTALL_DIR}/lib/${LIBFILE}" "${CERT_ALIAS}"
-done
-
-# Create and sign the licence.jar file if exists.
-if [ -d ${BUILD_DIR}/package/${ZIP_FILENAME_BASE}/legal-notices ]
-then
-echo "Creating license.jar ..."
-cp "${BUILD_DIR}/package/${ZIP_FILENAME_BASE}/legal-notices" "${INSTALL_DIR}/lib"
-cd "${BUILD_DIR}/package"
-"${JAR}" -cf "${INSTALL_DIR}/lib/license.jar" -C "${BUILD_DIR}/package/${ZIP_FILENAME_BASE}/" "legal-notices"
-cd "${INSTALL_DIR}/lib"
-echo "Signing license.jar ..."
-"${JARSIGNER}" -keystore "${CERT_KEYSTORE}" -keypass "${CERT_KEYSTORE_PIN}" \
- -storepass "${CERT_KEYSTORE_PIN}" license.jar "${CERT_ALIAS}"
-# Create the resource line to add to the jnlp script.
-LICENSEJAR="<jar href=\"lib/license.jar\" download=\"eager\"/>"
-fi
-
-# Create and sign the zipped.jar file.
-echo "Creating zipped.jar ..."
-cd "${BUILD_DIR}/package"
-"${JAR}" -cf "${INSTALL_DIR}/lib/zipped.jar" "${ZIP_FILENAME_BASE}.zip"
-cd "${INSTALL_DIR}/lib"
-echo "Signing zipped.jar ..."
-"${JARSIGNER}" -keystore "${CERT_KEYSTORE}" -keypass "${CERT_KEYSTORE_PIN}" \
- -storepass "${CERT_KEYSTORE_PIN}" zipped.jar "${CERT_ALIAS}"
-
-
-# Create the Setup JNLP file with the appropriate contents.
-echo "Creating Setup JNLP file ${INSTALL_JNLP_FILENAME} ..."
-cd ..
-cat > "${INSTALL_JNLP_FILENAME}" <<ENDOFINSTALLJNLP
-<?xml version="1.0" encoding="utf-8"?>
-<!-- JNLP File for ${PRODUCT_NAME} QuickSetup Application -->
-<jnlp spec="1.5+"
- codebase="${INSTALLER_URI}" href="${INSTALL_JNLP_FILENAME}">
- <information>
- <title>${PRODUCT_NAME} QuickSetup Application</title>
- <vendor>${VENDOR}</vendor>
- <homepage href="${HOMEPAGE}"/>
- <description>${PRODUCT_NAME} QuickSetup Application</description>
- <description kind="short">${PRODUCT_NAME} Web Start Installer</description>
- <icon href="images/opendjhref.png" height="128" width="128"/>
- <icon kind="splash" href="images/opendjsplash.png" height="114" width="479"/>
- </information>
-
- <security>
- <all-permissions/>
- </security>
-
- <resources>
- <j2se version="1.6+" java-vm-args="-client"/>
- <jar href="lib/quicksetup.jar" download="eager" main="true"/>
- ${LICENSEJAR}
- <jar href="lib/${PRODUCT_NAME}.jar" download="lazy"/>
- <jar href="lib/je.jar" download="lazy"/>
- <jar href="lib/zipped.jar" download="lazy"/>
- <property name="org.opends.quicksetup.iswebstart" value="true" />
- <property name="org.opends.quicksetup.Application.class" value="org.opends.quicksetup.installer.webstart.WebStartInstaller"/>
- <property name="org.opends.quicksetup.lazyjarurls" value="${INSTALLER_URI}/lib/${PRODUCT_NAME}.jar ${INSTALLER_URI}/lib/zipped.jar ${INSTALLER_URI}/lib/je.jar" />
- <property name="org.opends.quicksetup.zipfilename" value="${ZIP_FILENAME_BASE}.zip"/>
- </resources>
-
- <resources os="AIX">
- <j2se version="1.6+"/>
- </resources>
-
- <application-desc main-class="org.opends.quicksetup.SplashScreen"/>
-</jnlp>
-ENDOFINSTALLJNLP
-
-
-# Tell the user where the files are.
-echo "The deployable content may be found in ${BUILD_DIR}/webstart"
-echo "It is intended for deployment at ${INSTALLER_URI}"
-
diff --git a/opendj-server-legacy/resource/webstart/images/opendjhref.png b/opendj-server-legacy/resource/webstart/images/opendjhref.png
deleted file mode 100644
index b3e1f37..0000000
--- a/opendj-server-legacy/resource/webstart/images/opendjhref.png
+++ /dev/null
Binary files differ
diff --git a/opendj-server-legacy/resource/webstart/images/opendjsplash.png b/opendj-server-legacy/resource/webstart/images/opendjsplash.png
deleted file mode 100644
index 173e038..0000000
--- a/opendj-server-legacy/resource/webstart/images/opendjsplash.png
+++ /dev/null
Binary files differ
diff --git a/opendj-server-legacy/src/build-tools/javax/jnlp/DownloadService.java b/opendj-server-legacy/src/build-tools/javax/jnlp/DownloadService.java
deleted file mode 100644
index 781658e..0000000
--- a/opendj-server-legacy/src/build-tools/javax/jnlp/DownloadService.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
- * or http://forgerock.org/license/CDDLv1.0.html.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at legal-notices/CDDLv1_0.txt.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information:
- * Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- * Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2015 ForgeRock AS
- */
-package javax.jnlp;
-
-import java.io.IOException;
-import java.net.URL;
-
-/**
- * This is just an empty implementation of DownloadService. It does define
- * only the methods of the JNLP API used in the class
- * org.opends.quicksetup.webstart.WebstartDownloader.
- *
- * We have chosen to do this because we we require the JNLP API to be compiled
- * but the location of the javaws.jar depends on the java distribution, so
- * instead of trying to figure out where javaws.jar is on the java distribution
- * that is being used to compile the source, we just add these classes to the
- * build-tools.jar file that will be used to compile que QuickSetup.
- *
- * It must be noted that the class
- * org.opends.quicksetup.webstart.WebstartDownloader will be only executed in
- * the context of a Java Web Start application and that in this case the
- * javaws.jar will be provided by the Java Web Start Runtime environment. So
- * we are not providing the javaws-stub.jar during runtime: it is used only
- * for compilation.
- */
-public interface DownloadService {
- boolean isResourceCached(URL url, String version);
- void removeResource(URL url, String version) throws IOException;
- void loadResource(URL ref, String version, DownloadServiceListener listener) throws IOException;
-}
diff --git a/opendj-server-legacy/src/build-tools/javax/jnlp/DownloadServiceListener.java b/opendj-server-legacy/src/build-tools/javax/jnlp/DownloadServiceListener.java
deleted file mode 100644
index 7ea8947..0000000
--- a/opendj-server-legacy/src/build-tools/javax/jnlp/DownloadServiceListener.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
- * or http://forgerock.org/license/CDDLv1.0.html.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at legal-notices/CDDLv1_0.txt.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information:
- * Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- * Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2015 ForgeRock AS
- */
-package javax.jnlp;
-
-import java.net.URL;
-
-/**
- * This is the interface definition of DownloadServiceListener.
- *
- * We have chosen to do this because we we require the JNLP API to be compiled
- * but the location of the javaws.jar depends on the java distribution, so
- * instead of trying to figure out where javaws.jar is on the java distribution
- * that is being used to compile the source, we just add these classes to the
- * build-tools.jar file that will be used to compile que QuickSetup.
- *
- * It must be noted that the class
- * org.opends.quicksetup.webstart.WebstartDownloader will be only executed in
- * the context of a Java Web Start application and that in this case the
- * javaws.jar will be provided by the Java Web Start Runtime environment. So
- * we are not providing the javaws-stub.jar during runtime: it is used only
- * for compilation.
- */
-public interface DownloadServiceListener {
- void downloadFailed(URL url, String version);
- void progress(URL url, String version, long readSoFar, long total, int overallPercent);
- void upgradingArchive(URL url, String version, int patchPercent, int overallPercent);
- void validating(URL url, String version, long entry, long total, int overallPercent);
-}
diff --git a/opendj-server-legacy/src/build-tools/javax/jnlp/ServiceManager.java b/opendj-server-legacy/src/build-tools/javax/jnlp/ServiceManager.java
deleted file mode 100644
index 736bf4c..0000000
--- a/opendj-server-legacy/src/build-tools/javax/jnlp/ServiceManager.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
- * or http://forgerock.org/license/CDDLv1.0.html.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at legal-notices/CDDLv1_0.txt.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information:
- * Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- * Copyright 2006-2008 Sun Microsystems, Inc.
- */
-
-package javax.jnlp;
-
-/**
- * This is just an empty implementation of ServiceManager. It does define
- * only the methods of the JNLP API used in the class
- * org.opends.quicksetup.webstart.WebstartDownloader.
- *
- * We have chosen to do this because we we require the JNLP API to be compiled
- * but the location of the javaws.jar depends on the java distribution, so
- * instead of trying to figure out where javaws.jar is on the java distribution
- * that is being used to compile the source, we just add these classes to the
- * build-tools.jar file that will be used to compile que QuickSetup.
- *
- * It must be noted that the class
- * org.opends.quicksetup.webstart.WebstartDownloader will be only executed in
- * the context of a Java Web Start application and that in this case the
- * javaws.jar will be provided by the Java Web Start Runtime environment. So
- * we are not providing the javaws-stub.jar during runtime: it is used only
- * for compilation.
- *
- */
-public class ServiceManager {
- public static Object lookup(String name) throws UnavailableServiceException
- {
- return null;
- }
-}
diff --git a/opendj-server-legacy/src/build-tools/javax/jnlp/UnavailableServiceException.java b/opendj-server-legacy/src/build-tools/javax/jnlp/UnavailableServiceException.java
deleted file mode 100644
index c9cb8ae..0000000
--- a/opendj-server-legacy/src/build-tools/javax/jnlp/UnavailableServiceException.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
- * or http://forgerock.org/license/CDDLv1.0.html.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at legal-notices/CDDLv1_0.txt.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information:
- * Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- * Copyright 2006-2008 Sun Microsystems, Inc.
- */
-
-package javax.jnlp;
-
-/**
- * This is just an empty implementation of UnavailableServiceException. This
- * class is used in the class
- * org.opends.quicksetup.webstart.WebstartDownloader.
- *
- * We have chosen to do this because we we require the JNLP API to be compiled
- * but the location of the javaws.jar depends on the java distribution, so
- * instead of trying to figure out where javaws.jar is on the java distribution
- * that is being used to compile the source, we just add these classes to the
- * build-tools.jar file that will be used to compile que QuickSetup.
- *
- * It must be noted that the class
- * org.opends.quicksetup.webstart.WebstartDownloader will be only executed in
- * the context of a Java Web Start application and that in this case the
- * javaws.jar will be provided by the Java Web Start Runtime environment. So
- * we are not providing the javaws-stub.jar during runtime: it is used only
- * for compilation.
- *
- */
-public class UnavailableServiceException extends Exception {
- private static final long serialVersionUID = 286996071734385910L;
-}
diff --git a/opendj-server-legacy/src/build-tools/javax/jnlp/package-info.java b/opendj-server-legacy/src/build-tools/javax/jnlp/package-info.java
deleted file mode 100644
index e4db47a..0000000
--- a/opendj-server-legacy/src/build-tools/javax/jnlp/package-info.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
- * or http://forgerock.org/license/CDDLv1.0.html.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at legal-notices/CDDLv1_0.txt.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information:
- * Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- * Copyright 2008 Sun Microsystems, Inc.
- */
-
-
-
-/**
- * This package provides a set of source file stubs for files that are part of
- * the javax.jnlp package and are needed in order to build QuickSetup (and
- * potentially other utilities accessible via Java Web Start). This code is not
- * actually used in any way other than to allow other code to compile, nor
- * should it be included in any JAR files or other bundles that we ship.
- */
-package javax.jnlp;
-
diff --git a/opendj-server-legacy/src/build-tools/netscape/ldap/LDAPSocketFactory.java b/opendj-server-legacy/src/build-tools/netscape/ldap/LDAPSocketFactory.java
deleted file mode 100644
index 123a516..0000000
--- a/opendj-server-legacy/src/build-tools/netscape/ldap/LDAPSocketFactory.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
- * or http://forgerock.org/license/CDDLv1.0.html.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at legal-notices/CDDLv1_0.txt.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information:
- * Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- * Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2015 ForgeRock AS
- */
-package netscape.ldap;
-
-
-
-import java.net.Socket;
-
-
-
-/**
- * This class provides an empty definition of the
- * {{netscape.ldap.LDAPSocketFactory}} interface, which is part of the Mozilla
- * LDAP SDK for Java. It is provided to allow the
- * {{org.opends.server.protocols.internal.InternalMozillaLDAPSocketFactory}}
- * class to compile without creating a dependency on the full Mozilla LDAP SDK
- * for Java.
- * <BR><BR>
- * Note that we do not intend to distribute the Mozilla LDAP SDK for Java with
- * OpenDS, or do we depend on it in any way. Any third-party applications which
- * intend to use the
- * {{org.opends.server.protocols.internal.InternalMozillaLDAPSocketFactory}}
- * class will be required to provide the Mozilla LDAP SDK for Java library.
- */
-public interface LDAPSocketFactory
-{
- Socket makeSocket(String host, int port);
-}
-
diff --git a/opendj-server-legacy/src/build-tools/netscape/ldap/package-info.java b/opendj-server-legacy/src/build-tools/netscape/ldap/package-info.java
deleted file mode 100644
index 9463946..0000000
--- a/opendj-server-legacy/src/build-tools/netscape/ldap/package-info.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
- * or http://forgerock.org/license/CDDLv1.0.html.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at legal-notices/CDDLv1_0.txt.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information:
- * Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- * Copyright 2008 Sun Microsystems, Inc.
- */
-
-
-
-/**
- * This package provides a source file stub for the LDAPSocketFactory class
- * that is part of the Mozilla LDAP SDK for Java and is required to build the
- * org.opends.server.protocols.internal.InternalMozillaLDAPSocketFactory class.
- * This class provides a simple way to use the Mozilla LDAP SDK for Java to
- * perform internal operations in OpenDS.
- *
- * This code is not acutally used in any way other than to allow other code to
- * compile, and it should not be included in any JAR files or other bundles
- * that we ship as part of OpenDS.
- */
-package netscape.ldap;
-
diff --git a/opendj-server-legacy/src/main/java/org/opends/admin/ads/ADSContext.java b/opendj-server-legacy/src/main/java/org/opends/admin/ads/ADSContext.java
index 9bb2c0b..9639987 100644
--- a/opendj-server-legacy/src/main/java/org/opends/admin/ads/ADSContext.java
+++ b/opendj-server-legacy/src/main/java/org/opends/admin/ads/ADSContext.java
@@ -1030,8 +1030,7 @@
/**
* Creates the Administration Data in the server. The call to this method
- * assumes that OpenDS.jar has already been loaded. So this should not be
- * called by the Java Web Start before being sure that this jar is loaded.
+ * assumes that OpenDJ.jar has already been loaded.
*
* @param backendName
* the backend name which will handle admin information.
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/Application.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/Application.java
index 6b9f839..c6110f8 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/Application.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/Application.java
@@ -732,8 +732,8 @@
/**
* This class is used to notify the ProgressUpdateListeners of events
- * that are written to the standard error. It is used in WebStartInstaller
- * and in OfflineInstaller. These classes just create a ErrorPrintStream and
+ * that are written to the standard error. It is used in OfflineInstaller.
+ * These classes just create a ErrorPrintStream and
* then they do a call to System.err with it.
*
* The class just reads what is written to the standard error, obtains an
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/ApplicationException.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/ApplicationException.java
index a0d319a..d657f7b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/ApplicationException.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/ApplicationException.java
@@ -34,7 +34,6 @@
* during the installation.
*
* @see org.opends.quicksetup.installer.Installer
- * @see org.opends.quicksetup.installer.webstart.WebStartInstaller
* @see org.opends.quicksetup.installer.offline.OfflineInstaller
*/
public class ApplicationException extends OpenDsException {
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/CurrentInstallStatus.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/CurrentInstallStatus.java
index ba5eb91..a981228 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/CurrentInstallStatus.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/CurrentInstallStatus.java
@@ -34,16 +34,16 @@
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
+import java.util.List;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.quicksetup.util.Utils;
/**
- * This class is used to know which is the status of the install. This class is
- * not used when we install Open DS using java web start. However it is required
- * when do an offline installation after the user has unzipped the zip file. The
- * main goal of the class is to help identifying whether there is already
+ * This class is used to know which is the status of the install.
+ * It is required to do an installation after the user has unzipped the zip file.
+ * The main goal of the class is to help identifying whether there is already
* something installed or not.
*
* This class assumes that we are running in the case of an offline install.
@@ -59,66 +59,61 @@
/** The constructor of a CurrentInstallStatus object. */
public CurrentInstallStatus()
{
- if (Utils.isWebStart())
+
+ Installation installation = Installation.getLocal();
+ List<LocalizableMessage> msgs = new ArrayList<>();
+
+ if (installation.getStatus().isServerRunning())
{
- isInstalled = false;
- } else
+ msgs.add(INFO_INSTALLSTATUS_SERVERRUNNING.get(getPort()));
+ }
+
+ if (dbFilesExist())
{
- Installation installation = Installation.getLocal();
- ArrayList<LocalizableMessage> msgs = new ArrayList<>();
+ canOverwriteCurrentInstall = true;
+ msgs.add(INFO_INSTALLSTATUS_DBFILEEXIST.get());
+ }
- if (installation.getStatus().isServerRunning())
- {
- msgs.add(INFO_INSTALLSTATUS_SERVERRUNNING.get(getPort()));
- }
+ if (configExists())
+ {
+ canOverwriteCurrentInstall = false;
+ isInstalled = true;
+ msgs.add(INFO_INSTALLSTATUS_CONFIGFILEMODIFIED.get());
+ }
- if (dbFilesExist())
+ if (canOverwriteCurrentInstall)
+ {
+ installationMsg = !Utils.isCli()?
+ INFO_INSTALLSTATUS_CANOVERWRITECURRENTINSTALL_MSG.get() :
+ INFO_INSTALLSTATUS_CANOVERWRITECURRENTINSTALL_MSG_CLI.get();
+ }
+ else if (isInstalled)
+ {
+ LocalizableMessageBuilder buf = new LocalizableMessageBuilder();
+ if (Utils.isCli())
{
- canOverwriteCurrentInstall = true;
- msgs.add(INFO_INSTALLSTATUS_DBFILEEXIST.get());
- }
-
- if (configExists())
- {
- canOverwriteCurrentInstall = false;
- isInstalled = true;
- msgs.add(INFO_INSTALLSTATUS_CONFIGFILEMODIFIED.get());
- }
-
- if (canOverwriteCurrentInstall)
- {
- installationMsg = !Utils.isCli()?
- INFO_INSTALLSTATUS_CANOVERWRITECURRENTINSTALL_MSG.get() :
- INFO_INSTALLSTATUS_CANOVERWRITECURRENTINSTALL_MSG_CLI.get();
- }
- else if (isInstalled)
- {
- LocalizableMessageBuilder buf = new LocalizableMessageBuilder();
- if (Utils.isCli())
+ buf = new LocalizableMessageBuilder();
+ for (LocalizableMessage msg : msgs)
{
- buf = new LocalizableMessageBuilder();
- for (LocalizableMessage msg : msgs)
- {
- buf.append(Constants.LINE_SEPARATOR);
- buf.append("- ").append(msg);
- }
- String cmd = isWindows() ?
- Installation.WINDOWS_SETUP_FILE_NAME :
- Installation.UNIX_SETUP_FILE_NAME;
- installationMsg = INFO_INSTALLSTATUS_INSTALLED_CLI.get(cmd, buf);
+ buf.append(Constants.LINE_SEPARATOR);
+ buf.append("- ").append(msg);
}
- else
+ String cmd = isWindows() ?
+ Installation.WINDOWS_SETUP_FILE_NAME :
+ Installation.UNIX_SETUP_FILE_NAME;
+ installationMsg = INFO_INSTALLSTATUS_INSTALLED_CLI.get(cmd, buf);
+ }
+ else
+ {
+ buf.append("<ul>");
+ for (LocalizableMessage msg : msgs)
{
- buf.append("<ul>");
- for (LocalizableMessage msg : msgs)
- {
- buf.append("\n<li>");
- buf.append(msg);
- buf.append("</li>");
- }
- buf.append("</ul>");
- installationMsg = INFO_INSTALLSTATUS_INSTALLED.get(buf);
+ buf.append("\n<li>");
+ buf.append(msg);
+ buf.append("</li>");
}
+ buf.append("</ul>");
+ installationMsg = INFO_INSTALLSTATUS_INSTALLED.get(buf);
}
}
if (!isInstalled)
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/LicenseFile.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/LicenseFile.java
index 3247350..27f28f4 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/LicenseFile.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/LicenseFile.java
@@ -34,7 +34,6 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
-import java.net.URL;
import org.opends.quicksetup.util.Utils;
import org.opends.server.util.ServerConstants;
@@ -124,17 +123,6 @@
}
/**
- * Returns the URL to the license file when using jnlp / java web start.
- */
- private static URL getWebStartLicenseFile()
- {
- final String licenseResource =
- LEGAL_FOLDER_NAME + File.separatorChar + LICENSE_FILE_NAME;
- return Thread.currentThread().getContextClassLoader().getResource(
- licenseResource);
- }
-
- /**
* Checks if the license file exists.
*
* @return <CODE>true</CODE> if the license file exists in the Legal directory
@@ -143,14 +131,7 @@
*/
public static boolean exists()
{
- if (Utils.isWebStart())
- {
- return getWebStartLicenseFile() != null;
- }
- else
- {
- return getFile().exists();
- }
+ return getFile().exists();
}
/**
@@ -161,37 +142,16 @@
public static String getText()
{
InputStream input = null;
- // Gets the inputstream of the license
- // From a file as the usual way,
- // from an URL if we use web start / jnlp.
- if (!Utils.isWebStart())
+ try
{
- try
- {
- input = new FileInputStream(getFile());
- }
- catch (FileNotFoundException e)
- {
- // Should not happen
- return "";
- }
+ input = new FileInputStream(getFile());
}
- else
+ catch (FileNotFoundException e)
{
- URL licenseURL = getWebStartLicenseFile();
- if (licenseURL != null)
- {
- try
- {
- input = licenseURL.openStream();
- }
- catch (Exception e)
- {
- // Should not happen
- return "";
- }
- }
+ // Should not happen
+ return "";
}
+
// Reads the inputstream content.
final StringBuilder sb = new StringBuilder();
if (input != null)
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/ReturnCode.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/ReturnCode.java
index 292714a..bc7ea63 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/ReturnCode.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/ReturnCode.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2013 ForgeRock AS.
+ * Portions Copyright 2013-2015 ForgeRock AS.
*/
package org.opends.quicksetup;
@@ -53,12 +53,6 @@
public static final ReturnCode FILE_SYSTEM_ACCESS_ERROR = new ReturnCode(3);
/**
- * Error downloading jar files from web start server. This is specific
- * to the web start installation.
- */
- public static final ReturnCode DOWNLOAD_ERROR = new ReturnCode(4);
-
- /**
* Error during the configuration of the Directory Server.
*/
public static final ReturnCode CONFIGURATION_ERROR = new ReturnCode(5);
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/SplashScreen.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/SplashScreen.java
index ef302ec..7315f07 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/SplashScreen.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/SplashScreen.java
@@ -44,9 +44,6 @@
* This is the class that displays a splash screen and in the background it will
* create QuickSetup object.
*
- * The main method of this class is directly called by the Java Web Start
- * mechanism to launch the JWS setup.
- *
* This class tries to minimize the time to be displayed. So it does the loading
* of the setup class in runtime once we already have displayed the splash
* screen. This is why the quickSetup variable is of type Object.
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/InstallProgressStep.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/InstallProgressStep.java
index 87c8933..22b0c0b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/InstallProgressStep.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/InstallProgressStep.java
@@ -39,18 +39,6 @@
NOT_STARTED,
/**
- * Downloading the remote jar files (this step is specific to the Web Start
- * installation).
- */
- DOWNLOADING,
-
- /**
- * Extracting the zip file (this step is specific to the Web Start
- * installation).
- */
- EXTRACTING,
-
- /**
* Configuring server.
*/
CONFIGURING_SERVER,
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/Installer.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/Installer.java
index 41cf6df..94796da 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/Installer.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/Installer.java
@@ -827,13 +827,6 @@
protected void configureServer() throws ApplicationException
{
notifyListeners(getFormattedWithPoints(INFO_PROGRESS_CONFIGURING.get()));
-
- if (Utils.isWebStart())
- {
- String installDir = getUserData().getServerLocation();
- setInstallation(new Installation(installDir, installDir));
- }
-
copyTemplateInstance();
writeOpenDSJavaHome();
writeHostName();
@@ -1870,8 +1863,6 @@
protected void initSummaryMap(Map<ProgressStep, LocalizableMessage> hmSummary, boolean isCli)
{
put(hmSummary, NOT_STARTED, INFO_SUMMARY_INSTALL_NOT_STARTED);
- put(hmSummary, DOWNLOADING, INFO_SUMMARY_DOWNLOADING);
- put(hmSummary, EXTRACTING, INFO_SUMMARY_EXTRACTING);
put(hmSummary, CONFIGURING_SERVER, INFO_SUMMARY_CONFIGURING);
put(hmSummary, CREATING_BASE_ENTRY, INFO_SUMMARY_CREATING_BASE_ENTRY);
put(hmSummary, IMPORTING_LDIF, INFO_SUMMARY_IMPORTING_LDIF);
@@ -2681,16 +2672,7 @@
serverProperties.put(ADSContext.ServerProperty.JMX_PORT, "1689");
serverProperties.put(ADSContext.ServerProperty.JMX_ENABLED, "false");
- String path;
- if (isWebStart())
- {
- path = userData.getServerLocation();
- }
- else
- {
- path = getInstallPathFromClasspath();
- }
- serverProperties.put(ADSContext.ServerProperty.INSTANCE_PATH, path);
+ serverProperties.put(ADSContext.ServerProperty.INSTANCE_PATH, getInstallPathFromClasspath());
String serverID = serverProperties.get(ADSContext.ServerProperty.HOST_NAME) + ":" + userData.getServerPort();
@@ -2723,91 +2705,6 @@
List<LocalizableMessage> errorMsgs = new ArrayList<>();
LocalizableMessage confirmationMsg = null;
- if (isWebStart())
- {
- // Check the server location
- String serverLocation = qs.getFieldStringValue(FieldName.SERVER_LOCATION);
-
- if (serverLocation == null || "".equals(serverLocation.trim()))
- {
- errorMsgs.add(INFO_EMPTY_SERVER_LOCATION.get());
- qs.displayFieldInvalid(FieldName.SERVER_LOCATION, true);
- }
- else if (!parentDirectoryExists(serverLocation))
- {
- String existingParentDirectory = null;
- File f = new File(serverLocation);
- while (existingParentDirectory == null && f != null)
- {
- f = f.getParentFile();
- if (f != null && f.exists())
- {
- if (f.isDirectory())
- {
- existingParentDirectory = f.getAbsolutePath();
- }
- else
- {
- // The parent path is a file!
- f = null;
- }
- }
- }
- if (existingParentDirectory == null)
- {
- errorMsgs.add(INFO_PARENT_DIRECTORY_COULD_NOT_BE_FOUND.get(serverLocation));
- qs.displayFieldInvalid(FieldName.SERVER_LOCATION, true);
- }
- else if (!canWrite(existingParentDirectory))
- {
- errorMsgs.add(INFO_DIRECTORY_NOT_WRITABLE.get(existingParentDirectory));
- qs.displayFieldInvalid(FieldName.SERVER_LOCATION, true);
- }
- else if (!hasEnoughSpace(existingParentDirectory, getRequiredInstallSpace()))
- {
- long requiredInMb = getRequiredInstallSpace() / (1024 * 1024);
- errorMsgs.add(INFO_NOT_ENOUGH_DISK_SPACE.get(existingParentDirectory, requiredInMb));
- qs.displayFieldInvalid(FieldName.SERVER_LOCATION, true);
- }
- else
- {
- confirmationMsg = INFO_PARENT_DIRECTORY_DOES_NOT_EXIST_CONFIRMATION.get(serverLocation);
- getUserData().setServerLocation(serverLocation);
- }
- }
- else if (fileExists(serverLocation))
- {
- errorMsgs.add(INFO_FILE_EXISTS.get(serverLocation));
- qs.displayFieldInvalid(FieldName.SERVER_LOCATION, true);
- }
- else if (directoryExistsAndIsNotEmpty(serverLocation))
- {
- errorMsgs.add(INFO_DIRECTORY_EXISTS_NOT_EMPTY.get(serverLocation));
- qs.displayFieldInvalid(FieldName.SERVER_LOCATION, true);
- }
- else if (!canWrite(serverLocation))
- {
- errorMsgs.add(INFO_DIRECTORY_NOT_WRITABLE.get(serverLocation));
- qs.displayFieldInvalid(FieldName.SERVER_LOCATION, true);
- }
- else if (!hasEnoughSpace(serverLocation, getRequiredInstallSpace()))
- {
- long requiredInMb = getRequiredInstallSpace() / (1024 * 1024);
- errorMsgs.add(INFO_NOT_ENOUGH_DISK_SPACE.get(serverLocation, requiredInMb));
- qs.displayFieldInvalid(FieldName.SERVER_LOCATION, true);
- }
- else if (OperatingSystem.isWindows() && serverLocation.contains("%"))
- {
- errorMsgs.add(INFO_INVALID_CHAR_IN_PATH.get("%"));
- qs.displayFieldInvalid(FieldName.SERVER_LOCATION, true);
- }
- else
- {
- getUserData().setServerLocation(serverLocation);
- qs.displayFieldInvalid(FieldName.SERVER_LOCATION, false);
- }
- }
-
// Check the host is not empty.
// TODO: check that the host name is valid...
String hostName = qs.getFieldStringValue(FieldName.HOST_NAME);
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/package-info.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/package-info.java
index 14396ce..adc180a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/package-info.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/package-info.java
@@ -22,12 +22,12 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2015 ForgeRock AS.
*/
/**
- * Defines the classes that are you used by both the off-line and the web start
- * installer. This includes in particular shared classes used to represent user
- * provided data, specific exceptions and the abstract Installer application
- * which contains the code shared by both installer applications.
+ * Defines the classes that are you used by the installer.
+ * This includes in particular classes used to represent user
+ * provided data, specific exceptions and the abstract Installer application.
*/
package org.opends.quicksetup.installer;
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/InstallReviewPanel.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/InstallReviewPanel.java
index 3fe28e2..968ea43 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/InstallReviewPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/InstallReviewPanel.java
@@ -82,8 +82,6 @@
private static final long serialVersionUID = -7356174829193265699L;
- private final boolean displayServerLocation;
-
private final HashMap<FieldName, JLabel> hmLabels = new HashMap<>();
private final HashMap<FieldName, JTextComponent> hmFields = new HashMap<>();
private JPanel bottomComponent;
@@ -110,7 +108,6 @@
public InstallReviewPanel(GuiApplication application)
{
super(application);
- this.displayServerLocation = isWebStart();
populateLabelAndFieldsMap();
}
@@ -118,10 +115,6 @@
@Override
public void beginDisplay(UserData userData)
{
- if (displayServerLocation)
- {
- setFieldValue(FieldName.SERVER_LOCATION, userData.getServerLocation());
- }
setFieldValue(FieldName.HOST_NAME, userData.getHostName());
setFieldValue(FieldName.SERVER_PORT, Integer.toString(userData.getServerPort()));
setFieldValue(FieldName.ADMIN_CONNECTOR_PORT, Integer.toString(userData.getAdminConnectorPort()));
@@ -278,15 +271,6 @@
{
final HashMap<FieldName, LabelFieldDescriptor> hm = new HashMap<>();
- if (displayServerLocation)
- {
- hm.put(FieldName.SERVER_LOCATION, new LabelFieldDescriptor(
- INFO_SERVER_LOCATION_LABEL.get(),
- INFO_SERVER_LOCATION_RELATIVE_TOOLTIP.get(),
- LabelFieldDescriptor.FieldType.READ_ONLY,
- LabelFieldDescriptor.LabelType.PRIMARY, 0));
- }
-
hm.put(FieldName.HOST_NAME, new LabelFieldDescriptor(
INFO_HOST_NAME_LABEL.get(),
INFO_HOST_NAME_TOOLTIP.get(),
@@ -506,11 +490,6 @@
final GridBagConstraints gbc = new GridBagConstraints();
final List<FieldName> fieldNames = new LinkedList<>();
- if (displayServerLocation)
- {
- fieldNames.add(FieldName.SERVER_LOCATION);
- }
-
fieldNames.addAll(Arrays.asList(
new FieldName[] {
FieldName.HOST_NAME, FieldName.SERVER_PORT,
@@ -780,13 +759,13 @@
if (linesToAdd.size() == 1)
{
- final String arg0 = getJavaPropertiesFilePath(userData);
+ final String arg0 = getJavaPropertiesFilePath();
final String arg1 = linesToAdd.get(0);
sb.append(formatter.getFormattedProgress(INFO_EDIT_JAVA_PROPERTIES_LINE.get(arg0, arg1)));
}
else if (linesToAdd.size() > 1)
{
- final String arg0 = getJavaPropertiesFilePath(userData);
+ final String arg0 = getJavaPropertiesFilePath();
final String arg1 = joinAsString(Constants.LINE_SEPARATOR, linesToAdd);
sb.append(formatter.getFormattedProgress(INFO_EDIT_JAVA_PROPERTIES_LINES.get(arg0, arg1)));
}
@@ -799,19 +778,9 @@
return scriptName + ".java-args";
}
- private String getJavaPropertiesFilePath(UserData userData)
+ private String getJavaPropertiesFilePath()
{
- String path;
- if (isWebStart())
- {
- path = userData.getServerLocation();
- }
- else
- {
- path = Utils.getInstallPathFromClasspath();
- path = Utils.getInstancePathFromInstallPath(path);
- }
-
+ final String path = Utils.getInstancePathFromInstallPath(Utils.getInstallPathFromClasspath());
return getPath(getPath(path, Installation.CONFIG_PATH_RELATIVE), Installation.DEFAULT_JAVA_PROPERTIES_FILE);
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/JavaArgumentsDialog.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/JavaArgumentsDialog.java
index 2f4c09f..432e209 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/JavaArgumentsDialog.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/JavaArgumentsDialog.java
@@ -94,8 +94,6 @@
private boolean isCheckingVisible;
- private static boolean userAgreedWithWebStart;
-
/**
* Constructor of the JavaArgumentsDialog.
* @param parent the parent frame for this dialog.
@@ -585,11 +583,8 @@
}
else
{
- if (displayWebStartWarningIfRequired())
- {
- isCanceled = false;
- dispose();
- }
+ isCanceled = false;
+ dispose();
}
}
}
@@ -749,24 +744,21 @@
checkOptions(options, errorMsgs, new JLabel[]{l}, errorMsg);
}
- private void checkOptions(String options, Collection<LocalizableMessage> errorMsgs,
- JLabel[] ls, LocalizableMessage errorMsg)
+ private void checkOptions(
+ String options, Collection<LocalizableMessage> errorMsgs, JLabel[] ls, LocalizableMessage errorMsg)
{
- if (!Utils.isWebStart())
+ String javaHome = System.getProperty("java.home");
+ if (javaHome == null || javaHome.length() == 0)
{
- String javaHome = System.getProperty("java.home");
- if (javaHome == null || javaHome.length() == 0)
+ javaHome = System.getenv(SetupUtils.OPENDJ_JAVA_HOME);
+ }
+ if (!Utils.supportsOption(options, javaHome, INSTALL_PATH))
+ {
+ for (JLabel l : ls)
{
- javaHome = System.getenv(SetupUtils.OPENDJ_JAVA_HOME);
+ setValidLater(l, false);
}
- if (!Utils.supportsOption(options, javaHome, INSTALL_PATH))
- {
- for (JLabel l : ls)
- {
- setValidLater(l, false);
- }
- errorMsgs.add(errorMsg);
- }
+ errorMsgs.add(errorMsg);
}
}
@@ -909,23 +901,4 @@
ERR_GENERIC_JAVA_ARGUMENT.get(sb));
}
}
-
- private boolean displayWebStartWarningIfRequired()
- {
- if (Utils.isWebStart() && !userAgreedWithWebStart)
- {
- JavaArguments args = getJavaArguments();
- if (!args.equals(javaArguments) &&
- (args.getInitialMemory() != -1 ||
- args.getMaxMemory() != -1 ||
- args.getAdditionalArguments().length > 0))
- {
- userAgreedWithWebStart = displayConfirmationDialog(
- INFO_JAVA_ARGUMENTS_CANNOT_BE_CHECKED_IN_WEBSTART.get(),
- INFO_CONFIRMATION_TITLE.get());
- return userAgreedWithWebStart;
- }
- }
- return true;
- }
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/ServerSettingsPanel.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/ServerSettingsPanel.java
index fc01db2..94bb94c 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/ServerSettingsPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/ServerSettingsPanel.java
@@ -71,7 +71,6 @@
private JButton secureAccessButton;
private JButton browseButton;
- private boolean displayServerLocation;
private boolean canUpdateSecurity;
private SecurityOptions securityOptions;
@@ -97,7 +96,6 @@
{
super(application);
this.defaultUserData = application.getUserData();
- this.displayServerLocation = isWebStart();
canUpdateSecurity = CertificateManager.mayUseCertificateManager();
securityOptions = defaultUserData.getSecurityOptions();
populateLabelAndFieldMaps();
@@ -182,51 +180,8 @@
FieldName.DIRECTORY_MANAGER_PWD_CONFIRM
};
- JPanel auxPanel;
- // Add the server location widgets
- if (displayServerLocation)
- {
- gbc.gridwidth = GridBagConstraints.RELATIVE;
- gbc.weightx = 0.0;
- gbc.insets.top = 0;
- gbc.insets.left = 0;
- gbc.anchor = GridBagConstraints.NORTHWEST;
- panel.add(lServerLocation, gbc);
- gbc.anchor = GridBagConstraints.WEST;
- auxPanel = new JPanel(new GridBagLayout());
- auxPanel.setOpaque(false);
- gbc.weightx = 1.0;
- gbc.fill = GridBagConstraints.HORIZONTAL;
- gbc.insets.top = 0;
- gbc.insets.left = UIFactory.LEFT_INSET_PRIMARY_FIELD;
- gbc.gridwidth = GridBagConstraints.REMAINDER;
- panel.add(auxPanel, gbc);
-
- gbc.gridwidth = 3;
- gbc.insets = UIFactory.getEmptyInsets();
- gbc.weightx = 0.7;
- auxPanel.add(tfServerLocationParent, gbc);
-
- gbc.gridwidth = GridBagConstraints.RELATIVE;
- gbc.weightx = 0.0;
- gbc.insets.left = UIFactory.LEFT_INSET_SECONDARY_FIELD;
- auxPanel.add(UIFactory.makeJLabel(UIFactory.IconType.NO_ICON,
- LocalizableMessage.raw(File.separator), UIFactory.TextStyle.TEXTFIELD), gbc);
-
- gbc.gridwidth = GridBagConstraints.REMAINDER;
- gbc.weightx = 0.3;
- auxPanel.add(tfServerLocationRelativePath, gbc);
-
- gbc.gridwidth = 3;
- gbc.anchor = GridBagConstraints.NORTHEAST;
- gbc.insets.top = UIFactory.TOP_INSET_BROWSE;
- gbc.weightx = 0.0;
- gbc.fill = GridBagConstraints.NONE;
- auxPanel.add(getBrowseButton(), gbc);
- }
-
- // Add the other widgets
+ // Add widgets
for (FieldName fieldName : fieldNames) {
gbc.gridwidth = GridBagConstraints.RELATIVE;
gbc.weightx = 0.0;
@@ -249,7 +204,7 @@
}
panel.add(getLabel(fieldName), gbc);
- auxPanel = new JPanel(new GridBagLayout());
+ final JPanel auxPanel = new JPanel(new GridBagLayout());
auxPanel.setOpaque(false);
gbc.weightx = 1.0;
gbc.fill = GridBagConstraints.HORIZONTAL;
@@ -332,14 +287,7 @@
/** {@inheritDoc} */
protected LocalizableMessage getInstructions()
{
- if (Utils.isWebStart())
- {
- return INFO_SERVER_SETTINGS_PANEL_INSTRUCTIONS_WEBSTART.get();
- }
- else
- {
- return INFO_SERVER_SETTINGS_PANEL_INSTRUCTIONS.get();
- }
+ return INFO_SERVER_SETTINGS_PANEL_INSTRUCTIONS.get();
}
/** {@inheritDoc} */
@@ -629,14 +577,7 @@
}
getLDAPSecureAccessButton().addFocusListener(l);
getBrowseButton().addFocusListener(l);
- if (Utils.isWebStart())
- {
- lastFocusComponent = tfServerLocationRelativePath;
- }
- else
- {
- lastFocusComponent = getField(FieldName.DIRECTORY_MANAGER_PWD);
- }
+ lastFocusComponent = getField(FieldName.DIRECTORY_MANAGER_PWD);
}
/**
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/webstart/WebStartInstaller.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/webstart/WebStartInstaller.java
deleted file mode 100644
index b1776ef..0000000
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/webstart/WebStartInstaller.java
+++ /dev/null
@@ -1,621 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
- * or http://forgerock.org/license/CDDLv1.0.html.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at legal-notices/CDDLv1_0.txt.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information:
- * Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- * Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2011-2015 ForgeRock AS
- */
-package org.opends.quicksetup.installer.webstart;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.PrintStream;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.forgerock.i18n.LocalizableMessage;
-import org.forgerock.i18n.slf4j.LocalizedLogger;
-
-import org.opends.quicksetup.ApplicationException;
-import org.opends.quicksetup.LicenseFile;
-import org.opends.quicksetup.ReturnCode;
-import org.opends.quicksetup.ProgressStep;
-import org.opends.quicksetup.Installation;
-import org.opends.quicksetup.installer.Installer;
-import org.opends.quicksetup.installer.InstallProgressStep;
-import org.opends.quicksetup.util.Utils;
-import org.opends.quicksetup.util.ZipExtractor;
-import org.opends.quicksetup.util.ServerController;
-import org.opends.quicksetup.util.FileManager;
-import org.opends.server.util.SetupUtils;
-
-import static org.opends.messages.QuickSetupMessages.*;
-import static com.forgerock.opendj.util.OperatingSystem.isWindows;
-import static com.forgerock.opendj.cli.Utils.getThrowableMsg;
-
-/**
- * This is an implementation of the Installer class that is used to install
- * the Directory Server using Web Start.
- *
- * It just takes a UserData object and based on that installs OpenDS.
- *
- *
- * This object has as parameter a WebStartDownloader object that is downloading
- * some jar files. Until the WebStartDownloader has not finished downloading
- * the jar files will be on the ProgressStep.DOWNLOADING step because
- * we require all the jar files to be downloaded in order to install and
- * configure the Directory Server.
- *
- * Based on the Java properties set through the QuickSetup.jnlp file this
- * class will retrieve the zip file containing the install, unzip it and extract
- * it in the path specified by the user and that is contained in the
- * UserData object.
- *
- *
- * When there is an update during the installation it will notify the
- * ProgressUpdateListener objects that have been added to it. The notification
- * will send a ProgressUpdateEvent.
- *
- * This class is supposed to be fully independent of the graphical layout.
- */
-public class WebStartInstaller extends Installer {
- private final Map<ProgressStep, Integer> hmRatio = new HashMap<>();
- private final Map<ProgressStep, LocalizableMessage> hmSummary = new HashMap<>();
-
- private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
-
- /**
- * WebStartInstaller constructor.
- */
- public WebStartInstaller()
- {
- initLoader();
- setCurrentProgressStep(InstallProgressStep.NOT_STARTED);
- }
-
- /** Actually performs the install in this thread. The thread is blocked. */
- @Override
- public void run()
- {
- initMaps();
- PrintStream origErr = System.err;
- PrintStream origOut = System.out;
- boolean downloadedBits = false;
- try
- {
- System.setErr(getApplicationErrorStream());
- System.setOut(getApplicationOutputStream());
-
- setCurrentProgressStep(InstallProgressStep.DOWNLOADING);
-
- notifyListenersOfLog();
- notifyListeners(getLineBreak());
-
- checkAbort();
-
- InputStream in =
- getZipInputStream(getRatio(InstallProgressStep.EXTRACTING));
-
- setCurrentProgressStep(InstallProgressStep.EXTRACTING);
- if (isVerbose())
- {
- notifyListeners(getTaskSeparator());
- }
-
- checkAbort();
-
- createParentDirectoryIfRequired();
- extractZipFiles(in, getRatio(InstallProgressStep.EXTRACTING),
- getRatio(InstallProgressStep.CONFIGURING_SERVER));
- downloadedBits = true;
-
- try
- {
- in.close();
- }
- catch (Throwable t)
- {
- logger.info(LocalizableMessage.raw("Error closing zip input stream: "+t, t));
- }
-
- checkAbort();
-
- setCurrentProgressStep(InstallProgressStep.CONFIGURING_SERVER);
- if (isVerbose())
- {
- notifyListeners(getTaskSeparator());
- }
- configureServer();
-
- checkAbort();
-
- // create license accepted file
- LicenseFile.createFileLicenseApproved(getInstallationPath());
-
- createData();
-
- checkAbort();
-
- if (isWindows() && getUserData().getEnableWindowsService())
- {
- if (isVerbose())
- {
- notifyListeners(getTaskSeparator());
- }
- setCurrentProgressStep(InstallProgressStep.ENABLING_WINDOWS_SERVICE);
- enableWindowsService();
- checkAbort();
- }
-
- if (mustStart())
- {
- if (isVerbose())
- {
- notifyListeners(getTaskSeparator());
- }
- setCurrentProgressStep(InstallProgressStep.STARTING_SERVER);
- PointAdder pointAdder = new PointAdder();
- if (!isVerbose())
- {
- notifyListeners(getFormattedProgress(
- INFO_PROGRESS_STARTING_NON_VERBOSE.get()));
- pointAdder.start();
- }
- try
- {
- new ServerController(this).startServer(!isStartVerbose());
- }
- finally
- {
- if (!isVerbose())
- {
- pointAdder.stop();
- }
- }
- if (!isVerbose())
- {
- notifyListeners(getFormattedDoneWithLineBreak());
- }
- else
- {
- notifyListeners(getLineBreak());
- }
- checkAbort();
- }
-
- if (mustCreateAds())
- {
- if (isVerbose())
- {
- notifyListeners(getTaskSeparator());
- }
- setCurrentProgressStep(InstallProgressStep.CONFIGURING_ADS);
- updateADS();
- checkAbort();
- }
-
- if (mustConfigureReplication())
- {
- if (isVerbose())
- {
- notifyListeners(getTaskSeparator());
- }
- setCurrentProgressStep(InstallProgressStep.CONFIGURING_REPLICATION);
- createReplicatedBackendsIfRequired();
- configureReplication();
- checkAbort();
- }
-
- if (mustInitializeSuffixes())
- {
- if (isVerbose())
- {
- notifyListeners(getTaskSeparator());
- }
- setCurrentProgressStep(
- InstallProgressStep.INITIALIZE_REPLICATED_SUFFIXES);
- initializeSuffixes();
- checkAbort();
- }
-
- if (mustStop())
- {
- if (isVerbose())
- {
- notifyListeners(getTaskSeparator());
- }
- setCurrentProgressStep(InstallProgressStep.STOPPING_SERVER);
- if (!isVerbose())
- {
- notifyListeners(getFormattedWithPoints(
- INFO_PROGRESS_STOPPING_NON_VERBOSE.get()));
- }
- new ServerController(this).stopServer(!isVerbose());
- if (!isVerbose())
- {
- notifyListeners(getFormattedDoneWithLineBreak());
- }
- }
-
- checkAbort();
- updateSummaryWithServerState(hmSummary, false);
- setCurrentProgressStep(InstallProgressStep.FINISHED_SUCCESSFULLY);
- notifyListeners(null);
-
- } catch (ApplicationException ex)
- {
- if (ReturnCode.CANCELED.equals(ex.getType())) {
- uninstall(downloadedBits);
-
- setCurrentProgressStep(InstallProgressStep.FINISHED_CANCELED);
- notifyListeners(null);
- } else {
- // Stop the server if necessary
- Installation installation = getInstallation();
- if (installation.getStatus().isServerRunning()) {
- try {
- if (!isVerbose())
- {
- notifyListeners(getFormattedWithPoints(
- INFO_PROGRESS_STOPPING_NON_VERBOSE.get()));
- }
- new ServerController(installation).stopServer(!isVerbose());
- if (!isVerbose())
- {
- notifyListeners(getFormattedDoneWithLineBreak());
- }
- } catch (Throwable t) {
- logger.info(LocalizableMessage.raw("error stopping server", t));
- }
- }
- notifyListeners(getLineBreak());
- updateSummaryWithServerState(hmSummary, false);
- setCurrentProgressStep(InstallProgressStep.FINISHED_WITH_ERROR);
- LocalizableMessage html = getFormattedError(ex, true);
- notifyListeners(html);
- logger.error(LocalizableMessage.raw("Error installing.", ex));
- notifyListeners(getLineBreak());
- notifyListenersOfLogAfterError();
- }
- }
- catch (Throwable t)
- {
- // Stop the server if necessary
- Installation installation = getInstallation();
- if (installation.getStatus().isServerRunning()) {
- try {
- new ServerController(installation).stopServer(true);
- } catch (Throwable t2) {
- logger.info(LocalizableMessage.raw("error stopping server", t2));
- }
- }
- notifyListeners(getLineBreak());
- updateSummaryWithServerState(hmSummary, false);
- setCurrentProgressStep(InstallProgressStep.FINISHED_WITH_ERROR);
- ApplicationException ex = new ApplicationException(
- ReturnCode.BUG,
- getThrowableMsg(INFO_BUG_MSG.get(), t), t);
- LocalizableMessage msg = getFormattedError(ex, true);
- notifyListeners(msg);
- logger.error(LocalizableMessage.raw("Error installing.", t));
- notifyListeners(getLineBreak());
- notifyListenersOfLogAfterError();
- }
- System.setErr(origErr);
- System.setOut(origOut);
- }
-
- /** {@inheritDoc} */
- @Override
- public Integer getRatio(ProgressStep status)
- {
- return hmRatio.get(status);
- }
-
- /** {@inheritDoc} */
- @Override
- public LocalizableMessage getSummary(ProgressStep status)
- {
- LocalizableMessage summary;
- if (InstallProgressStep.DOWNLOADING.equals(status)) {
- summary = loader.getSummary();
- } else {
- summary = hmSummary.get(status);
- }
- return summary;
- }
-
- /**
- * Initialize the different map used in this class.
- *
- */
- private void initMaps()
- {
- initSummaryMap(hmSummary, false);
-
- /*
- * hmTime contains the relative time that takes for each task to be
- * accomplished. For instance if downloading takes twice the time of
- * extracting, the value for downloading will be the double of the value for
- * extracting.
- */
- Map<ProgressStep, Integer> hmTime = new HashMap<>();
- hmTime.put(InstallProgressStep.DOWNLOADING, 30);
- hmTime.put(InstallProgressStep.EXTRACTING, 15);
- hmTime.put(InstallProgressStep.CONFIGURING_SERVER, 5);
- hmTime.put(InstallProgressStep.CREATING_BASE_ENTRY, 10);
- hmTime.put(InstallProgressStep.IMPORTING_LDIF, 20);
- hmTime.put(InstallProgressStep.IMPORTING_AUTOMATICALLY_GENERATED, 20);
- hmTime.put(InstallProgressStep.CONFIGURING_REPLICATION, 10);
- hmTime.put(InstallProgressStep.ENABLING_WINDOWS_SERVICE, 5);
- hmTime.put(InstallProgressStep.STARTING_SERVER, 10);
- hmTime.put(InstallProgressStep.STOPPING_SERVER, 5);
- hmTime.put(InstallProgressStep.CONFIGURING_ADS, 5);
- hmTime.put(InstallProgressStep.INITIALIZE_REPLICATED_SUFFIXES, 25);
-
- int totalTime = 0;
- List<InstallProgressStep> steps = new ArrayList<>();
- totalTime += hmTime.get(InstallProgressStep.DOWNLOADING);
- steps.add(InstallProgressStep.DOWNLOADING);
- totalTime += hmTime.get(InstallProgressStep.EXTRACTING);
- steps.add(InstallProgressStep.EXTRACTING);
- totalTime += hmTime.get(InstallProgressStep.CONFIGURING_SERVER);
- steps.add(InstallProgressStep.CONFIGURING_SERVER);
-
- if (createNotReplicatedSuffix())
- {
- switch (getUserData().getNewSuffixOptions().getType())
- {
- case CREATE_BASE_ENTRY:
- steps.add(InstallProgressStep.CREATING_BASE_ENTRY);
- totalTime += hmTime.get(InstallProgressStep.CREATING_BASE_ENTRY);
- break;
- case IMPORT_FROM_LDIF_FILE:
- steps.add(InstallProgressStep.IMPORTING_LDIF);
- totalTime += hmTime.get(InstallProgressStep.IMPORTING_LDIF);
- break;
- case IMPORT_AUTOMATICALLY_GENERATED_DATA:
- steps.add(InstallProgressStep.IMPORTING_AUTOMATICALLY_GENERATED);
- totalTime +=hmTime.get(
- InstallProgressStep.IMPORTING_AUTOMATICALLY_GENERATED);
- break;
- }
- }
-
- if (isWindows() && getUserData().getEnableWindowsService())
- {
- totalTime += hmTime.get(InstallProgressStep.ENABLING_WINDOWS_SERVICE);
- steps.add(InstallProgressStep.ENABLING_WINDOWS_SERVICE);
- }
- if (mustStart())
- {
- totalTime += hmTime.get(InstallProgressStep.STARTING_SERVER);
- steps.add(InstallProgressStep.STARTING_SERVER);
- }
-
- if (mustCreateAds())
- {
- totalTime += hmTime.get(InstallProgressStep.CONFIGURING_ADS);
- steps.add(InstallProgressStep.CONFIGURING_ADS);
- }
-
- if (mustConfigureReplication())
- {
- steps.add(InstallProgressStep.CONFIGURING_REPLICATION);
- totalTime += hmTime.get(InstallProgressStep.CONFIGURING_REPLICATION);
- }
-
- if (mustInitializeSuffixes())
- {
- totalTime += hmTime.get(
- InstallProgressStep.INITIALIZE_REPLICATED_SUFFIXES);
- steps.add(InstallProgressStep.INITIALIZE_REPLICATED_SUFFIXES);
- }
-
- if (mustStop())
- {
- totalTime += hmTime.get(InstallProgressStep.STOPPING_SERVER);
- steps.add(InstallProgressStep.STOPPING_SERVER);
- }
-
- int cumulatedTime = 0;
- for (InstallProgressStep s : steps)
- {
- Integer statusTime = hmTime.get(s);
- hmRatio.put(s, (100 * cumulatedTime) / totalTime);
- if (statusTime != null)
- {
- cumulatedTime += statusTime;
- }
- }
-
- hmRatio.put(InstallProgressStep.FINISHED_SUCCESSFULLY, 100);
- hmRatio.put(InstallProgressStep.FINISHED_CANCELED, 100);
- hmRatio.put(InstallProgressStep.FINISHED_WITH_ERROR, 100);
- }
-
- private InputStream getZipInputStream(Integer maxRatio)
- throws ApplicationException {
- notifyListeners(getFormattedWithPoints(INFO_PROGRESS_DOWNLOADING.get()));
-
- waitForLoader(maxRatio);
-
- String zipName = getZipFileName();
- InputStream in =
- Installer.class.getClassLoader().getResourceAsStream(zipName);
-
- if (in == null)
- {
- throw new ApplicationException(
- ReturnCode.DOWNLOAD_ERROR,
- INFO_ERROR_ZIPINPUTSTREAMNULL.get(zipName), null);
- }
-
- notifyListeners(getFormattedDoneWithLineBreak());
- return in;
- }
-
- /**
- * Creates the parent Directory for the server location if it does not exist.
- * @throws ApplicationException if something goes wrong.
- */
- private void createParentDirectoryIfRequired() throws ApplicationException
- {
- String serverLocation = getUserData().getServerLocation();
- if (!Utils.parentDirectoryExists(serverLocation))
- {
- File f = new File(serverLocation);
- String parent = f.getParent();
- try
- {
- if (!Utils.createDirectory(parent))
- {
- throw new ApplicationException(
- ReturnCode.FILE_SYSTEM_ACCESS_ERROR,
- INFO_ERROR_COULD_NOT_CREATE_PARENT_DIR.get(parent), null);
- }
- }
- catch (IOException ioe)
- {
- throw new ApplicationException(
- ReturnCode.FILE_SYSTEM_ACCESS_ERROR,
- INFO_ERROR_COULD_NOT_CREATE_PARENT_DIR.get(parent),
- ioe);
- }
- }
- }
-
- /**
- * This method extracts the zip file.
- * @param is the input stream with the contents of the zip file.
- * @param minRatio the value of the ratio in the install that corresponds to
- * the moment where we start extracting the zip files. Used to update
- * properly the install progress ratio.
- * @param maxRatio the value of the ratio in the installation that corresponds
- * to the moment where we finished extracting the last zip file. Used to
- * update properly the install progress ratio.
- * @throws ApplicationException if an error occurs.
- */
- private void extractZipFiles(InputStream is, int minRatio, int maxRatio)
- throws ApplicationException {
- ZipExtractor extractor =
- new ZipExtractor(is, minRatio, maxRatio,
- Utils.getNumberZipEntries(),
- getZipFileName(),
- this);
- extractor.extract(getUserData().getServerLocation());
- }
-
- /**
- * 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.
- */
- private String getZipFileName()
- {
- // Passed as a java option in the JNLP file
- return System.getProperty(SetupUtils.ZIP_FILE_NAME);
- }
-
- /**
- * Uninstall what has already been installed.
- * @param downloadedBits whether the bits were downloaded or not.
- */
- private void uninstall(boolean downloadedBits) {
- if (downloadedBits)
- {
- notifyListeners(getTaskSeparator());
- if (!isVerbose())
- {
- notifyListeners(getFormattedWithPoints(INFO_PROGRESS_CANCELING.get()));
- }
- else
- {
- notifyListeners(
- getFormattedProgressWithLineBreak(INFO_SUMMARY_CANCELING.get()));
- }
- Installation installation = getInstallation();
- FileManager fm = new FileManager(this);
-
- // Stop the server if necessary
- if (installation.getStatus().isServerRunning()) {
- try {
- new ServerController(installation).stopServer(true);
- } catch (ApplicationException e) {
- logger.info(LocalizableMessage.raw("error stopping server", e));
- }
- }
-
- uninstallServices();
-
- try {
- fm.deleteRecursively(installation.getRootDirectory(), null,
- FileManager.DeletionPolicy.DELETE_ON_EXIT_IF_UNSUCCESSFUL);
- } catch (ApplicationException e) {
- logger.info(LocalizableMessage.raw("error deleting files", e));
- }
- }
- else
- {
- if (!isVerbose())
- {
- notifyListeners(getFormattedWithPoints(INFO_PROGRESS_CANCELING.get()));
- }
- else
- {
- notifyListeners(
- getFormattedProgressWithLineBreak(INFO_SUMMARY_CANCELING.get()));
- }
- File serverRoot = new File(getUserData().getServerLocation());
- if (serverRoot.exists())
- {
- FileManager fm = new FileManager(this);
- try {
- fm.deleteRecursively(serverRoot, null,
- FileManager.DeletionPolicy.DELETE_ON_EXIT_IF_UNSUCCESSFUL);
- } catch (ApplicationException e) {
- logger.info(LocalizableMessage.raw("error deleting files", e));
- }
- }
- }
- if (!isVerbose())
- {
- notifyListeners(getFormattedDoneWithLineBreak());
- }
- }
-
- /** {@inheritDoc} */
- @Override
- public String getInstallationPath()
- {
- return getUserData().getServerLocation();
- }
-
- /** {@inheritDoc} */
- @Override
- public String getInstancePath()
- {
- return getUserData().getServerLocation();
- }
-}
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/webstart/package-info.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/webstart/package-info.java
deleted file mode 100644
index e6b05f7..0000000
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/webstart/package-info.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
- * or http://forgerock.org/license/CDDLv1.0.html.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at legal-notices/CDDLv1_0.txt.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information:
- * Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- * Copyright 2008 Sun Microsystems, Inc.
- */
-
-
-/**
- * Defines the specific classes for the webstart installer (the one that can be
- * launched using a JNLP file located in a remote server).
- *
- */
-package org.opends.quicksetup.installer.webstart;
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/FieldName.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/FieldName.java
index ee9fba8..9ef15b7 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/FieldName.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/FieldName.java
@@ -141,11 +141,7 @@
/** The value associated with this is a JavaArguments object. */
SERVER_JAVA_ARGUMENTS,
- /**
- * The value associated with this is a String.
- * The web start installer uses this field to indicate the
- * location to install the server.
- */
+ /** The value associated with this is a String. */
SERVER_LOCATION,
/** The value associated with this is a String. */
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/GuiApplication.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/GuiApplication.java
index f4bdee4..249896a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/GuiApplication.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/GuiApplication.java
@@ -29,13 +29,11 @@
import org.opends.quicksetup.util.UIKeyStore;
import org.opends.quicksetup.Application;
-import org.opends.quicksetup.ApplicationException;
import org.opends.quicksetup.ButtonName;
import org.opends.quicksetup.UserData;
import org.opends.quicksetup.UserDataCertificateException;
import org.opends.quicksetup.UserDataException;
import org.opends.quicksetup.WizardStep;
-import org.opends.quicksetup.webstart.WebStartDownloader;
import org.forgerock.i18n.LocalizableMessage;
import static org.opends.messages.QuickSetupMessages.*;
@@ -59,9 +57,6 @@
/** The currently displayed wizard step. */
private WizardStep displayedStep;
- /** Downloads .jar files for webstart application. */
- protected WebStartDownloader loader;
-
/** The QuickSetupDialog in control. */
private QuickSetupDialog qs;
@@ -466,75 +461,6 @@
}
/**
- * Begins downloading webstart jars in another thread
- * for WebStart applications only.
- */
- protected void initLoader() {
- loader = new WebStartDownloader();
- loader.start(false);
- }
-
- /**
- * Waits for the loader to be finished. Every time we have an update in the
- * percentage that is downloaded we notify the listeners of this.
- *
- * @param maxRatio is the integer value that tells us which is the max ratio
- * that corresponds to the download. It is used to calculate how the global
- * installation ratio changes when the download ratio increases. For instance
- * if we suppose that the download takes 25 % of the total installation
- * process, then maxRatio will be 25. When the download is complete this
- * method will send a notification to the ProgressUpdateListeners with a ratio
- * of 25 %.
- * @throws org.opends.quicksetup.ApplicationException if something goes wrong
- *
- */
- protected void waitForLoader(Integer maxRatio) throws ApplicationException {
- int lastPercentage = -1;
- WebStartDownloader.Status lastStatus =
- WebStartDownloader.Status.DOWNLOADING;
- while (!loader.isFinished() && loader.getException() == null)
- {
- checkAbort();
- // Pool until is over
- int perc = loader.getDownloadPercentage();
- WebStartDownloader.Status downloadStatus = loader.getStatus();
- if (perc != lastPercentage || downloadStatus != lastStatus)
- {
- lastPercentage = perc;
- int ratio = (perc * maxRatio) / 100;
- LocalizableMessage summary;
- switch (downloadStatus)
- {
- case VALIDATING:
- summary = INFO_VALIDATING_RATIO.get(perc, loader.getCurrentValidatingPercentage());
- break;
- case UPGRADING:
- summary = INFO_UPGRADING_RATIO.get(perc, loader.getCurrentValidatingPercentage());
- break;
- default:
- summary = INFO_DOWNLOADING_RATIO.get(perc);
- }
- loader.setSummary(summary);
- notifyListeners(ratio, summary, null);
- }
- checkAbort();
- try
- {
- Thread.sleep(300);
- } catch (Exception ex)
- {
- // do nothing;
- }
- }
- checkAbort();
-
- if (loader.getException() != null)
- {
- throw loader.getException();
- }
- }
-
- /**
* Gets the amount of addition pixels added to the height
* of the tallest panel in order to size the wizard for
* asthetic reasons.
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/QuickSetup.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/QuickSetup.java
index 2c76bbd..ecb1c5a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/QuickSetup.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/QuickSetup.java
@@ -57,18 +57,11 @@
* This class is responsible for doing the following:
* <p>
* <ul>
- * <li>Check whether we are installing or uninstalling and which type of
- * installation we are running.</li>
+ * <li>Check whether we are installing or uninstalling.</li>
* <li>Performs all the checks and validation of the data provided by the user
* during the setup.</li>
* <li>It will launch also the installation once the user clicks on 'Finish' if
* we are installing the product.</li>
- * <li>If we are running a web start installation it will start the background
- * downloading of the jar files that are required to perform the installation
- * (OpenDS.jar, je.jar, etc.). The global idea is to force the user to download
- * just one jar file (quicksetup.jar) to launch the Web Start installer. Until
- * this class is not finished the WebStart Installer will be on the
- * ProgressStep.DOWNLOADING step.</li>
* </ul>
*/
public class QuickSetup implements ButtonActionListener, ProgressUpdateListener
@@ -382,18 +375,9 @@
{
try
{
- final Installation installation;
- if (isWebStart())
- {
- String installDir = application.getUserData().getServerLocation();
- installation = new Installation(installDir, installDir);
- }
- else
- {
- installation = Installation.getLocal();
- }
-
+ final Installation installation = Installation.getLocal();
final ProcessBuilder pb;
+
if (isMacOS())
{
List<String> cmd = new ArrayList<>();
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/QuickSetupStepPanel.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/QuickSetupStepPanel.java
index 88040ea..8ee9fd8 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/QuickSetupStepPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/QuickSetupStepPanel.java
@@ -48,7 +48,6 @@
import org.opends.quicksetup.util.HtmlProgressMessageFormatter;
import org.opends.quicksetup.util.ProgressMessageFormatter;
import org.opends.quicksetup.util.URLWorker;
-import org.opends.quicksetup.util.Utils;
import org.forgerock.i18n.LocalizableMessage;
import static org.opends.messages.QuickSetupMessages.*;
@@ -427,17 +426,6 @@
}
/**
- * Returns <CODE>true</CODE> if this is a WebStart based installer and
- * <CODE>false</CODE> otherwise.
- * @return <CODE>true</CODE> if this is a WebStart based installer and
- * <CODE>false</CODE> otherwise.
- */
- protected boolean isWebStart()
- {
- return Utils.isWebStart();
- }
-
- /**
* Returns the formatter that will be used to display the messages in this
* panel.
* @return the formatter that will be used to display the messages in this
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/Utils.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/Utils.java
index 94633cf..b11bb41 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/Utils.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/Utils.java
@@ -121,9 +121,6 @@
/** The class name that contains the control panel customizations for products. */
private static final String CUSTOMIZATION_CLASS_NAME = "org.opends.server.util.ReleaseDefinition";
- /** The service name required by the JNLP downloader. */
- public static final String JNLP_SERVICE_NAME = "javax.jnlp.DownloadService";
-
/**
* Returns <CODE>true</CODE> if the provided port is free and we can use it,
* <CODE>false</CODE> otherwise.
@@ -780,17 +777,6 @@
}
/**
- * Indicates whether we are in a web start installation or not.
- *
- * @return <CODE>true</CODE> if we are in a web start installation and
- * <CODE>false</CODE> if not.
- */
- public static boolean isWebStart()
- {
- return SetupUtils.isWebStart();
- }
-
- /**
* Returns <CODE>true</CODE> if this is executed from command line and
* <CODE>false</CODE> otherwise.
*
@@ -1294,20 +1280,6 @@
{
throw new IncompatibleVersionException(e.getMessageObject(), e);
}
-
- if (Utils.isWebStart())
- {
- // Check that the JNLP service exists.
- try
- {
- javax.jnlp.ServiceManager.lookup(JNLP_SERVICE_NAME);
- }
- catch (Throwable t)
- {
- throw new IncompatibleVersionException(
- INFO_DOWNLOADING_ERROR_NO_SERVICE_FOUND.get(JNLP_SERVICE_NAME, getSetupFilename()), t);
- }
- }
}
/**
@@ -1433,22 +1405,18 @@
*/
public static <T> T getCustomizedObject(String fieldName, T defaultValue, Class<T> valueClass)
{
- T value = defaultValue;
- if (!isWebStart())
+ try
{
- try
- {
- Class<?> c = Class.forName(Utils.CUSTOMIZATION_CLASS_NAME);
- Object obj = c.newInstance();
+ Class<?> c = Class.forName(Utils.CUSTOMIZATION_CLASS_NAME);
+ Object obj = c.newInstance();
- value = valueClass.cast(c.getField(fieldName).get(obj));
- }
- catch (Exception ex)
- {
- // do nothing
- }
+ return valueClass.cast(c.getField(fieldName).get(obj));
}
- return value;
+ catch (Exception ex)
+ {
+ logger.error(LocalizableMessage.raw(ex.getMessage()), ex);
+ return defaultValue;
+ }
}
/**
@@ -1744,9 +1712,7 @@
/**
* Returns the equivalent setup CLI command-line. Note that this command-line
- * does not cover all the replication part of the GUI install. Note also that
- * to avoid problems in the WebStart setup, all the Strings are hard-coded in
- * the implementation of this method.
+ * does not cover all the replication part of the GUI install.
*
* @param userData
* the user data.
@@ -2053,17 +2019,9 @@
*/
private static String getInstallDir(UserData userData)
{
- if (isWebStart() || installDir == null)
+ if (installDir == null)
{
- File f;
- if (isWebStart())
- {
- f = new File(userData.getServerLocation());
- }
- else
- {
- f = org.opends.quicksetup.Installation.getLocal().getRootDirectory();
- }
+ File f = org.opends.quicksetup.Installation.getLocal().getRootDirectory();
try
{
installDir = f.getCanonicalPath();
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/webstart/WebStartDownloader.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/webstart/WebStartDownloader.java
deleted file mode 100644
index 9cac1b9..0000000
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/webstart/WebStartDownloader.java
+++ /dev/null
@@ -1,441 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
- * or http://forgerock.org/license/CDDLv1.0.html.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at legal-notices/CDDLv1_0.txt.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information:
- * Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- * Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2013-2015 ForgeRock AS.
- */
-package org.opends.quicksetup.webstart;
-
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.forgerock.i18n.LocalizableMessage;
-import org.forgerock.i18n.slf4j.LocalizedLogger;
-
-import javax.jnlp.DownloadService;
-import javax.jnlp.DownloadServiceListener;
-import javax.jnlp.ServiceManager;
-import javax.jnlp.UnavailableServiceException;
-
-import org.opends.quicksetup.ApplicationException;
-import org.opends.quicksetup.Installation;
-import org.opends.quicksetup.ReturnCode;
-import org.opends.quicksetup.util.Utils;
-import org.opends.server.util.SetupUtils;
-
-import static org.opends.messages.QuickSetupMessages.*;
-import static com.forgerock.opendj.util.OperatingSystem.isWindows;
-import static com.forgerock.opendj.cli.Utils.getThrowableMsg;
-
-/**
- * This class is used to download the files that have been marked as lazy
- * in the QuickSetup.jnlp file.
- *
- * The global idea is to force the user to download just one jar file
- * (quicksetup.jar) to display the Web Start installer dialog. Then QuickSetup
- * will call this class and it will download the jar files. Until this class is
- * not finished the WebStartInstaller will be on the
- * ProgressStep.DOWNLOADING step.
- */
-public class WebStartDownloader implements DownloadServiceListener {
- private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
-
- private ApplicationException ex;
- private boolean isFinished;
- private int downloadPercentage;
- private int currentPercMin;
- private int currentPercMax;
- private int currentValidatingPercent;
- private int currentUpgradingPercent;
- private Status status = Status.DOWNLOADING;
- private LocalizableMessage summary;
-
- /**
- * This enumeration contains the different Status on which
- * the downloading process of the jars can be.
- *
- */
- public enum Status
- {
- /**
- * Downloading a jar file.
- */
- DOWNLOADING,
- /**
- * Validating a jar file.
- */
- VALIDATING,
- /**
- * Upgrading a jar file.
- */
- UPGRADING
- }
-
- /**
- * Creates a default instance.
- */
- public WebStartDownloader() {
- this.summary = INFO_DOWNLOADING.get();
- }
-
- /**
- * Starts the downloading of the jar files. If forceDownload is set to
- * <CODE>true</CODE> the files will be re-downloaded even if they already
- * are on cache.
- *
- * This method does not block the thread that calls it.
- *
- * @param forceDownload used to ignore the case and force download.
- */
- public void start(final boolean forceDownload)
- {
- isFinished = false;
- Thread t = new Thread(new Runnable()
- {
- @Override
- public void run()
- {
- try
- {
- startDownload(forceDownload);
- } catch (ApplicationException ex)
- {
- WebStartDownloader.this.ex = ex;
- } catch (MalformedURLException mfe)
- {
- // This is a bug
- ex =
- new ApplicationException(ReturnCode.BUG,
- getThrowableMsg(INFO_BUG_MSG.get(),mfe), mfe);
- } catch (IOException ioe)
- {
- StringBuilder buf = new StringBuilder();
- String[] jars = getJarUrls();
- for (int i = 0; i < jars.length; i++)
- {
- if (i != 0)
- {
- buf.append(",");
- }
- buf.append(jars[i]);
- }
- ex = new ApplicationException(
- ReturnCode.DOWNLOAD_ERROR,
- getThrowableMsg(INFO_DOWNLOADING_ERROR.get(buf), ioe), ioe);
- } catch (Throwable t)
- {
- // This is a bug
- ex = new ApplicationException(ReturnCode.BUG,
- getThrowableMsg(INFO_BUG_MSG.get(), t), t);
- }
- }
- });
- t.start();
- }
-
- /**
- * Gets a summary message of the downloader's current progress.
- * @return String for showing the user progress
- */
- public LocalizableMessage getSummary() {
- return this.summary;
- }
-
- /**
- * Sets a summary message of the downloader's current progress.
- * @param summary String for showing the user progress
- */
- public void setSummary(LocalizableMessage summary) {
- this.summary = summary;
- }
-
- /**
- * Returns <CODE>true</CODE> if the install is finished and
- * <CODE>false</CODE> otherwise.
- * @return <CODE>true</CODE> if the install is finished and
- * <CODE>false</CODE> otherwise.
- */
- public boolean isFinished()
- {
- return isFinished;
- }
-
- /**
- * Returns the Status of the current download process.
- * @return the current status of the download process.
- */
- public Status getStatus()
- {
- return status;
- }
-
- /**
- * Returns the current download percentage.
- * @return the current download percentage.
- */
- public int getDownloadPercentage()
- {
- return downloadPercentage;
- }
-
- /**
- * Returns the completed percentage for the file being currently validated.
- * @return the completed percentage for the file being currently validated.
- */
- public int getCurrentValidatingPercentage()
- {
- return currentValidatingPercent;
- }
-
- /**
- * Returns the completed percentage for the file being currently upgraded.
- * @return the completed percentage for the file being currently upgraded.
- */
- public int getCurrentUpgradingPercentage()
- {
- return currentUpgradingPercent;
- }
-
- /**
- * Starts synchronously the downloading on this thread. The thread calling
- * this method will be blocked. If forceDownload is set to
- * <CODE>true</CODE> the files will be re-downloaded even if they already
- * are on cache.
- * @param forceDownload used to ignore the case and force download.
- * @throws MalformedURLException if there is an error with the URLs that we
- * get from the property SetupUtils.LAZY_JAR_URLS
- * @throws IOException if a network problem occurs.
- * @throws ApplicationException if the download service is not available.
- */
- private void startDownload(boolean forceDownload)
- throws IOException, ApplicationException
- {
- DownloadService ds;
- try
- {
- ds =
- (DownloadService) ServiceManager.lookup(Utils.JNLP_SERVICE_NAME);
- } catch (UnavailableServiceException e)
- {
- logger.error(LocalizableMessage.raw("Could not find service: "+
- Utils.JNLP_SERVICE_NAME, e));
- String setupFile;
- if (isWindows())
- {
- setupFile = Installation.WINDOWS_SETUP_FILE_NAME;
- }
- else
- {
- setupFile = Installation.UNIX_SETUP_FILE_NAME;
- }
- throw new ApplicationException(
- ReturnCode.DOWNLOAD_ERROR,
- getThrowableMsg(INFO_DOWNLOADING_ERROR_NO_SERVICE_FOUND.get(
- Utils.JNLP_SERVICE_NAME, setupFile),
- e), e);
- }
-
- String[] urls = getJarUrls();
- String[] versions = getJarVersions();
-
- /*
- * Calculate the percentages that correspond to each file.
- * TODO ideally this should be done dynamically, but as this is just
- * to provide progress, updating this information from time to time can
- * be enough and does not complexify the build process.
- */
- int[] percentageMax = new int[urls.length];
- int[] ratios = new int[urls.length];
- int totalRatios = 0;
- for (int i=0; i<percentageMax.length; i++)
- {
- int ratio;
- if (urls[i].endsWith("OpenDS.jar"))
- {
- ratio = 23;
- }
- else if (urls[i].endsWith("je.jar"))
- {
- ratio = 11;
- }
- else if (urls[i].endsWith("zipped.jar"))
- {
- ratio = 110;
- }
- else if (urls[i].endsWith("aspectjrt.jar"))
- {
- ratio = 10;
- }
- else
- {
- ratio = 100 / urls.length;
- }
- ratios[i] = ratio;
- totalRatios += ratio;
- }
-
- for (int i=0; i<percentageMax.length; i++)
- {
- int r = 0;
- for (int j=0; j<=i; j++)
- {
- r += ratios[j];
- }
- percentageMax[i] = (100 * r)/totalRatios;
- }
-
-
- for (int i = 0; i < urls.length && getException() == null; i++)
- {
- if (i == 0)
- {
- currentPercMin = 0;
- }
- else {
- currentPercMin = percentageMax[i-1];
- }
- currentPercMax = percentageMax[i];
-
- // determine if a particular resource is cached
- String sUrl = urls[i];
- String version = versions[i];
-
- URL url = new URL(sUrl);
- boolean cached = ds.isResourceCached(url, version);
-
- if (cached && forceDownload)
- {
- try
- {
- ds.removeResource(url, version);
- } catch (IOException ioe)
- {
- }
- cached = false;
- }
-
- if (!cached)
- {
- // if not in the cache load the resource into the cache
- ds.loadResource(url, version, this);
- }
- downloadPercentage = currentPercMax;
- }
- isFinished = true;
- }
-
- /**
- * Returns the ApplicationException that has occurred during the download or
- * <CODE>null</CODE> if no exception occurred.
- * @return the ApplicationException that has occurred during the download or
- * <CODE>null</CODE> if no exception occurred.
- */
- public ApplicationException getException()
- {
- return ex;
- }
-
- /** {@inheritDoc} */
- @Override
- public void downloadFailed(URL url, String version)
- {
- ex =
- new ApplicationException(
- ReturnCode.DOWNLOAD_ERROR,
- INFO_DOWNLOADING_ERROR.get(url), null);
- }
-
- /** {@inheritDoc} */
- @Override
- public void progress(URL url, String version, long readSoFar, long total,
- int overallPercent)
- {
- if (overallPercent >= 0)
- {
- downloadPercentage = getPercentage(overallPercent);
- }
- status = Status.DOWNLOADING;
- }
-
- /** {@inheritDoc} */
- @Override
- public void upgradingArchive(URL url, String version, int patchPercent,
- int overallPercent)
- {
- currentUpgradingPercent = overallPercent;
- status = Status.UPGRADING;
- }
-
- /** {@inheritDoc} */
- @Override
- public void validating(URL url, String version, long entry, long total,
- int overallPercent)
- {
- if (total > 0)
- {
- currentValidatingPercent = (int)((100 * entry) / total);
- }
- else {
- currentValidatingPercent = 0;
- }
-
- status = Status.VALIDATING;
- }
-
- /**
- * Returns the jar files in a String[] from the System properties.
- * @return the jar files from the System properties.
- */
- private String[] getJarUrls()
- {
- String jars = System.getProperty(SetupUtils.LAZY_JAR_URLS);
- return jars.split(" ");
- }
-
-
- /**
- * Returns the downloaded percentage based on how much of the current jar file
- * has been downloaded.
- * @param currentJarRatio the download ratio of the jar file that is being
- * currently downloaded.
- * @return the downloaded percentage based on how much of the current jar file
- * has been downloaded.
- */
- private int getPercentage(int currentJarRatio)
- {
- return currentPercMin
- + (currentJarRatio * (currentPercMax - currentPercMin) / 100);
- }
-
- /**
- * Returns the java jar versions in a String[]. Currently just returns some
- * null strings.
- * @return the java jar versions in a String[].
- */
- private String[] getJarVersions()
- {
- return new String[getJarUrls().length];
- }
-
-}
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/webstart/package-info.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/webstart/package-info.java
deleted file mode 100644
index 43665bd..0000000
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/webstart/package-info.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
- * or http://forgerock.org/license/CDDLv1.0.html.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at legal-notices/CDDLv1_0.txt.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information:
- * Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- * Copyright 2008 Sun Microsystems, Inc.
- * Portions copyright 2013 ForgeRock AS.
- */
-
-
-/**
- * Defines the specific classes that are used by both the web start
- * applications.
- * This package only contains for the moment the class that is used to download
- * the jar files that contain the new installation files.
- *
- */
-package org.opends.quicksetup.webstart;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/InternalMozillaLDAPSocketFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/InternalMozillaLDAPSocketFactory.java
deleted file mode 100644
index f7e07a3..0000000
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/internal/InternalMozillaLDAPSocketFactory.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
- * or http://forgerock.org/license/CDDLv1.0.html.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at legal-notices/CDDLv1_0.txt.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information:
- * Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- * Copyright 2008 Sun Microsystems, Inc.
- */
-
-package org.opends.server.protocols.internal;
-
-
-
-import java.net.Socket;
-
-import netscape.ldap.LDAPSocketFactory;
-
-
-
-/**
- * This class provides an implementation of the
- * {{netscape.ldap.LDAPSocketFactory}} class that can be used to allow
- * the Mozilla LDAP SDK for Java to perform internal operations in
- * OpenDS. To use it, simply provide an instance of this class to the
- * constructor of the {{netscape.ldap.LDAPConnection}} class, like:
- * <PRE>
- * LDAPConnection conn =
- * new LDAPConnection(new InternalMozillaLDAPSocketFactory());
- * </PRE>
- */
-public final class InternalMozillaLDAPSocketFactory
- implements LDAPSocketFactory
-{
- /**
- * Creates a new instance of this internal Mozilla LDAP socket
- * factory.
- */
- public InternalMozillaLDAPSocketFactory()
- {
- // No implementation is required.
- }
-
-
-
- /**
- * Creates and returns a new internal LDAP socket, which can be used
- * by the Mozilla LDAP SDK for Java to perform internal operations
- * in OpenDS.
- *
- * @param host The address of the server to which the connection
- * should be established. This will be ignored, since
- * there will not be any actual network communication.
- * @param port The port of the server to which the connection
- * should be established. This will be ignored, since
- * there will not be any actual network communication.
- *
- * @return An internal LDAP socket, which can be used by the
- * Mozilla LDAP SDK for Java to perform internal operations
- * in OpenDS.
- */
- public Socket makeSocket(String host, int port)
- {
- return new InternalLDAPSocket();
- }
-}
-
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/util/SetupUtils.java b/opendj-server-legacy/src/main/java/org/opends/server/util/SetupUtils.java
index 3f5bacb..d4758a7 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/util/SetupUtils.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/util/SetupUtils.java
@@ -55,11 +55,6 @@
public class SetupUtils
{
/**
- * Java property used to known if we are using web start or not.
- */
- public static final String IS_WEBSTART = "org.opends.quicksetup.iswebstart";
-
- /**
* Specific environment variable used by the scripts to find java.
*/
public static final String OPENDJ_JAVA_HOME = "OPENDJ_JAVA_HOME";
@@ -353,17 +348,6 @@
}
/**
- * Indicates whether we are in a web start installation or not.
- *
- * @return <CODE>true</CODE> if we are in a web start installation and
- * <CODE>false</CODE> if not.
- */
- public static boolean isWebStart()
- {
- return "true".equals(System.getProperty(IS_WEBSTART));
- }
-
- /**
* Returns the String that can be used to launch an script using Runtime.exec.
* This method is required because in Windows the script that contain a "="
* in their path must be quoted.
diff --git a/opendj-server-legacy/src/main/resources/java-stubs/org/opends/server/util/DynamicConstants.java b/opendj-server-legacy/src/main/resources/java-stubs/org/opends/server/util/DynamicConstants.java
index 91b40d7..71870bd 100644
--- a/opendj-server-legacy/src/main/resources/java-stubs/org/opends/server/util/DynamicConstants.java
+++ b/opendj-server-legacy/src/main/resources/java-stubs/org/opends/server/util/DynamicConstants.java
@@ -180,22 +180,7 @@
static {
try {
- Class c;
- if (org.opends.server.util.SetupUtils.isWebStart())
- {
- Class<?> cS = Class.forName("org.opends.server.util.SetupUtils");
- java.net.URL[] urls = new java.net.URL[]
- {
- cS.getProtectionDomain().getCodeSource().getLocation()
- };
- ClassLoader webstartClassLoader = new java.net.URLClassLoader(urls);
- c = webstartClassLoader.loadClass(
- "org.opends.server.util.ReleaseDefinition");
- }
- else
- {
- c = Class.forName("org.opends.server.util.ReleaseDefinition");
- }
+ Class c = Class.forName("org.opends.server.util.ReleaseDefinition");
Object obj = c.newInstance();
try {
diff --git a/opendj-server-legacy/src/messages/org/opends/messages/quickSetup.properties b/opendj-server-legacy/src/messages/org/opends/messages/quickSetup.properties
index affe192..729ccd5 100644
--- a/opendj-server-legacy/src/messages/org/opends/messages/quickSetup.properties
+++ b/opendj-server-legacy/src/messages/org/opends/messages/quickSetup.properties
@@ -231,13 +231,6 @@
INFO_DIV_OPEN_SUCCESSFUL_BACKGROUND_2_COLOR=FFFFCC
# Only translate if the color is specific to the local
INFO_DIV_OPEN_SUCCESSFUL_BACKGROUND_3_COLOR=E1E1A7
-INFO_DOWNLOADING=Downloading...
-INFO_DOWNLOADING_ERROR=An error occurred downloading remote file(s) %s.
-INFO_DOWNLOADING_ERROR_NO_SERVICE_FOUND=An error occurred. Could not find \
- service '%s'. Setup using JNLP is not supported with your JDK \
- installation. Download a ZIP installation, un-zip it and run script %s to \
- install the server.
-INFO_DOWNLOADING_RATIO=Downloading: %s%% Completed.
INFO_EMPTY_ADMINISTRATOR_UID=You must provide a Global Administrative User \
ID.
INFO_EMPTY_DIRECTORY_MANAGER_DN=You must provide an Root User DN.
@@ -745,8 +738,6 @@
server.
INFO_SERVER_SETTINGS_PANEL_INSTRUCTIONS=Enter a port to listen for LDAP \
requests and enter a password for the server initial Root user.
-INFO_SERVER_SETTINGS_PANEL_INSTRUCTIONS_WEBSTART=Choose a location for the \
- server files and enter a password for the server administrative user.
INFO_SERVER_SETTINGS_PANEL_TITLE=Server Settings
INFO_SERVER_SETTINGS_STEP=Server Settings
INFO_SETUP_LAUNCHER_GUI_LAUNCHED_FAILED=%n%nThe graphical Setup launch \
@@ -932,10 +923,6 @@
arguments and the 'Other Java Arguments' were checked successfully \
separately. However there was an error running them simultaneously. Check \
that the provided arguments are compatible with the memory values.
-INFO_JAVA_ARGUMENTS_CANNOT_BE_CHECKED_IN_WEBSTART=In the Java Webstart setup, \
- the provided Java arguments are not thoroughly tested till the server is \
- actually configured.\nIf the provided arguments cannot be used, the default \
- java arguments will be used to configure.\n\nDo you want to continue?
INFO_JAVA_RUNTIME_OPTIONS_PANEL_TITLE=Runtime Options
INFO_JAVA_RUNTIME_OPTIONS_PANEL_STEP=Runtime Options
INFO_JAVA_RUNTIME_OPTIONS_PANEL_INSTRUCTIONS=Specify the runtime options that \
diff --git a/opendj-server-legacy/src/messages/org/opends/messages/quickSetup_de.properties b/opendj-server-legacy/src/messages/org/opends/messages/quickSetup_de.properties
index e2fb540..db1615a 100644
--- a/opendj-server-legacy/src/messages/org/opends/messages/quickSetup_de.properties
+++ b/opendj-server-legacy/src/messages/org/opends/messages/quickSetup_de.properties
@@ -161,10 +161,6 @@
INFO_DIV_OPEN_SUCCESSFUL_BACKGROUND_2_COLOR=FFFFCC
# Only translate if the color is specific to the local
INFO_DIV_OPEN_SUCCESSFUL_BACKGROUND_3_COLOR=E1E1A7
-INFO_DOWNLOADING=Downloadvorgang...
-INFO_DOWNLOADING_ERROR=Beim Herunterladen der Remotedatei(en) %s ist ein Fehler aufgetreten.
-INFO_DOWNLOADING_ERROR_NO_SERVICE_FOUND=Ein Fehler ist aufgetreten. Service '%s' konnte nicht gefunden werden. Setup mit JNLP wird nicht mit Ihrer JDK-Installation unterst\u00fctzt. Laden Sie eine ZIP-Installation herunter, entzippen Sie diese und f\u00fchren Sie Script %s aus, um den Server zu installieren.
-INFO_DOWNLOADING_RATIO=Downloadvorgang: %s%% Abgeschlossen.
INFO_EMPTY_ADMINISTRATOR_UID=Sie m\u00fcssen eine Benutzer-ID des globalen administrativen Benutzers angeben.
INFO_EMPTY_DIRECTORY_MANAGER_DN=Sie m\u00fcssen einen Root-Benutzer-DN angeben.
INFO_EMPTY_HOST_NAME=Sie m\u00fcssen den Namen des Hosts angeben.
@@ -519,7 +515,6 @@
INFO_SERVER_SECURITY_LABEL=Sicherer LDAP-Zugriff:
INFO_SERVER_SECURITY_TOOLTIP=Die Konfiguration f\u00fcr sicheren LDAP-Zugriff f\u00fcr den neuen Server.
INFO_SERVER_SETTINGS_PANEL_INSTRUCTIONS=Geben Sie einen Port an, der auf LDAP-Anforderungen abgeh\u00f6rt werden soll, und anschlie\u00dfend ein Passwort f\u00fcr den anf\u00e4nglichen Server-Root-Benutzer.
-INFO_SERVER_SETTINGS_PANEL_INSTRUCTIONS_WEBSTART=Geben Sie einen Speicherort f\u00fcr die Serverdateien an, und geben Sie ein Passwort f\u00fcr den administrativen Serverbenutzer ein.
INFO_SERVER_SETTINGS_PANEL_TITLE=Servereinstellungen
INFO_SERVER_SETTINGS_STEP=Servereinstellungen
INFO_SETUP_LAUNCHER_GUI_LAUNCHED_FAILED=%n%nSetup-Start \u00fcber grafische Benutzeroberfl\u00e4che ist fehlgeschlagen.%n%nSetup \u00fcber Befehlszeile wird gestartet...
@@ -637,7 +632,6 @@
ERR_GENERIC_JAVA_ARGUMENT=Die Argumente '%s' konnten mit der ausgef\u00fchrten Java Virtual Machine nicht verwendet werden. Pr\u00fcfen Sie, ob die Java Virtual Machine dieses Argument unterst\u00fctzt.
ERR_MAX_MEMORY_BIGGER_THAN_INITIAL_MEMORY=Der Wert f\u00fcr den maximalen Arbeitsspeicher muss h\u00f6her sein als der Wert des anf\u00e4nglichen Arbeitsspeichers.
ERR_MEMORY_AND_OTHER_ARGUMENTS_NOT_COMPATIBLE=Die angegebenen Speicherargumente und 'Weiteren Java-Argumente' wurden erfolgreich separat gepr\u00fcft. Beim gleichzeitigen Ausf\u00fchren der Argumente ist jedoch ein Fehler aufgetreten. Pr\u00fcfen Sie, ob die Argumente mit den Speicherwerten kompatibel sind.
-INFO_JAVA_ARGUMENTS_CANNOT_BE_CHECKED_IN_WEBSTART=Die angegebenen Java-Argumente wurden in dem Java Webstart-Setup nicht sorgf\u00e4ltig bis zur t\u00e4ts\u00e4chlichen Konfiguratin des Servers gepr\u00fcft.\nWenn die angegebenen Argumente nicht verwendet werden k\u00f6nnen, werden die standardm\u00e4\u00dfigen Java-Argumente f\u00fcr die Konfiguration verwendet.\n\nM\u00f6chten Sie fortfahren?
INFO_JAVA_RUNTIME_OPTIONS_PANEL_TITLE=Laufzeitoptionen
INFO_JAVA_RUNTIME_OPTIONS_PANEL_STEP=Laufzeitoptionen
INFO_JAVA_RUNTIME_OPTIONS_PANEL_INSTRUCTIONS=Geben Sie die Laufzeitoptionen an, die von der Java Virtual Machine zum Ausf\u00fchren des Servers und Importieren des Tools verwendet werden.
diff --git a/opendj-server-legacy/src/messages/org/opends/messages/quickSetup_es.properties b/opendj-server-legacy/src/messages/org/opends/messages/quickSetup_es.properties
index 76bfe61..ec75aae 100644
--- a/opendj-server-legacy/src/messages/org/opends/messages/quickSetup_es.properties
+++ b/opendj-server-legacy/src/messages/org/opends/messages/quickSetup_es.properties
@@ -161,10 +161,6 @@
INFO_DIV_OPEN_SUCCESSFUL_BACKGROUND_2_COLOR=FFFFCC
# Only translate if the color is specific to the local
INFO_DIV_OPEN_SUCCESSFUL_BACKGROUND_3_COLOR=E1E1A7
-INFO_DOWNLOADING=Descargando...
-INFO_DOWNLOADING_ERROR=Se ha producido un error al descargar el archivo o archivos remotos %s.
-INFO_DOWNLOADING_ERROR_NO_SERVICE_FOUND=Se produjo un error. No pudo encontrarse el servicio '%s'. No se admite la configuraci\u00f3n por medio de JLP con su instalaci\u00f3n JDK. Descargue una instalaci\u00f3n ZIP, descompr\u00edmala y ejecute la secuencia de comandos %s para instalar el servidor.
-INFO_DOWNLOADING_RATIO=Descargando: %s%% completado.
INFO_EMPTY_ADMINISTRATOR_UID=Debe especificar un ID de usuario administrativo global.
INFO_EMPTY_DIRECTORY_MANAGER_DN=Debe especificar un ND de usuario root.
INFO_EMPTY_HOST_NAME=Debe especificar el nombre del host.
@@ -519,7 +515,6 @@
INFO_SERVER_SECURITY_LABEL=Acceso seguro de LDAP:
INFO_SERVER_SECURITY_TOOLTIP=La configuraci\u00f3n de acceso seguro de LDAP para el nuevo servidor
INFO_SERVER_SETTINGS_PANEL_INSTRUCTIONS=Escriba un puerto de escucha para las solicitudes de LDAP e introduzca una contrase\u00f1a para el usuario root inicial del servidor.
-INFO_SERVER_SETTINGS_PANEL_INSTRUCTIONS_WEBSTART=Elija una ubicaci\u00f3n para los archivos del servidor y escriba una contrase\u00f1a para el usuario administrativo del servidor.
INFO_SERVER_SETTINGS_PANEL_TITLE=Configuraci\u00f3n del servidor
INFO_SERVER_SETTINGS_STEP=Configuraci\u00f3n del servidor
INFO_SETUP_LAUNCHER_GUI_LAUNCHED_FAILED=%n%nError al iniciar la instalaci\u00f3n gr\u00e1fica.%n%nIniciando la instalaci\u00f3n mediante l\u00ednea de comandos...
@@ -637,7 +632,6 @@
ERR_GENERIC_JAVA_ARGUMENT=No pudieron usarse los argumentos '%s' con la m\u00e1quina virtual Java en ejecuci\u00f3n. Compruebe que la m\u00e1quina virtual Java admita este argumento.
ERR_MAX_MEMORY_BIGGER_THAN_INITIAL_MEMORY=El valor de memoria m\u00e1xima debe ser superior al valor de memoria inicial.
ERR_MEMORY_AND_OTHER_ARGUMENTS_NOT_COMPATIBLE=Se han comprobado con \u00e9xito los argumentos de memoria proporcionados y los 'Otros argumentos Java' separadamente. Sin embargo, se ha producido un error al ejecutarlos simult\u00e1neamente. Compruebe que los argumentos proporcionados sean compatibles con los valores de memoria.
-INFO_JAVA_ARGUMENTS_CANNOT_BE_CHECKED_IN_WEBSTART=En la configuraci\u00f3n de Java Web Start, no se eval\u00faan minuciosamente los argumentos Java proporcionados hasta que el servidor est\u00e9 configurado.\nSi no pueden usarse los argumentos proporcionados, se emplear\u00e1n los argumentos Java predeterminados para configurar.\n\n\u00bfDesea continuar?
INFO_JAVA_RUNTIME_OPTIONS_PANEL_TITLE=Opciones de tiempo de ejecuci\u00f3n
INFO_JAVA_RUNTIME_OPTIONS_PANEL_STEP=Opciones de tiempo de ejecuci\u00f3n
INFO_JAVA_RUNTIME_OPTIONS_PANEL_INSTRUCTIONS=Especifique las opciones de tiempo de ejecuci\u00f3n que la m\u00e1quina virtual Java emplear\u00e1 para ejecutar el servidor y la herramienta de importaci\u00f3n.
diff --git a/opendj-server-legacy/src/messages/org/opends/messages/quickSetup_fr.properties b/opendj-server-legacy/src/messages/org/opends/messages/quickSetup_fr.properties
index d5e8e78..a791288 100644
--- a/opendj-server-legacy/src/messages/org/opends/messages/quickSetup_fr.properties
+++ b/opendj-server-legacy/src/messages/org/opends/messages/quickSetup_fr.properties
@@ -161,10 +161,6 @@
INFO_DIV_OPEN_SUCCESSFUL_BACKGROUND_2_COLOR=FFFFCC
# Only translate if the color is specific to the local
INFO_DIV_OPEN_SUCCESSFUL_BACKGROUND_3_COLOR=E1E1A7
-INFO_DOWNLOADING=T\u00e9l\u00e9chargement...
-INFO_DOWNLOADING_ERROR=Une erreur s'est produite lors du t\u00e9l\u00e9chargement du ou des fichiers distants %s.
-INFO_DOWNLOADING_ERROR_NO_SERVICE_FOUND=Une erreur s\u2019est produite. Le service '%s' est introuvable. L'installation avec JNLP n'est pas prise en charge par votre installation JDK. T\u00e9l\u00e9chargez un fichier ZIP d'installation, d\u00e9zippez-le et ex\u00e9cutez le script %s pour installer le serveur.
-INFO_DOWNLOADING_RATIO=T\u00e9l\u00e9chargement\u00a0: %s%% effectu\u00e9.
INFO_EMPTY_ADMINISTRATOR_UID=Vous devez fournir un ID utilisateur administratif global.
INFO_EMPTY_DIRECTORY_MANAGER_DN=Vous devez fournir un DN utilisateur racine.
INFO_EMPTY_HOST_NAME=Vous devez fournir le nom d'h\u00f4te.
@@ -520,7 +516,6 @@
INFO_SERVER_SECURITY_LABEL=Acc\u00e8s s\u00e9curis\u00e9 LDAP :
INFO_SERVER_SECURITY_TOOLTIP=Configuration de l'acc\u00e8s s\u00e9curis\u00e9 LDAP pour le nouveau serveur
INFO_SERVER_SETTINGS_PANEL_INSTRUCTIONS=Saisir un port pour \u00e9couter les demandes LDAP et saisir un mot de passe pour l'utilisateur racine initial du serveur.
-INFO_SERVER_SETTINGS_PANEL_INSTRUCTIONS_WEBSTART=Choisir un emplacement pour les fichiers du serveur et saisir un mot de passe pour l'utilisateur administratif du serveur.
INFO_SERVER_SETTINGS_PANEL_TITLE=Param\u00e8tres du serveur
INFO_SERVER_SETTINGS_STEP=Param\u00e8tres du serveur
INFO_SETUP_LAUNCHER_GUI_LAUNCHED_FAILED=%n%n\u00c9chec du lancement de la configuration graphique.%n%nD\u00e9marrage de la configuration via la ligne de commande...
@@ -638,7 +633,6 @@
ERR_GENERIC_JAVA_ARGUMENT=Impossible d'utiliser les arguments '%s' avec la machine virtuelle Java en cours d'ex\u00e9cution. V\u00e9rifiez que la machine virtuelle Java prend en charge cet argument.
ERR_MAX_MEMORY_BIGGER_THAN_INITIAL_MEMORY=La valeur de m\u00e9moire maximale doit \u00eatre sup\u00e9rieure \u00e0 la valeur de m\u00e9moire initiale.
ERR_MEMORY_AND_OTHER_ARGUMENTS_NOT_COMPATIBLE=Les arguments de m\u00e9moire fournis et la valeur 'Autres arguments Java' ont \u00e9t\u00e9 v\u00e9rifi\u00e9s s\u00e9par\u00e9ment et trouv\u00e9s corrects. Une erreur s'est toutefois produite lors de leur ex\u00e9cution simultan\u00e9e. V\u00e9rifiez que les arguments fournis sont compatibles avec les valeurs de m\u00e9moire.
-INFO_JAVA_ARGUMENTS_CANNOT_BE_CHECKED_IN_WEBSTART=Dans la configuration Java Webstart, les arguments Java fournis ne sont pas enti\u00e8rement test\u00e9s tant que le serveur n'a pas \u00e9t\u00e9 r\u00e9ellement configur\u00e9.\nS'il est impossible d'utiliser les arguments fournis, les arguments Java par d\u00e9faut sont utilis\u00e9s pour la configuration.\n\nVoulez-vous continuer ?
INFO_JAVA_RUNTIME_OPTIONS_PANEL_TITLE=Options d'ex\u00e9cution
INFO_JAVA_RUNTIME_OPTIONS_PANEL_STEP=Options d'ex\u00e9cution
INFO_JAVA_RUNTIME_OPTIONS_PANEL_INSTRUCTIONS=Sp\u00e9cifiez les options d'ex\u00e9cution que la machine virtuelle Java va utiliser pour ex\u00e9cuter le serveur et l'outil d'importation.
diff --git a/opendj-server-legacy/src/messages/org/opends/messages/quickSetup_ja.properties b/opendj-server-legacy/src/messages/org/opends/messages/quickSetup_ja.properties
index 11431fb..a790761 100644
--- a/opendj-server-legacy/src/messages/org/opends/messages/quickSetup_ja.properties
+++ b/opendj-server-legacy/src/messages/org/opends/messages/quickSetup_ja.properties
@@ -161,10 +161,6 @@
INFO_DIV_OPEN_SUCCESSFUL_BACKGROUND_2_COLOR=FFFFCC
# Only translate if the color is specific to the local
INFO_DIV_OPEN_SUCCESSFUL_BACKGROUND_3_COLOR=E1E1A7
-INFO_DOWNLOADING=\u30c0\u30a6\u30f3\u30ed\u30fc\u30c9\u3057\u3066\u3044\u307e\u3059...
-INFO_DOWNLOADING_ERROR=\u30ea\u30e2\u30fc\u30c8\u30d5\u30a1\u30a4\u30eb %s \u306e\u30c0\u30a6\u30f3\u30ed\u30fc\u30c9\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002
-INFO_DOWNLOADING_ERROR_NO_SERVICE_FOUND=\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002\u30b5\u30fc\u30d3\u30b9 '%s' \u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3067\u3057\u305f\u3002JNLP \u3092\u4f7f\u7528\u3057\u305f\u30bb\u30c3\u30c8\u30a2\u30c3\u30d7\u306f\u3001\u3053\u306e JDK \u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u3067\u306f\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u307e\u305b\u3093\u3002ZIP \u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u3092\u30c0\u30a6\u30f3\u30ed\u30fc\u30c9\u3057\u3066\u89e3\u51cd\u3057\u3001\u30b9\u30af\u30ea\u30d7\u30c8 %s \u3092\u5b9f\u884c\u3057\u3066\u30b5\u30fc\u30d0\u30fc\u3092\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u3057\u3066\u304f\u3060\u3055\u3044\u3002
-INFO_DOWNLOADING_RATIO=\u30c0\u30a6\u30f3\u30ed\u30fc\u30c9\u4e2d: %s%% \u5b8c\u4e86\u3057\u307e\u3057\u305f\u3002
INFO_EMPTY_ADMINISTRATOR_UID=\u30b0\u30ed\u30fc\u30d0\u30eb\u7ba1\u7406\u8005\u306e\u30e6\u30fc\u30b6\u30fc ID \u3092\u6307\u5b9a\u3057\u3066\u304f\u3060\u3055\u3044\u3002
INFO_EMPTY_DIRECTORY_MANAGER_DN=\u30eb\u30fc\u30c8\u30e6\u30fc\u30b6\u30fc DN \u3092\u6307\u5b9a\u3057\u3066\u304f\u3060\u3055\u3044\u3002
INFO_EMPTY_HOST_NAME=\u30db\u30b9\u30c8\u306e\u540d\u524d\u3092\u6307\u5b9a\u3057\u3066\u304f\u3060\u3055\u3044\u3002
@@ -519,7 +515,6 @@
INFO_SERVER_SECURITY_LABEL=LDAP \u30bb\u30ad\u30e5\u30a2\u30a2\u30af\u30bb\u30b9:
INFO_SERVER_SECURITY_TOOLTIP=\u65b0\u3057\u3044\u30b5\u30fc\u30d0\u30fc\u7528\u306e LDAP \u30bb\u30ad\u30e5\u30a2\u30a2\u30af\u30bb\u30b9\u69cb\u6210\u3002
INFO_SERVER_SETTINGS_PANEL_INSTRUCTIONS=LDAP \u8981\u6c42\u3092\u5f85\u6a5f\u3059\u308b\u30dd\u30fc\u30c8\u3092\u5165\u529b\u3057\u3066\u3001\u30b5\u30fc\u30d0\u30fc\u306e\u521d\u671f\u30eb\u30fc\u30c8\u30e6\u30fc\u30b6\u30fc\u306e\u30d1\u30b9\u30ef\u30fc\u30c9\u3092\u5165\u529b\u3057\u307e\u3059\u3002
-INFO_SERVER_SETTINGS_PANEL_INSTRUCTIONS_WEBSTART=\u30b5\u30fc\u30d0\u30fc\u30d5\u30a1\u30a4\u30eb\u306e\u5834\u6240\u3092\u9078\u629e\u3057\u3066\u3001\u30b5\u30fc\u30d0\u30fc\u7ba1\u7406\u30e6\u30fc\u30b6\u30fc\u306e\u30d1\u30b9\u30ef\u30fc\u30c9\u3092\u5165\u529b\u3057\u307e\u3059\u3002
INFO_SERVER_SETTINGS_PANEL_TITLE=\u30b5\u30fc\u30d0\u30fc\u8a2d\u5b9a
INFO_SERVER_SETTINGS_STEP=\u30b5\u30fc\u30d0\u30fc\u8a2d\u5b9a
INFO_SETUP_LAUNCHER_GUI_LAUNCHED_FAILED=%n%n\u30b0\u30e9\u30d5\u30a3\u30ab\u30eb\u30bb\u30c3\u30c8\u30a2\u30c3\u30d7\u306e\u8d77\u52d5\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002%n%n\u30b3\u30de\u30f3\u30c9\u884c\u30bb\u30c3\u30c8\u30a2\u30c3\u30d7\u3092\u8d77\u52d5\u3057\u3066\u3044\u307e\u3059...
@@ -637,7 +632,6 @@
ERR_GENERIC_JAVA_ARGUMENT=\u5b9f\u884c\u4e2d\u306e Java \u4eee\u60f3\u30de\u30b7\u30f3\u3067\u5f15\u6570 '%s' \u3092\u4f7f\u7528\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002Java \u4eee\u60f3\u30de\u30b7\u30f3\u3067\u3053\u306e\u5f15\u6570\u304c\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u3066\u3044\u308b\u3053\u3068\u3092\u78ba\u8a8d\u3057\u3066\u304f\u3060\u3055\u3044\u3002
ERR_MAX_MEMORY_BIGGER_THAN_INITIAL_MEMORY=\u6700\u5927\u30e1\u30e2\u30ea\u30fc\u5024\u306f\u521d\u671f\u30e1\u30e2\u30ea\u30fc\u5024\u3088\u308a\u3082\u5927\u304d\u304f\u306a\u3051\u308c\u3070\u306a\u308a\u307e\u305b\u3093\u3002
ERR_MEMORY_AND_OTHER_ARGUMENTS_NOT_COMPATIBLE=\u6307\u5b9a\u3055\u308c\u305f\u30e1\u30e2\u30ea\u30fc\u5f15\u6570\u3068\u300c\u305d\u306e\u4ed6\u306e Java \u5f15\u6570\u300d\u306f\u3001\u500b\u5225\u306b\u306f\u6b63\u5e38\u3067\u3042\u308b\u3053\u3068\u304c\u78ba\u8a8d\u3055\u308c\u307e\u3057\u305f\u3002\u3057\u304b\u3057\u3001\u540c\u6642\u306b\u5b9f\u884c\u3059\u308b\u3068\u304d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002\u6307\u5b9a\u3057\u305f\u5f15\u6570\u304c\u30e1\u30e2\u30ea\u30fc\u5024\u3068\u4e92\u63db\u6027\u304c\u3042\u308b\u3053\u3068\u3092\u78ba\u8a8d\u3057\u3066\u304f\u3060\u3055\u3044\u3002
-INFO_JAVA_ARGUMENTS_CANNOT_BE_CHECKED_IN_WEBSTART=Java WebStart \u30bb\u30c3\u30c8\u30a2\u30c3\u30d7\u3067\u306f\u3001\u6307\u5b9a\u3055\u308c\u305f Java \u5f15\u6570\u306f\u3001\u30b5\u30fc\u30d0\u30fc\u304c\u5b9f\u969b\u306b\u69cb\u6210\u3055\u308c\u308b\u307e\u3067\u5b8c\u5168\u306b\u306f\u30c6\u30b9\u30c8\u3055\u308c\u307e\u305b\u3093\u3002\n\u6307\u5b9a\u3055\u308c\u305f\u5f15\u6570\u304c\u4f7f\u7528\u3067\u304d\u306a\u3044\u5834\u5408\u306f\u3001\u30c7\u30d5\u30a9\u30eb\u30c8\u306e Java \u5f15\u6570\u3092\u4f7f\u7528\u3057\u3066\u69cb\u6210\u304c\u884c\u308f\u308c\u307e\u3059\u3002\n\n\u7d9a\u884c\u3057\u307e\u3059\u304b ?
INFO_JAVA_RUNTIME_OPTIONS_PANEL_TITLE=\u5b9f\u884c\u6642\u30aa\u30d7\u30b7\u30e7\u30f3
INFO_JAVA_RUNTIME_OPTIONS_PANEL_STEP=\u5b9f\u884c\u6642\u30aa\u30d7\u30b7\u30e7\u30f3
INFO_JAVA_RUNTIME_OPTIONS_PANEL_INSTRUCTIONS=Java \u4eee\u60f3\u30de\u30b7\u30f3\u3067\u30b5\u30fc\u30d0\u30fc\u304a\u3088\u3073\u30a4\u30f3\u30dd\u30fc\u30c8\u30c4\u30fc\u30eb\u306e\u5b9f\u884c\u306b\u4f7f\u7528\u3059\u308b\u5b9f\u884c\u6642\u30aa\u30d7\u30b7\u30e7\u30f3\u3092\u6307\u5b9a\u3057\u307e\u3059\u3002
diff --git a/opendj-server-legacy/src/messages/org/opends/messages/quickSetup_ko.properties b/opendj-server-legacy/src/messages/org/opends/messages/quickSetup_ko.properties
index b21ee81..1c8d736 100644
--- a/opendj-server-legacy/src/messages/org/opends/messages/quickSetup_ko.properties
+++ b/opendj-server-legacy/src/messages/org/opends/messages/quickSetup_ko.properties
@@ -155,9 +155,6 @@
INFO_DIV_OPEN_SUCCESSFUL_BACKGROUND_2_COLOR=FFFFCC
# Only translate if the color is specific to the local
INFO_DIV_OPEN_SUCCESSFUL_BACKGROUND_3_COLOR=E1E1A7
-INFO_DOWNLOADING=\ub2e4\uc6b4\ub85c\ub4dc\ud558\ub294 \uc911...
-INFO_DOWNLOADING_ERROR=\uc6d0\uaca9 %s \ud30c\uc77c\uc744 \ub2e4\uc6b4\ub85c\ub4dc\ud558\ub294 \ub3d9\uc548 \uc624\ub958\uac00 \ubc1c\uc0dd\ud588\uc2b5\ub2c8\ub2e4.
-INFO_DOWNLOADING_RATIO=\ub2e4\uc6b4\ub85c\ub4dc \uc911: %s%% \uc644\ub8cc\ub418\uc5c8\uc2b5\ub2c8\ub2e4.
INFO_EMPTY_ADMINISTRATOR_UID=\uc804\uc5ed \uad00\ub9ac\uc790 \uc544\uc774\ub514\ub97c \uc81c\uacf5\ud574\uc57c \ud569\ub2c8\ub2e4.
INFO_EMPTY_DIRECTORY_MANAGER_DN=\ub8e8\ud2b8 \uc0ac\uc6a9\uc790 DN\uc744 \uc81c\uacf5\ud574\uc57c \ud569\ub2c8\ub2e4.
INFO_EMPTY_HOST_NAME=\ud638\uc2a4\ud2b8 \uc774\ub984\uc744 \uc81c\uacf5\ud574\uc57c \ud569\ub2c8\ub2e4.
@@ -496,7 +493,6 @@
INFO_SERVER_SECURITY_LABEL=LDAP \ubcf4\uc548 \uc561\uc138\uc2a4:
INFO_SERVER_SECURITY_TOOLTIP=The LDAP Secure Access Configuration for the new server.
INFO_SERVER_SETTINGS_PANEL_INSTRUCTIONS=Enter a port to listen for LDAP requests and enter a password for the server initial Root user.
-INFO_SERVER_SETTINGS_PANEL_INSTRUCTIONS_WEBSTART=Choose a location for the server files and enter a password for the server administrative user.
INFO_SERVER_SETTINGS_PANEL_TITLE=\uc11c\ubc84 \uc124\uc815
INFO_SERVER_SETTINGS_STEP=\uc11c\ubc84 \uc124\uc815
INFO_SETUP_LAUNCHER_GUI_LAUNCHED_FAILED=%n%n\uadf8\ub798\ud53d \uc124\uce58\ub97c \uc2dc\uc791\ud558\uc9c0 \ubabb\ud588\uc2b5\ub2c8\ub2e4.%n%n\uba85\ub839\uc904 \uc124\uce58\ub97c \uc2dc\uc791\ud558\ub294 \uc911...
diff --git a/opendj-server-legacy/src/messages/org/opends/messages/quickSetup_zh_CN.properties b/opendj-server-legacy/src/messages/org/opends/messages/quickSetup_zh_CN.properties
index e72408d..1eceff0 100644
--- a/opendj-server-legacy/src/messages/org/opends/messages/quickSetup_zh_CN.properties
+++ b/opendj-server-legacy/src/messages/org/opends/messages/quickSetup_zh_CN.properties
@@ -161,10 +161,6 @@
INFO_DIV_OPEN_SUCCESSFUL_BACKGROUND_2_COLOR=FFFFCC
# Only translate if the color is specific to the local
INFO_DIV_OPEN_SUCCESSFUL_BACKGROUND_3_COLOR=E1E1A7
-INFO_DOWNLOADING=\u6b63\u5728\u4e0b\u8f7d...
-INFO_DOWNLOADING_ERROR=\u5728\u4e0b\u8f7d\u8fdc\u7a0b\u6587\u4ef6 %s \u65f6\u51fa\u73b0\u9519\u8bef\u3002
-INFO_DOWNLOADING_ERROR_NO_SERVICE_FOUND=\u51fa\u73b0\u9519\u8bef\uff0c\u627e\u4e0d\u5230\u670d\u52a1 '%s'\u3002JDK \u5b89\u88c5\u7a0b\u5e8f\u4e0d\u652f\u6301\u4f7f\u7528 JNLP \u8fdb\u884c\u8bbe\u7f6e\u3002\u4e0b\u8f7d ZIP \u5b89\u88c5\u7a0b\u5e8f\uff0c\u7136\u540e\u5c06\u5176\u89e3\u538b\u5e76\u8fd0\u884c\u811a\u672c %s \u4ee5\u5b89\u88c5\u670d\u52a1\u5668\u3002
-INFO_DOWNLOADING_RATIO=\u6b63\u5728\u4e0b\u8f7d\uff1a\u5df2\u5b8c\u6210 %s%%\u3002
INFO_EMPTY_ADMINISTRATOR_UID=\u60a8\u5fc5\u987b\u63d0\u4f9b\u5168\u5c40\u7ba1\u7406\u7528\u6237 ID\u3002
INFO_EMPTY_DIRECTORY_MANAGER_DN=\u60a8\u5fc5\u987b\u63d0\u4f9b\u8d85\u7ea7\u7528\u6237 DN\u3002
INFO_EMPTY_HOST_NAME=\u60a8\u5fc5\u987b\u63d0\u4f9b\u4e3b\u673a\u540d\u3002
@@ -519,7 +515,6 @@
INFO_SERVER_SECURITY_LABEL=LDAP \u5b89\u5168\u8bbf\u95ee:
INFO_SERVER_SECURITY_TOOLTIP=\u65b0\u670d\u52a1\u5668\u7684 LDAP \u5b89\u5168\u8bbf\u95ee\u914d\u7f6e\u3002
INFO_SERVER_SETTINGS_PANEL_INSTRUCTIONS=\u8f93\u5165\u7528\u4e8e\u4fa6\u542c LDAP \u8bf7\u6c42\u7684\u7aef\u53e3\u4ee5\u53ca\u670d\u52a1\u5668\u521d\u59cb Root \u7528\u6237\u7684\u5bc6\u7801\u3002
-INFO_SERVER_SETTINGS_PANEL_INSTRUCTIONS_WEBSTART=\u9009\u62e9\u670d\u52a1\u5668\u6587\u4ef6\u7684\u4f4d\u7f6e\uff0c\u5e76\u8f93\u5165\u670d\u52a1\u5668\u7ba1\u7406\u7528\u6237\u7684\u5bc6\u7801\u3002
INFO_SERVER_SETTINGS_PANEL_TITLE=\u670d\u52a1\u5668\u8bbe\u7f6e
INFO_SERVER_SETTINGS_STEP=\u670d\u52a1\u5668\u8bbe\u7f6e
INFO_SETUP_LAUNCHER_GUI_LAUNCHED_FAILED=%n%n\u542f\u52a8\u56fe\u5f62\u5316\u5b89\u88c5\u5931\u8d25\u3002%n%n\u6b63\u5728\u542f\u52a8\u547d\u4ee4\u884c\u5b89\u88c5...
@@ -637,7 +632,6 @@
ERR_GENERIC_JAVA_ARGUMENT=\u4f7f\u7528\u5f53\u524d\u8fd0\u884c\u7684 Java \u865a\u62df\u673a\u65f6\uff0c\u65e0\u6cd5\u4f7f\u7528\u53c2\u6570 '%s'\u3002\u68c0\u67e5 Java \u865a\u62df\u673a\u662f\u5426\u652f\u6301\u6b64\u53c2\u6570\u3002
ERR_MAX_MEMORY_BIGGER_THAN_INITIAL_MEMORY=\u6700\u5927\u5185\u5b58\u503c\u5fc5\u987b\u5927\u4e8e\u521d\u59cb\u5185\u5b58\u503c\u3002
ERR_MEMORY_AND_OTHER_ARGUMENTS_NOT_COMPATIBLE=\u5df2\u5206\u522b\u6210\u529f\u68c0\u67e5\u63d0\u4f9b\u7684\u5185\u5b58\u53c2\u6570\u548c\u201c\u5176\u4ed6 Java \u53c2\u6570\u201d\u3002\u4f46\u4e8c\u8005\u540c\u65f6\u8fd0\u884c\u4f1a\u53d1\u751f\u9519\u8bef\u3002\u68c0\u67e5\u63d0\u4f9b\u7684\u53c2\u6570\u662f\u5426\u4e0e\u5185\u5b58\u503c\u517c\u5bb9\u3002
-INFO_JAVA_ARGUMENTS_CANNOT_BE_CHECKED_IN_WEBSTART=\u5728 Java Webstart \u8bbe\u7f6e\u4e2d\uff0c\u53ea\u6709\u5728\u5b9e\u9645\u914d\u7f6e\u670d\u52a1\u5668\u4e4b\u540e\u624d\u4f1a\u5b8c\u5168\u6d4b\u8bd5\u63d0\u4f9b\u7684 Java \u53c2\u6570\u3002\n\u5982\u679c\u65e0\u6cd5\u4f7f\u7528\u63d0\u4f9b\u7684\u53c2\u6570\uff0c\u5219\u4f1a\u4f7f\u7528\u9ed8\u8ba4 java \u53c2\u6570\u8fdb\u884c\u914d\u7f6e\u3002\n\n\u662f\u5426\u7ee7\u7eed\uff1f
INFO_JAVA_RUNTIME_OPTIONS_PANEL_TITLE=\u8fd0\u884c\u65f6\u9009\u9879
INFO_JAVA_RUNTIME_OPTIONS_PANEL_STEP=\u8fd0\u884c\u65f6\u9009\u9879
INFO_JAVA_RUNTIME_OPTIONS_PANEL_INSTRUCTIONS=\u6307\u5b9a Java \u865a\u62df\u673a\u7528\u6765\u8fd0\u884c\u670d\u52a1\u5668\u548c\u5bfc\u5165\u5de5\u5177\u7684\u8fd0\u884c\u65f6\u9009\u9879\u3002
diff --git a/opendj-server-legacy/src/messages/org/opends/messages/quickSetup_zh_TW.properties b/opendj-server-legacy/src/messages/org/opends/messages/quickSetup_zh_TW.properties
index ec01b9b..52b1565 100644
--- a/opendj-server-legacy/src/messages/org/opends/messages/quickSetup_zh_TW.properties
+++ b/opendj-server-legacy/src/messages/org/opends/messages/quickSetup_zh_TW.properties
@@ -156,9 +156,6 @@
INFO_DIV_OPEN_SUCCESSFUL_BACKGROUND_2_COLOR=FFFFCC
# Only translate if the color is specific to the local
INFO_DIV_OPEN_SUCCESSFUL_BACKGROUND_3_COLOR=E1E1A7
-INFO_DOWNLOADING=\u6b63\u5728\u4e0b\u8f09...
-INFO_DOWNLOADING_ERROR=\u4e0b\u8f09\u9060\u7aef\u6a94\u6848 %s \u6642\u767c\u751f\u932f\u8aa4\u3002
-INFO_DOWNLOADING_RATIO=\u6b63\u5728\u4e0b\u8f09: %s%% \u5df2\u5b8c\u6210\u3002
INFO_EMPTY_ADMINISTRATOR_UID=\u60a8\u5fc5\u9808\u63d0\u4f9b\u5168\u57df\u7ba1\u7406\u4f7f\u7528\u8005 ID\u3002
INFO_EMPTY_DIRECTORY_MANAGER_DN=\u60a8\u5fc5\u9808\u63d0\u4f9b\u8d85\u7d1a\u4f7f\u7528\u8005 DN\u3002
INFO_EMPTY_HOST_NAME=\u60a8\u5fc5\u9808\u63d0\u4f9b\u4e3b\u6a5f\u540d\u7a31\u3002
@@ -497,7 +494,6 @@
INFO_SERVER_SECURITY_LABEL=LDAP \u5b89\u5168\u5b58\u53d6:
INFO_SERVER_SECURITY_TOOLTIP=The LDAP Secure Access Configuration for the new server.
INFO_SERVER_SETTINGS_PANEL_INSTRUCTIONS=Enter a port to listen for LDAP requests and enter a password for the server initial Root user.
-INFO_SERVER_SETTINGS_PANEL_INSTRUCTIONS_WEBSTART=Choose a location for the server files and enter a password for the server administrative user.
INFO_SERVER_SETTINGS_PANEL_TITLE=\u4f3a\u670d\u5668\u8a2d\u5b9a
INFO_SERVER_SETTINGS_STEP=\u4f3a\u670d\u5668\u8a2d\u5b9a
INFO_SETUP_LAUNCHER_GUI_LAUNCHED_FAILED=%n%n\u5716\u5f62\u5316\u8a2d\u5b9a\u555f\u52d5\u5931\u6557\u3002%n%n\u6b63\u5728\u555f\u52d5\u6307\u4ee4\u884c\u8a2d\u5b9a...
--
Gitblit v1.10.0