Return-Path: 
 <ooo-commits-return-8244-apmail-incubator-ooo-commits-archive=incubator.apache.org@incubator.apache.org>
X-Original-To: apmail-incubator-ooo-commits-archive@minotaur.apache.org
Delivered-To: apmail-incubator-ooo-commits-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id BD78F91D9
	for <apmail-incubator-ooo-commits-archive@minotaur.apache.org>;
 Fri,  6 Apr 2012 16:14:34 +0000 (UTC)
Received: (qmail 65580 invoked by uid 500); 6 Apr 2012 16:14:34 -0000
Delivered-To: apmail-incubator-ooo-commits-archive@incubator.apache.org
Received: (qmail 65539 invoked by uid 500); 6 Apr 2012 16:14:34 -0000
Mailing-List: contact ooo-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:ooo-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:ooo-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:ooo-commits@incubator.apache.org>
List-Id: <ooo-commits.incubator.apache.org>
Reply-To: ooo-dev@incubator.apache.org
Delivered-To: mailing list ooo-commits@incubator.apache.org
Received: (qmail 65529 invoked by uid 99); 6 Apr 2012 16:14:34 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 06 Apr 2012 16:14:34 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 06 Apr 2012 16:14:30 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id DFC2A23888EA;
	Fri,  6 Apr 2012 16:14:08 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1310437 [1/2] - in
 /incubator/ooo/ooo-site/trunk/content:
 distribution/cdrom/iso_download.html download/download.js
 download/globalvars.js download/other.html
Date: Fri, 06 Apr 2012 16:14:08 -0000
To: ooo-commits@incubator.apache.org
From: robweir@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20120406161408.DFC2A23888EA@eris.apache.org>

Author: robweir
Date: Fri Apr  6 16:14:08 2012
New Revision: 1310437

URL: http://svn.apache.org/viewvc?rev=1310437&view=rev
Log:
Direct legacy downloads to SourceForge (patch from BZ 119194)

Modified:
    incubator/ooo/ooo-site/trunk/content/distribution/cdrom/iso_download.html
    incubator/ooo/ooo-site/trunk/content/download/download.js
    incubator/ooo/ooo-site/trunk/content/download/globalvars.js
    incubator/ooo/ooo-site/trunk/content/download/other.html

Modified: incubator/ooo/ooo-site/trunk/content/distribution/cdrom/iso_download.html
URL: http://svn.apache.org/viewvc/incubator/ooo/ooo-site/trunk/content/distribution/cdrom/iso_download.html?rev=1310437&r1=1310436&r2=1310437&view=diff
==============================================================================
--- incubator/ooo/ooo-site/trunk/content/distribution/cdrom/iso_download.html (original)
+++ incubator/ooo/ooo-site/trunk/content/distribution/cdrom/iso_download.html Fri Apr  6 16:14:08 2012
@@ -26,21 +26,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>&reg;</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>&reg;</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>&reg;</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>&reg;</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>&reg;</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>&reg;</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: incubator/ooo/ooo-site/trunk/content/download/download.js
URL: http://svn.apache.org/viewvc/incubator/ooo/ooo-site/trunk/content/download/download.js?rev=1310437&r1=1310436&r2=1310437&view=diff
==============================================================================
--- incubator/ooo/ooo-site/trunk/content/download/download.js (original)
+++ incubator/ooo/ooo-site/trunk/content/download/download.js Fri Apr  6 16:14:08 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: incubator/ooo/ooo-site/trunk/content/download/globalvars.js
URL: http://svn.apache.org/viewvc/incubator/ooo/ooo-site/trunk/content/download/globalvars.js?rev=1310437&r1=1310436&r2=1310437&view=diff
==============================================================================
--- incubator/ooo/ooo-site/trunk/content/download/globalvars.js (original)
+++ incubator/ooo/ooo-site/trunk/content/download/globalvars.js Fri Apr  6 16:14:08 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/";