mirror of https://github.com/OpenIdentityPlatform/OpenDJ.git

Jean-Noel Rouvignac
11.35.2013 de222bc3328fea167704bf61b2461687eed9c332
(CR-1535) Fixed QuickSetup.jnlp after adding the HTTP connection handler and all its jars

create-webstart-standalone.sh:
Iterate over the JARs in the lib directory in order to dynamically build the list of JARs.
Note: 'ant resolve' must be run prior to running this script when running this script from an svn checkout.
It is like this since Apache Ivy has been added and JARs have been removed from the 'lib' directory.
1 files modified
37 ■■■■ changed files
opends/resource/webstart/create-webstart-standalone.sh 37 ●●●● patch | view | raw | blame | history
opends/resource/webstart/create-webstart-standalone.sh
@@ -166,7 +166,15 @@
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
# 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}
do
  echo "Signing ${LIBFILE} ..."
  cp "${PKG_LIB_DIR}/${LIBFILE}" "${INSTALL_DIR}/lib"
@@ -211,12 +219,33 @@
  <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"/>
    <property name="org.opends.quicksetup.lazyjarurls" value="${INSTALLER_URI}/lib/${PRODUCT_NAME}.jar ${INSTALLER_URI}/lib/zipped.jar ${INSTALLER_URI}/lib/je.jar" />
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.zipfilename" value="${ZIP_FILENAME_BASE}.zip"/>
  </resources>