Author: buildbot Date: Wed May 28 22:53:50 2014 New Revision: 910339 Log: Staging update by buildbot for ooo-site
Modified: websites/staging/ooo-site/trunk/cgi-bin/ (props changed) websites/staging/ooo-site/trunk/content/ (props changed) websites/staging/ooo-site/trunk/content/download/test/download_droplist.js Propchange: websites/staging/ooo-site/trunk/cgi-bin/ ------------------------------------------------------------------------------ --- cms:source-revision (original) +++ cms:source-revision Wed May 28 22:53:50 2014 @@ -1 +1 @@ -1598164 +1598165 Propchange: websites/staging/ooo-site/trunk/content/ ------------------------------------------------------------------------------ --- cms:source-revision (original) +++ cms:source-revision Wed May 28 22:53:50 2014 @@ -1 +1 @@ -1598164 +1598165 Modified: websites/staging/ooo-site/trunk/content/download/test/download_droplist.js ============================================================================== --- websites/staging/ooo-site/trunk/content/download/test/download_droplist.js (original) +++ websites/staging/ooo-site/trunk/content/download/test/download_droplist.js Wed May 28 22:53:50 2014 @@ -104,6 +104,8 @@ function initVars() { APACHE_BASE_URL = ""; // The base URL for all binary files on Apache APACHE_DIST_BASE_URL = ""; // The base URL for all checksum files on Apache APACHE_DIST_PREVIOUS_URL = ""; // The base URL for all checksum files (prev. version) on Apache + APACHE_ARC_BASE_URL = ""; // The base URL for all checksum files on Apache + APACHE_ARC_PREVIOUS_URL = ""; // The base URL for all checksum files (prev. version) on Apache SF = false; // Does the download URL points to Soureforge? OTHER = false; // Does the download URL points to 'other.html'? ARCHIVE = false; // Does the download URL points to the ASF archive? @@ -1006,10 +1008,11 @@ function getLink( rel_mode ) { SOURCEFORGE_PREVIOUS_URL = SOURCEFORGE + PRE_VERSION + "/binaries/"; APACHE_DIST_PREVIOUS_URL = APACHE_DIST + PRE_VERSION; + APACHE_ARC_PREVIOUS_URL = APACHE_ARC + PRE_VERSION; LINK_FULL = SOURCEFORGE_PREVIOUS_URL + LANG_ISO + "/"; LINK_FULL = LINK_FULL + FILENAME_FULL + "/download"; - +/* LINK_CHK_KEYS = "https://people.apache.org/keys/group/openoffice.asc"; LINK_CHK_ASC_FULL = APACHE_DIST_PREVIOUS_URL + "/binaries/" + LANG_ISO + "/"; @@ -1020,6 +1023,17 @@ function getLink( rel_mode ) { LINK_CHK_SHA256_FULL = APACHE_DIST_PREVIOUS_URL + "/binaries/" + LANG_ISO + "/"; LINK_CHK_SHA256_FULL = LINK_CHECKSUM_SHA256_FULL + FILENAME_FULL + ".sha256"; +*/ + LINK_CHK_KEYS = "https://people.apache.org/keys/group/openoffice.asc"; + + LINK_CHK_ASC_FULL = APACHE_ARC_PREVIOUS_URL + "/binaries/" + LANG_ISO + "/"; + LINK_CHK_ASC_FULL = LINK_CHECKSUM_ASC_FULL + FILENAME_FULL + ".asc"; + + LINK_CHK_MD5_FULL = APACHE_ARC_PREVIOUS_URL + "/binaries/" + LANG_ISO + "/"; + LINK_CHK_MD5_FULL = LINK_CHECKSUM_MD5_FULL + FILENAME_FULL + ".md5"; + + LINK_CHK_SHA256_FULL = APACHE_ARC_PREVIOUS_URL + "/binaries/" + LANG_ISO + "/"; + LINK_CHK_SHA256_FULL = LINK_CHECKSUM_SHA256_FULL + FILENAME_FULL + ".sha256"; SF = false; OTHER = false; @@ -1079,14 +1093,20 @@ function getLink( rel_mode ) { getFilename( VERSION ); SOURCEFORGE_BASE_URL = SOURCEFORGE + VERSION + "/binaries/"; - APACHE_DIST_BASE_URL = APACHE_DIST + VERSION; +// APACHE_DIST_BASE_URL = APACHE_DIST + VERSION; + APACHE_ARC_BASE_URL = APACHE_ARC + VERSION; LINK_FULL = SOURCEFORGE_BASE_URL + LANG_ISO + "/" + FILENAME_FULL + "/download"; - +/* LINK_CHECKSUM_KEYS = "https://people.apache.org/keys/group/openoffice.asc"; LINK_CHECKSUM_ASC_FULL = APACHE_DIST_BASE_URL + "/binaries/" + LANG_ISO + "/" + FILENAME_FULL + ".asc"; LINK_CHECKSUM_MD5_FULL = APACHE_DIST_BASE_URL + "/binaries/" + LANG_ISO + "/" + FILENAME_FULL + ".md5"; LINK_CHECKSUM_SHA256_FULL = APACHE_DIST_BASE_URL + "/binaries/" + LANG_ISO + "/" + FILENAME_FULL + ".sha256"; +*/ + LINK_CHECKSUM_KEYS = "https://people.apache.org/keys/group/openoffice.asc"; + LINK_CHECKSUM_ASC_FULL = APACHE_ARC_BASE_URL + "/binaries/" + LANG_ISO + "/" + FILENAME_FULL + ".asc"; + LINK_CHECKSUM_MD5_FULL = APACHE_ARC_BASE_URL + "/binaries/" + LANG_ISO + "/" + FILENAME_FULL + ".md5"; + LINK_CHECKSUM_SHA256_FULL = APACHE_ARC_BASE_URL + "/binaries/" + LANG_ISO + "/" + FILENAME_FULL + ".sha256"; SF = true; OTHER = false; @@ -1229,12 +1249,13 @@ function getLinkSel( rel_mode ) { getFilename( VERSION_SEL ); SOURCEFORGE_BASE_URL = SOURCEFORGE + VERSION_SEL + "/binaries/"; - APACHE_DIST_BASE_URL = APACHE_DIST + VERSION_SEL; +// APACHE_DIST_BASE_URL = APACHE_DIST + VERSION_SEL; + APACHE_ARC_BASE_URL = APACHE_ARC + VERSION_SEL; // Assign the file name (column 3) from the release matrix of language and platform. LINK_FULL = SOURCEFORGE_BASE_URL + LANG_SEL + "/" + FILENAME_FULL + "/download"; LINK_LP = SOURCEFORGE_BASE_URL + LANG_SEL + "/" + FILENAME_LP + "/download"; - +/* LINK_CHK_KEYS = "https://people.apache.org/keys/group/openoffice.asc"; LINK_CHK_ASC_FULL = APACHE_DIST_BASE_URL + "/binaries/" + LANG_SEL + "/" + FILENAME_FULL + ".asc"; LINK_CHK_MD5_FULL = APACHE_DIST_BASE_URL + "/binaries/" + LANG_SEL + "/" + FILENAME_FULL + ".md5"; @@ -1243,6 +1264,15 @@ function getLinkSel( rel_mode ) { LINK_CHK_ASC_LP = APACHE_DIST_BASE_URL + "/binaries/" + LANG_SEL + "/" + FILENAME_LP + ".asc"; LINK_CHK_MD5_LP = APACHE_DIST_BASE_URL + "/binaries/" + LANG_SEL + "/" + FILENAME_LP + ".md5"; LINK_CHK_SHA256_LP = APACHE_DIST_BASE_URL + "/binaries/" + LANG_SEL + "/" + FILENAME_LP + ".sha256"; +*/ + LINK_CHK_KEYS = "https://people.apache.org/keys/group/openoffice.asc"; + LINK_CHK_ASC_FULL = APACHE_ARC_BASE_URL + "/binaries/" + LANG_SEL + "/" + FILENAME_FULL + ".asc"; + LINK_CHK_MD5_FULL = APACHE_ARC_BASE_URL + "/binaries/" + LANG_SEL + "/" + FILENAME_FULL + ".md5"; + LINK_CHK_SHA256_FULL = APACHE_ARC_BASE_URL + "/binaries/" + LANG_SEL + "/" + FILENAME_FULL + ".sha256"; + + LINK_CHK_ASC_LP = APACHE_ARC_BASE_URL + "/binaries/" + LANG_SEL + "/" + FILENAME_LP + ".asc"; + LINK_CHK_MD5_LP = APACHE_ARC_BASE_URL + "/binaries/" + LANG_SEL + "/" + FILENAME_LP + ".md5"; + LINK_CHK_SHA256_LP = APACHE_ARC_BASE_URL + "/binaries/" + LANG_SEL + "/" + FILENAME_LP + ".sha256"; SF = true; OTHER = false; @@ -1774,6 +1804,7 @@ function alertDbg( location ) { // + "TYPE: " + "\t\t\t\t\t\t" + TYPE + "\n" + "SOURCEFORGE_BASE_URL: " + "\t\t\t" + SOURCEFORGE_BASE_URL + "\n" + "APACHE_DIST_BASE_URL: " + "\t\t\t\t" + APACHE_DIST_BASE_URL + "\n" + + "APACHE_ARC_BASE_URL: " + "\t\t\t\t" + APACHE_ARC_BASE_URL + "\n" // + "LINK: " + "\t\t\t\t\t\t" + LINK + "\n" + "LINK_FULL: " + "\t\t\t\t\t\t" + LINK_FULL + "\n" + "LINK_LP: " + "\t\t\t\t\t\t\t" + LINK_LP + "\n"