mirror of https://github.com/OpenIdentityPlatform/OpenDJ.git
opends/build.xml
@@ -2593,7 +2593,7 @@ </javac> </target> <import file="build-svr4.xml"/> <!-- import file="build-svr4.xml"/ --> <!-- Copy NDB Backend dependencies to build lib directory --> <target name="copyndbdeps" if="ismysqldirpresent" opends/resource/config/config.ldif
@@ -2369,7 +2369,7 @@ objectClass: top objectClass: ds-cfg-virtual-attribute objectClass: ds-cfg-entry-uuid-virtual-attribute cn: entryUUIUD cn: entryUUID ds-cfg-java-class: org.opends.server.extensions.EntryUUIDVirtualAttributeProvider ds-cfg-enabled: true ds-cfg-attribute-type: entryUUID opends/resource/images/opends_logo.pngopends/resource/mac/ControlPanel.app/Contents/Info.plist
@@ -3,7 +3,7 @@ <plist version="0.9"> <dict> <key>CFBundleName</key> <string>OpenDS Control Panel</string> <string>OpenDJ Control Panel</string> <key>CFBundleIdentifier</key> <string>org.opends.guitools.controlpanel.ControlPanelLauncher</string> <key>CFBundleVersion</key> @@ -32,20 +32,20 @@ <string>1.6+</string> <key>ClassPath</key> <array> <string>$JAVAROOT/../../../../../lib/OpenDS.jar</string> <string>$JAVAROOT/../../../../../lib/OpenDJ.jar</string> <string>$JAVAROOT/../../../../../lib/activation.jar</string> <string>$JAVAROOT/../../../../../lib/je.jar</string> <string>$JAVAROOT/../../../../../lib/mail.jar</string> <string>$JAVAROOT/../../../../../lib/quicksetup.jar</string> <string>$JAVAROOT/../../../../../lib/OpenDS_ca_ES.jar</string> <string>$JAVAROOT/../../../../../lib/OpenDS_de.jar</string> <string>$JAVAROOT/../../../../../lib/OpenDS_es.jar</string> <string>$JAVAROOT/../../../../../lib/OpenDS_fr.jar</string> <string>$JAVAROOT/../../../../../lib/OpenDS_ja.jar</string> <string>$JAVAROOT/../../../../../lib/OpenDS_ko.jar</string> <string>$JAVAROOT/../../../../../lib/OpenDS_pl.jar</string> <string>$JAVAROOT/../../../../../lib/OpenDS_zh_CN.jar</string> <string>$JAVAROOT/../../../../../lib/OpenDS_zh_TW.jar</string> <string>$JAVAROOT/../../../../../lib/OpenDJ_ca_ES.jar</string> <string>$JAVAROOT/../../../../../lib/OpenDJ_de.jar</string> <string>$JAVAROOT/../../../../../lib/OpenDJ_es.jar</string> <string>$JAVAROOT/../../../../../lib/OpenDJ_fr.jar</string> <string>$JAVAROOT/../../../../../lib/OpenDJ_ja.jar</string> <string>$JAVAROOT/../../../../../lib/OpenDJ_ko.jar</string> <string>$JAVAROOT/../../../../../lib/OpenDJ_pl.jar</string> <string>$JAVAROOT/../../../../../lib/OpenDJ_zh_CN.jar</string> <string>$JAVAROOT/../../../../../lib/OpenDJ_zh_TW.jar</string> </array> </dict> </dict> opends/resource/mac/QuickSetup.app/Contents/Info.plist
@@ -3,7 +3,7 @@ <plist version="0.9"> <dict> <key>CFBundleName</key> <string>OpenDS QuickSetup</string> <string>OpenDJ QuickSetup</string> <key>CFBundleIdentifier</key> <string>org.opends.quicksetup.installer.SetupLauncher</string> <key>CFBundleVersion</key> @@ -32,20 +32,20 @@ <string>1.6+</string> <key>ClassPath</key> <array> <string>$JAVAROOT/../../../../lib/OpenDS.jar</string> <string>$JAVAROOT/../../../../lib/OpenDJ.jar</string> <string>$JAVAROOT/../../../../lib/activation.jar</string> <string>$JAVAROOT/../../../../lib/je.jar</string> <string>$JAVAROOT/../../../../lib/mail.jar</string> <string>$JAVAROOT/../../../../lib/quicksetup.jar</string> <string>$JAVAROOT/../../../../lib/OpenDS_ca_ES.jar</string> <string>$JAVAROOT/../../../../lib/OpenDS_de.jar</string> <string>$JAVAROOT/../../../../lib/OpenDS_es.jar</string> <string>$JAVAROOT/../../../../lib/OpenDS_fr.jar</string> <string>$JAVAROOT/../../../../lib/OpenDS_ja.jar</string> <string>$JAVAROOT/../../../../lib/OpenDS_ko.jar</string> <string>$JAVAROOT/../../../../lib/OpenDS_pl.jar</string> <string>$JAVAROOT/../../../../lib/OpenDS_zh_CN.jar</string> <string>$JAVAROOT/../../../../lib/OpenDS_zh_TW.jar</string> <string>$JAVAROOT/../../../../lib/OpenDJ_ca_ES.jar</string> <string>$JAVAROOT/../../../../lib/OpenDJ_de.jar</string> <string>$JAVAROOT/../../../../lib/OpenDJ_es.jar</string> <string>$JAVAROOT/../../../../lib/OpenDJ_fr.jar</string> <string>$JAVAROOT/../../../../lib/OpenDJ_ja.jar</string> <string>$JAVAROOT/../../../../lib/OpenDJ_ko.jar</string> <string>$JAVAROOT/../../../../lib/OpenDJ_pl.jar</string> <string>$JAVAROOT/../../../../lib/OpenDJ_zh_CN.jar</string> <string>$JAVAROOT/../../../../lib/OpenDJ_zh_TW.jar</string> </array> </dict> </dict> opends/resource/mac/Uninstall.app/Contents/Info.plist
@@ -3,7 +3,7 @@ <plist version="0.9"> <dict> <key>CFBundleName</key> <string>OpenDS Uninstall</string> <string>OpenDJ Uninstall</string> <key>CFBundleIdentifier</key> <string>org.opends.guitools.uninstaller.UninstallLauncher</string> <key>CFBundleVersion</key> @@ -32,20 +32,19 @@ <string>1.6+</string> <key>ClassPath</key> <array> <string>$JAVAROOT/../../../../lib/OpenDS.jar</string> <string>$JAVAROOT/../../../../lib/OpenDJ.jar</string> <string>$JAVAROOT/../../../../lib/activation.jar</string> <string>$JAVAROOT/../../../../lib/je.jar</string> <string>$JAVAROOT/../../../../lib/mail.jar</string> <string>$JAVAROOT/../../../../lib/quicksetup.jar</string> <string>$JAVAROOT/../../../../lib/OpenDS_ca_ES.jar</string> <string>$JAVAROOT/../../../../lib/OpenDS_de.jar</string> <string>$JAVAROOT/../../../../lib/OpenDS_es.jar</string> <string>$JAVAROOT/../../../../lib/OpenDS_fr.jar</string> <string>$JAVAROOT/../../../../lib/OpenDS_ja.jar</string> <string>$JAVAROOT/../../../../lib/OpenDS_ko.jar</string> <string>$JAVAROOT/../../../../lib/OpenDS_pl.jar</string> <string>$JAVAROOT/../../../../lib/OpenDS_zh_CN.jar</string> <string>$JAVAROOT/../../../../lib/OpenDS_zh_TW.jar</string> <string>$JAVAROOT/../../../../lib/OpenDJ_ca_ES.jar</string> <string>$JAVAROOT/../../../../lib/OpenDJ_de.jar</string> <string>$JAVAROOT/../../../../lib/OpenDJ_es.jar</string> <string>$JAVAROOT/../../../../lib/OpenDJ_fr.jar</string> <string>$JAVAROOT/../../../../lib/OpenDJ_ja.jar</string> <string>$JAVAROOT/../../../../lib/OpenDJ_pl.jar</string> <string>$JAVAROOT/../../../../lib/OpenDJ_zh_CN.jar</string> <string>$JAVAROOT/../../../../lib/OpenDJ_zh_TW.jar</string> </array> </dict> </dict> opends/resource/webstart/create-webstart-standalone.sh
@@ -1,5 +1,6 @@ #!/bin/sh GREP="/usr/bin/grep" # Determine the location to this script so that we know where we are in the # OpenDS source tree. @@ -8,7 +9,19 @@ 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. @@ -20,14 +33,14 @@ if test -z "${ADDRESS}" then ADDRESS="www.opends.org" ADDRESS="www.forgerock.com" fi echo "ADDRESS: ${ADDRESS}" echo "PORT: ${PORT}" if test -z "${BASE_PATH}" then BASE_PATH="/install" BASE_PATH="/downloads/opendj/latest/install" fi echo "BASE_PATH: ${BASE_PATH}" @@ -78,6 +91,7 @@ fi # Make sure that the OpenDS build directory exists. If not, then create it. if test -z "${BUILD_DIR}" then BUILD_DIR="${ROOT_DIR}/build" @@ -101,7 +115,7 @@ # Determine what the name should be for the OpenDS zip file name, but without # the ".zip" extension. ZIP_FILEPATH=`ls ${BUILD_DIR}/package/OpenDS*.zip` ZIP_FILEPATH=`ls ${BUILD_DIR}/package/${PRODUCT_NAME}*.zip` ZIP_FILENAME=`basename ${ZIP_FILEPATH}` ZIP_FILENAME_BASE=`echo ${ZIP_FILENAME} | sed -e 's/\.zip//'` @@ -121,12 +135,15 @@ find "${INSTALL_DIR}/images" -type d -name '.svn' -exec rm -rf {} \; # Copy the appropriate OpenDS library files and make sure they are signed. # 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 OpenDS.jar je.jar quicksetup.jar for LIBFILE in ${PRODUCT_NAME}.jar je.jar quicksetup.jar \ ${PRODUCT_NAME}_fr.jar ${PRODUCT_NAME}_zh_CN.jar ${PRODUCT_NAME}_ca_ES.jar \ ${PRODUCT_NAME}_ja.jar ${PRODUCT_NAME}_zh_TW.jar ${PRODUCT_NAME}_de.jar \ ${PRODUCT_NAME}_ko.jar ${PRODUCT_NAME}_es.jar ${PRODUCT_NAME}_pl.jar do echo "Signing ${LIBFILE} ..." cp "${PKG_LIB_DIR}/${LIBFILE}" "${INSTALL_DIR}/lib" @@ -151,15 +168,15 @@ cd .. cat > "${INSTALL_JNLP_FILENAME}" <<ENDOFINSTALLJNLP <?xml version="1.0" encoding="utf-8"?> <!-- JNLP File for OpenDS QuickSetup Application --> <!-- JNLP File for ${PRODUCT_NAME} QuickSetup Application --> <jnlp spec="1.5+" codebase="${INSTALLER_URI}" href="${INSTALL_JNLP_FILENAME}"> <information> <title>OpenDS QuickSetup Application</title> <vendor>http://www.opends.org/</vendor> <homepage href="http://www.opends.org"/> <description>OpenDS QuickSetup Application</description> <description kind="short">OpenDS Web Start Installer</description> <title>${PRODUCT_NAME} QuickSetup Application</title> <vendor>http://www.forgerock.com/</vendor> <homepage href="http://www.forgerock.com/opendj.html"/> <description>${PRODUCT_NAME} QuickSetup Application</description> <description kind="short">${PRODUCT_NAME} Web Start Installer</description> <icon href="images/opendshref.png" height="128" width="128"/> <icon kind="splash" href="images/opendssplash.png" height="114" width="479"/> </information> @@ -171,12 +188,23 @@ <resources> <j2se version="1.6+" java-vm-args="-client"/> <jar href="lib/quicksetup.jar" download="eager" main="true"/> <jar href="lib/OpenDS.jar" download="lazy"/> <jar href="lib/${PRODUCT_NAME}.jar" download="lazy"/> <jar href="lib/je.jar" download="lazy"/> <jar href="lib/zipped.jar" download="lazy"/> <jar href="lib/${PRODUCT_NAME}_ca_ES.jar" download="lazy"/> <jar href="lib/${PRODUCT_NAME}_de.jar" download="lazy"/> <jar href="lib/${PRODUCT_NAME}_fr.jar" download="lazy"/> <jar href="lib/${PRODUCT_NAME}_es.jar" download="lazy"/> <jar href="lib/${PRODUCT_NAME}_ja.jar" download="lazy"/> <jar href="lib/${PRODUCT_NAME}_ko.jar" download="lazy"/> <jar href="lib/${PRODUCT_NAME}_pl.jar" download="lazy"/> <jar href="lib/${PRODUCT_NAME}_zh_CN_.jar" download="lazy"/> <jar href="lib/${PRODUCT_NAME}_zh_TW.jar" download="lazy"/> <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/OpenDS.jar ${INSTALLER_URI}/lib/zipped.jar ${INSTALLER_URI}/lib/je.jar" /> <property name="org.opends.quicksetup.lazyjarurls" value="${INSTALLER_URI}/lib/${PRODUCT_NAME}.jar ${INSTALLER_URI}/lib/zipped.jar ${INSTALLER_URI}/lib/je.jar ${INSTALLER_URI}/lib/${PRODUCT_NAME}_ca_ES.jar ${INSTALLER_URI}/lib/${PRODUCT_NAME}_de.jar ${INSTALLER_URI}/lib/${PRODUCT_NAME}_es.jar ${INSTALLER_URI}/lib/${PRODUCT_NAME}_fr.jar ${INSTALLER_URI}/lib/${PRODUCT_NAME}_ja.jar ${INSTALLER_URI}/lib/${PRODUCT_NAME}_ko.jar ${INSTALLER_URI}/lib/${PRODUCT_NAME}_pl.jar ${INSTALLER_URI}/lib/${PRODUCT_NAME}_zh_CN.jar ${INSTALLER_URI}/lib/${PRODUCT_NAME}_zh_TW.jar" /> <property name="org.opends.quicksetup.zipfilename" value="${ZIP_FILENAME_BASE}.zip"/> </resources>
@@ -2,7 +2,7 @@ <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> <assemblyIdentity version="1.0.0.0" processorArchitecture="X86" name="opends_service" type="win32"/> <description>Executable used to run OpenDS as a Windows Service</description> <description>Executable used to run OpenDJ as a Windows Service</description> <!-- Identify the application security requirements. --> <ms_asmv2:trustInfo xmlns:ms_asmv2="urn:schemas-microsoft-com:asm.v2"> <ms_asmv2:security> opends/src/quicksetup/org/opends/quicksetup/images/opendsbackground.pngopends/src/quicksetup/org/opends/quicksetup/images/opendssplash.pngopends/src/server/org/opends/server/admin/AdministrationConnector.java
@@ -105,7 +105,7 @@ private static final String ADMIN_CLASS_NAME = "org.opends.server.protocols.ldap.LDAPConnectionHandler"; private static final boolean ADMIN_ALLOW_LDAP_V2 = true; private static final boolean ADMIN_ALLOW_LDAP_V2 = false; private static final boolean ADMIN_ALLOW_START_TLS = false;
