Used the merged version of the installer and the upgrader in the QuickSetup...

jvergara

20.33.2007 a3627a411607ce42b37b393ea9c64a4c4e5879c8

Used the merged version of the installer and the upgrader in the QuickSetup.jnlp file generated by create-webstart-standalone.sh and do no longer generate the QuickUpgrade.jnlp file 

 opends/resource/webstart/create-webstart-standalone.sh

@@ -37,12 +37,6 @@
fi
echo "INSTALL_JNLP_FILENAME:  ${INSTALL_JNLP_FILENAME}"

if test -z "${UPGRADE_JNLP_FILENAME}"
then
  UPGRADE_JNLP_FILENAME="QuickUpgrade.jnlp"
fi
echo "UPGRADE_JNLP_FILENAME:  ${UPGRADE_JNLP_FILENAME}"

if test -z "${PORT}"
then
  INSTALLER_URI="${PROTOCOL}://${ADDRESS}${BASE_PATH}"
@@ -177,7 +171,7 @@
    <jar href="lib/aspectjrt.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.Application.class" value="org.opends.quicksetup.installandupgrader.InstallAndUpgrader"/>
    <property name="org.opends.quicksetup.lazyjarurls" value="${INSTALLER_URI}/lib/OpenDS.jar ${INSTALLER_URI}/lib/zipped.jar ${INSTALLER_URI}/lib/je.jar ${INSTALLER_URI}/lib/aspectjrt.jar" />
    <property name="org.opends.quicksetup.zipfilename" value="${ZIP_FILENAME_BASE}.zip"/>
  </resources>
@@ -190,47 +184,6 @@
</jnlp>
ENDOFINSTALLJNLP

# Create the Upgrade JNLP file with the appropriate contents.
echo "Creating Upgrade JNLP file ${UPGRADE_JNLP_FILENAME} ..."
cat > "${UPGRADE_JNLP_FILENAME}" <<ENDOFUPGRADEJNLP
<?xml version="1.0" encoding="utf-8"?>
<!-- JNLP File for OpenDS QuickUpgrade Application -->
<jnlp spec="1.5+"
  codebase="${INSTALLER_URI}" href="${UPGRADE_JNLP_FILENAME}">
  <information>
    <title>OpenDS QuickUpgrade Application</title>
    <vendor>http://www.opends.org/</vendor>
    <homepage href="http://www.opends.org"/>
    <description>OpenDS QuickUpgrade Application</description>
    <description kind="short">OpenDS Web Start Upgrader</description>
    <icon href="images/opendshref.png" height="128" width="128"/>
    <icon kind="splash" href="images/opendssplash.png" height="114" width="479"/>
  </information>

  <security>
    <all-permissions/>
  </security>

  <resources>
    <j2se version="1.5+" java-vm-args="-client"/>
    <jar href="lib/quicksetup.jar" download="eager" main="true"/>
    <jar href="lib/OpenDS.jar" download="lazy"/>
    <jar href="lib/je.jar" download="lazy"/>
    <jar href="lib/aspectjrt.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.upgrader.Upgrader"/>
    <property name="org.opends.quicksetup.lazyjarurls" value="${INSTALLER_URI}/lib/OpenDS.jar ${INSTALLER_URI}/lib/zipped.jar ${INSTALLER_URI}/lib/je.jar ${INSTALLER_URI}/lib/aspectjrt.jar" />
    <property name="org.opends.quicksetup.zipfilename" value="${ZIP_FILENAME_BASE}.zip"/>
  </resources>

  <resources os="AIX">
    <j2se version="1.5+"/>
  </resources>

  <application-desc main-class="org.opends.quicksetup.SplashScreen"/>
</jnlp>
ENDOFUPGRADEJNLP

# Tell the user where the files are.
echo "The deployable content may be found in ${ROOT_DIR}/build/webstart"