From f6c3a8a4c115d322a9793f79746dc7a4a810645d Mon Sep 17 00:00:00 2001
From: Wyclif Luyima <wyclif@openmrs.org>
Date: Fri, 11 Feb 2011 20:00:24 +0000
Subject: [PATCH] Updating MySql and Java download URLs as follow up to, Fix
 installer target in build.xml - TRUNK-1687

git-svn-id: http://svn.openmrs.org/openmrs/trunk@18189 5bac5841-c719-aa4e-b3fe-cce5062f897a
---
 build.properties                       | 6 +++---
 metadata/installer/installer_setup.nsh | 4 ++--
 metadata/installer/openmrs_offline.nsi | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/build.properties b/build.properties
index effe0de1b293..09b6cebb2c01 100644
--- a/build.properties
+++ b/build.properties
@@ -4,14 +4,14 @@
 #                                                  #
 ####################################################
 
-jdk.filename=jdk-6u20-ea-bin-b02-windows-i586-01_apr_2010.exe
-mysql.filename=mysql-essential-5.1.53-win32.msi
+jdk.filename=jdk-6u25-ea-bin-b01-windows-i586-27_jan_2011.exe
+mysql.filename=mysql-essential-5.1.55-win32.msi
 tomcat.filename=apache-tomcat-6.0.26.exe
 build.dir=${basedir}/build
 metadata.dir=${basedir}/metadata
 webapp.target=${basedir}/webapp/target
 installer-dependencies.dir=${build.dir}/installer
-jdk.download.url=http://download.java.net/jdk6/6u21/promoted/b02/binaries/${jdk.filename}
+jdk.download.url=http://download.java.net/jdk6/6u25/promoted/b01/binaries/${jdk.filename}
 mysql.download.url=http://mirror.cogentco.com/pub/mysql/MySQL-5.1/${mysql.filename}
 tomcat.download.url=http://archive.apache.org/dist/tomcat/tomcat-6/v6.0.26/bin/${tomcat.filename}
 openmrs.download.url=http://downloads.sourceforge.net/project/openmrsdev/prereleases/OpenMRS_1.8.0_Beta/openmrs.war
diff --git a/metadata/installer/installer_setup.nsh b/metadata/installer/installer_setup.nsh
index fa3ef50688a1..02ac7ba24c95 100644
--- a/metadata/installer/installer_setup.nsh
+++ b/metadata/installer/installer_setup.nsh
@@ -350,7 +350,7 @@ FunctionEnd
 ;Downloads and installs Java 6
 Function InstallJava
 	${If} $JavaExists == false
-        StrCpy $JavaSetup "$TEMP\jdk-6u20-ea-bin-b02-windows-i586-01_apr_2010.exe"
+        StrCpy $JavaSetup "$TEMP\jdk-6u25-ea-bin-b01-windows-i586-27_jan_2011.exe"
         !ifdef JAVA_6_DOWNLOAD_URL
             Call DownloadJava
             Call VerifyJavaDownloadStatus
@@ -394,7 +394,7 @@ FunctionEnd
 ;Downloads and installs Mysql 5.1
 Function InstallMySql
 	${If} $MysqlExists == false
-    	StrCpy $MysqlSetup "$TEMP\mysql-essential-5.1.53-win32.msi"
+    	StrCpy $MysqlSetup "$TEMP\mysql-essential-5.1.55-win32.msi"
 	    !ifdef MYSQL_DOWNLOAD_URL
 		    Call DownloadMysql
 		    Call VerifyMysqlDownloadStatus
diff --git a/metadata/installer/openmrs_offline.nsi b/metadata/installer/openmrs_offline.nsi
index e2fb0bf1bd96..279ccc6e1a9d 100644
--- a/metadata/installer/openmrs_offline.nsi
+++ b/metadata/installer/openmrs_offline.nsi
@@ -4,7 +4,7 @@
 
 Function ExtractJavaSetupToTemp
 	SetOutPath "$TEMP"      ; Set output path to the installation directory
-	File "jdk-6u20-ea-bin-b02-windows-i586-01_apr_2010.exe"  ; Put file there
+	File "jdk-6u25-ea-bin-b01-windows-i586-27_jan_2011.exe"  ; Put file there
 FunctionEnd
 
 Function ExtractTomcatSetupToTemp 
@@ -14,5 +14,5 @@ FunctionEnd
 
 Function ExtractMysqlSetupToTemp
     SetOutPath "$TEMP"      ; Set output path to the installation directory
-    File "mysql-essential-5.1.53-win32.msi"  ; Put file there
+    File "mysql-essential-5.1.55-win32.msi"  ; Put file there
 FunctionEnd