You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by bu...@apache.org on 2012/04/06 18:14:57 UTC
svn commit: r811707 [1/2] - in /websites/staging/ooo-site/trunk: cgi-bin/
content/ content/distribution/cdrom/iso_download.html
content/download/download.js content/download/globalvars.js
content/download/other.html
Author: buildbot
Date: Fri Apr 6 16:14:57 2012
New Revision: 811707
Log:
Staging update by buildbot for openofficeorg
Modified:
websites/staging/ooo-site/trunk/cgi-bin/ (props changed)
websites/staging/ooo-site/trunk/content/ (props changed)
websites/staging/ooo-site/trunk/content/distribution/cdrom/iso_download.html
websites/staging/ooo-site/trunk/content/download/download.js
websites/staging/ooo-site/trunk/content/download/globalvars.js
websites/staging/ooo-site/trunk/content/download/other.html
Propchange: websites/staging/ooo-site/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Fri Apr 6 16:14:57 2012
@@ -1 +1 @@
-1310401
+1310437
Propchange: websites/staging/ooo-site/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Fri Apr 6 16:14:57 2012
@@ -1 +1 @@
-1310401
+1310437
Modified: websites/staging/ooo-site/trunk/content/distribution/cdrom/iso_download.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/distribution/cdrom/iso_download.html (original)
+++ websites/staging/ooo-site/trunk/content/distribution/cdrom/iso_download.html Fri Apr 6 16:14:57 2012
@@ -41,21 +41,16 @@ series of four CD images, one for each s
<p>
<a
-href="http://download.services.openoffice.org/files/extended/iso/en/OOo_3.3.
-0_Win_x86_install_en-US_20110219.iso">Windows<sup>®</sup></a><br />
+href="http://sourceforge.net/projects/openofficeorg.mirror/files/extended/iso/en/OOo_3.3.0_Win_x86_install_en-US_20110219.iso/download">Windows<sup>®</sup></a><br />
<a
-href="http://download.services.openoffice.org/files/extended/iso/en/OOo_3.3.
-0_Linux_all_platforms_install_20110128.iso">Linux</a><br />
+href="http://sourceforge.net/projects/openofficeorg.mirror/files/extended/iso/en/OOo_3.3.0_Linux_all_platforms_install_20110128.iso/download">Linux</a><br />
<a
-href="http://download.services.openoffice.org/files/extended/iso/en/OOo_3.3.
-0_MacOS_all_platforms_install_20110128.iso">Mac OS<sup>®</sup></a><br />
+href="http://sourceforge.net/projects/openofficeorg.mirror/files/extended/iso/en/OOo_3.3.0_MacOS_all_platforms_install_20110128.iso/download">Mac OS<sup>®</sup></a><br />
<a
-href="http://download.services.openoffice.org/files/extended/iso/en/OOo_3.3.
-0_Solaris_all_platforms_install_20110128.iso">Solaris<sup>®</sup></a><br />
+href="http://sourceforge.net/projects/openofficeorg.mirror/files/extended/iso/en/OOo_3.3.0_Solaris_all_platforms_install_20110128.iso/download">Solaris<sup>®</sup></a><br />
<br />
<a
-href="http://download.services.openoffice.org/files/extended/iso/en/OOo_3.3.
-0_md5sums.txt">MD5 checksums</a></p>
+href="http://sourceforge.net/projects/openofficeorg.mirror/files/extended/iso/en/OOo_3.3.0_md5sums.txt/download">MD5 checksums</a></p>
<br />
<h2>Release Notes:</h2>
Modified: websites/staging/ooo-site/trunk/content/download/download.js
==============================================================================
--- websites/staging/ooo-site/trunk/content/download/download.js (original)
+++ websites/staging/ooo-site/trunk/content/download/download.js Fri Apr 6 16:14:57 2012
@@ -147,6 +147,12 @@ function getLink( version, mirror ) {
}
}
+function sourceforge_getLink(version, schema) {
+ var mirrorbrain_link = mirrorbrain_getLink(version, schema);
+ sf_link = mirrorbrain_link.replace(MIRROR_MIRRORBRAIN_URL, MIRROR_SOURCEFORGE_URL) + '/download';
+ return sf_link;
+}
+
/*
* get link
* depends on array-list and download-set nameschema
@@ -157,6 +163,8 @@ function getLink( version, mirror, schem
return bouncer_getLink( version );
} else if ( mirror.indexOf( "mirrorbrain" ) > -1 ) {
return mirrorbrain_getLink( version, schema );
+ } else if ( mirror.indexOf( "sourceforge" ) > -1 ) {
+ return sourceforge_getLink( version, schema );
} else {
return bouncer_getLink( version );
}
Modified: websites/staging/ooo-site/trunk/content/download/globalvars.js
==============================================================================
--- websites/staging/ooo-site/trunk/content/download/globalvars.js (original)
+++ websites/staging/ooo-site/trunk/content/download/globalvars.js Fri Apr 6 16:14:57 2012
@@ -15,7 +15,7 @@
// The most recent stable release
var VERSION = "3.3.0";
-var MIRROR = "mirrorbrain";
+var MIRROR = "sourceforge";
var SCHEMA = "new";
// The minimal needed JRE version for the stable release
@@ -95,6 +95,7 @@ var TEST_SCHEMA = "old";
var MIRROR_BOUNCER_URL = "http://openoffice.bouncer.osuosl.org/";
var MIRROR_MIRRORBRAIN_URL = "http://openoffice.mirrorbrain.org/";
var MIRROR_MIRRORBRAIN2_URL = "http://download.services.openoffice.org/";
+var MIRROR_SOURCEFORGE_URL = "http://sourceforge.net/projects/openofficeorg.mirror/";
// Variables to shortcut long URLs
var MIRROR_MAC_PPC_URL = "http://ooopackages.good-day.net/pub/OpenOffice.org/contrib/macosppc/";