From db8f3177e8702d02c5db8c3c90e54a732fcef1c7 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 11 Apr 2013 11:17:02 +0000
Subject: [PATCH] Undid changes done in revision 8727. JNLP was apparently not broken.
---
opends/resource/webstart/create-webstart-standalone.sh | 37 ++++---------------------------------
1 files changed, 4 insertions(+), 33 deletions(-)
diff --git a/opends/resource/webstart/create-webstart-standalone.sh b/opends/resource/webstart/create-webstart-standalone.sh
index 1d65878..7fcf580 100755
--- a/opends/resource/webstart/create-webstart-standalone.sh
+++ b/opends/resource/webstart/create-webstart-standalone.sh
@@ -166,15 +166,7 @@
CERT_KEYSTORE="${ROOT_DIR}/tests/unit-tests-testng/resource/server.keystore"
CERT_KEYSTORE_PIN="password"
CERT_ALIAS="server-cert"
-
-# The 'grep -v' filters out localization jars
-for LIBFILE in `ls ${PKG_LIB_DIR}/*.jar | grep -v "${PRODUCT_NAME}_"`
-do
- LIBFILE=`basename "${LIBFILE}"`
- LIBFILES="${LIBFILES} ${LIBFILE}"
-done
-
-for LIBFILE in ${LIBFILES}
+for LIBFILE in "${PRODUCT_NAME}.jar" je.jar quicksetup.jar
do
echo "Signing ${LIBFILE} ..."
cp "${PKG_LIB_DIR}/${LIBFILE}" "${INSTALL_DIR}/lib"
@@ -219,33 +211,12 @@
<resources>
<j2se version="1.6+" java-vm-args="-client"/>
<jar href="lib/quicksetup.jar" download="eager" main="true"/>
+ <jar href="lib/${PRODUCT_NAME}.jar" download="lazy"/>
+ <jar href="lib/je.jar" download="lazy"/>
<jar href="lib/zipped.jar" download="lazy"/>
-ENDOFINSTALLJNLP
-
-for LIBFILE in ${LIBFILES}
-do
- if test "${LIBFILE}" != "quicksetup.jar"
- then
- echo " <jar href=\"lib/${LIBFILE}.jar\" download=\"lazy\"/>" >> "${INSTALL_JNLP_FILENAME}"
- fi
-done
-
-cat >> "${INSTALL_JNLP_FILENAME}" <<ENDOFINSTALLJNLP
<property name="org.opends.quicksetup.iswebstart" value="true" />
<property name="org.opends.quicksetup.Application.class" value="org.opends.quicksetup.installandupgrader.InstallAndUpgrader"/>
-ENDOFINSTALLJNLP
-
-echo -n " <property name=\"org.opends.quicksetup.lazyjarurls\" value=\"${INSTALLER_URI}/lib/zipped.jar" >> "${INSTALL_JNLP_FILENAME}"
-for LIBFILE in ${LIBFILES}
-do
- if test "${LIBFILE}" != "quicksetup.jar"
- then
- echo -n " ${INSTALLER_URI}/lib/${LIBFILE}" >> "${INSTALL_JNLP_FILENAME}"
- fi
-done
-echo "\" />" >> "${INSTALL_JNLP_FILENAME}"
-
-cat >> "${INSTALL_JNLP_FILENAME}" <<ENDOFINSTALLJNLP
+ <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>
--
Gitblit v1.10.0