Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Williams2013-06-20 15:13:21 -0400
committerDavid Williams2013-06-20 15:13:21 -0400
commit325a21889892b85d1e97cc8501c2fc877994fbc3 (patch)
tree0b4444b65320a74ae2d252dba06ec9fa5f7f98e3
parent63a7558f1217878e132dd8fce08126e7c09bddd8 (diff)
downloadeclipse.platform.releng.aggregator-325a21889892b85d1e97cc8501c2fc877994fbc3.tar.gz
eclipse.platform.releng.aggregator-325a21889892b85d1e97cc8501c2fc877994fbc3.tar.xz
eclipse.platform.releng.aggregator-325a21889892b85d1e97cc8501c2fc877994fbc3.zip
Bug 410835 - Update javadoc version used by our build
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/j9_read_me.html36
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/java-runtimes.html136
-rwxr-xr-xproduction/sdk/updaterepo/updateComposite.sh7
-rw-r--r--production/testScripts/configuration/sdk.tests/testConfigs/linux/testAll.sh2
-rw-r--r--production/testScripts/configuration/sdk.tests/testConfigs/linux/vm.properties3
5 files changed, 6 insertions, 178 deletions
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/j9_read_me.html b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/j9_read_me.html
deleted file mode 100644
index 0bf9780c..00000000
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/j9_read_me.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<title>J9 JRE Read Me</title>
-<link rel="stylesheet" href="../../../default_style.css" type="text/css">
-</head>
-<body>
-&nbsp;
-<table BORDER=0 CELLSPACING=5 CELLPADDING=2 WIDTH="100%" >
- <tr>
- <td ALIGN=LEFT width="80%">
- <p><b><font face="Verdana" size="+3">J9 Read Me</font></b></p>
- </td>
- <td WIDTH="20%">&nbsp;</td>
- </tr>
-</table>
-<table BORDER=0 CELLSPACING=5 CELLPADDING=2 WIDTH="100%" >
- <tr>
- <td ALIGN=LEFT VALIGN=TOP COLSPAN="3" BGCOLOR="#0080C0"><b><font face="Arial,Helvetica" color="#FFFFFF">Important
- Information </font></b></td>
- </tr>
- <tr>
- <td height="48" colspan="2">
- <p>A plug-in is required to run Java Code in Eclipse using the J9 VM. The
- plug-in and instructions on its use can be found on the Eclipse Corner
- <a href="http://dev.eclipse.org/viewcvs/index.cgi/%7Echeckout%7E/jdt-debug-home/plugins/org.eclipse.jdt.launching.j9/index.html">here</a>.
- This plug-in is not part of the standard Eclipse build.</p>
- </td>
- </tr>
-</table>
-<p>&nbsp;</p>
-<p>&nbsp;</p>
-<p>&nbsp;</p>
-</body>
-</html>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/java-runtimes.html b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/java-runtimes.html
deleted file mode 100644
index 6d31b81d..00000000
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/java-runtimes.html
+++ /dev/null
@@ -1,136 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<title>Eclipse Tools Project</title>
-<link rel="stylesheet" href="../../../default_style.css" type="text/css">
-</head>
-<body>
-&nbsp;
-<table BORDER=0 CELLSPACING=5 CELLPADDING=2 WIDTH="100%" >
- <tr>
- <td ALIGN=LEFT width="80%">
- <p><b><font face="Verdana" size="+3">Java runtimes</font></b></p>
- </td>
- <td WIDTH="20%">&nbsp;</td>
- </tr>
-</table>
-<table BORDER=0 CELLSPACING=5 CELLPADDING=2 WIDTH="100%" >
- <tr>
- <td ALIGN=LEFT VALIGN=TOP COLSPAN="3" BGCOLOR="#0080C0"><b><font face="Arial,Helvetica" color="#FFFFFF">Where
- to find a Java runtime</font></b></td>
- </tr>
- <tr>
- <td height="2" colspan="2">
- <p>This version of Eclipse is designed to run on a 1.4 level Java runtime
- environment or Java development kit. You do not need a development kit
- to do Java development using the Eclipse Java development tools. However
- if you want to have source for the base class libraries available for
- debugging you will need to get a development kit because Java runtimes
- typically don't have source for the class libraries.</p>
- <p>Here are some links to commercial vendors that supply Java development
- kits and Java runtime environments. You will need to decide for yourself
- which works best for you, and which licensing terms work best for you.
- These links are provided only as a convenience.</p>
- </td>
- </tr>
- <tr>
- <td height="48" colspan="2">
- <table border=5 cellspacing=2 cellpadding=2 width="100%" bordercolor="#999999" >
- <tr>
- <td align=RIGHT valign=TOP width="7%">
- <div align="left"><b>Vendor</b></div>
- </td>
- <td width="12%"><b>Platform</b></td>
- <td width="49%"><b>Links</b></td>
- <td width="32%"><b>Important Notes</b></td>
- </tr>
- <tr>
- <td align=RIGHT valign=TOP width="7%">
- <div align="left">IBM</div>
- </td>
- <td width="12%">Linux</td>
- <td width="49%"><a href="http://www-106.ibm.com/developerworks/java/jdk/linux140/?dwzone=java" target="_blank">IBM
- Developer Kit for Linux, Java&#153; 2 Technology Edition, Version
- 1.4</a></td>
- <td width="32%"></td>
- </tr>
- <tr>
- <td align=LEFT valign=TOP width="7%">IBM</td>
- <td width="12%" valign="top">AIX</td>
- <td width="49%"> <a href="http://www.ibm.com/developerworks/java/jdk/aix/service.html" target="_blank">IBM
- Developer Kit for AIX Release 1.4</a> </td>
- <td width="32%"> <a href="aix_read_me.html">AIX Read Me (August 28,
- 2003)</a> </td>
- </tr>
-
- <tr>
- <td align=RIGHT valign=TOP width="7%">
- <div align="left">Sun</div>
- </td>
- <td width="12%" valign="top">Windows</td>
- <td width="49%">
- <p><a href="http://java.sun.com/j2se/1.4.2/download.html" target="_blank">JavaTM
- 2 SDK, Standard Edition Version 1.4.2</a><br>
- <a href="http://java.sun.com/j2se/1.4.2/download.html" target="_blank">JavaTM
- 2 Runtime Environment, Standard Edition Version 1.4.2</a><br>
- </p>
- </td>
- <td width="32%"></td>
- </tr>
- <tr>
- <td align=RIGHT valign=TOP width="7%">
- <div align="left">Sun</div>
- </td>
- <td width="12%" valign="top">Linux</td>
- <td width="49%">
- <p><a href="http://java.sun.com/j2se/1.4.2/download.html" target="_blank">JavaTM
- 2 SDK, Standard Edition Version 1.4.2 </a><br>
- <a href="http://java.sun.com/j2se/1.4.2/download.html" target="_blank">JavaTM
- 2 Runtime Environment, Standard Edition Version 1.4.2</a><br>
- </p>
- </td>
- <td width="32%"></td>
- </tr>
- <tr>
- <td valign=TOP>Sun</td>
- <td valign="top">Solaris</td>
- <td><a href="http://java.sun.com/j2se/1.4.2/download.html" target="_blank">JavaTM
- 2 SDK, Standard Edition Version 1.4.2</a><br>
- <a href="http://java.sun.com/j2se/1.4.2/download.html" target="_blank">JavaTM
- 2 Runtime Environment, Standard Edition Version 1.4.2</a></td>
- <td></td>
- </tr>
- <tr>
- <td align=RIGHT valign=TOP width="7%">
- <div align="left">Sun</div>
- </td>
- <td width="12%" valign="top">Linux x86_64 (64 bit)</td>
- <td width="49%">
- <p> <a href="http://java.sun.com/j2se/1.5.0/download.html" target="_blank">JavaTM
- 2 SDK, Standard Edition Version 1.5.0</a><br>
- <a href="http://java.sun.com/j2se/1.5.0/download.html" target="_blank">JavaTM
- 2 Runtime Environment, Standard Edition Version 1.5.0</a>
- </td>
- <td width="32%"></td>
- </tr>
- <tr>
- <td align=RIGHT valign=TOP width="7%">
- <div align="left">BEA</div>
- </td>
- <td width="12%" valign="top">Linux ia64 (64 bit)</td>
- <td width="49%">
- <p> <a href="http://commerce.bea.com/products/weblogicjrockit/5.0/jr_50.jsp" target="_blank">BEA WebLogic JRockit 5.0 JDK</a><br>
- <a href="http://commerce.bea.com/products/weblogicjrockit/5.0/jr_50.jsp" target="_blank">BEA WebLogic JRockit 5.0 JRE</a>
- </td>
- <td width="32%"></td>
- </tr>
- </table>
- </td>
- </tr>
-</table>
-<p>&nbsp;</p>
-<p>&nbsp;</p>
-<p>&nbsp;</p>
-</body>
-</html>
diff --git a/production/sdk/updaterepo/updateComposite.sh b/production/sdk/updaterepo/updateComposite.sh
index 6f330afb..1b312670 100755
--- a/production/sdk/updaterepo/updateComposite.sh
+++ b/production/sdk/updaterepo/updateComposite.sh
@@ -4,10 +4,9 @@
# First argument must be the absolute directory path to the
# (simple) artifact repository.
-#JAVA_5_HOME=${JAVA_5_HOME:-/home/shared/orbit/apps/ibm-java2-i386-50/jre}
-JAVA_5_HOME=${JAVA_5_HOME:-/shared/common/jdk-1.5.0-22.x86_64/jre}
-JAVA_6_HOME=${JAVA_6_HOME:-/shared/common/sun-jdk1.6.0_21_x64}
-JAVA_7_HOME=${JAVA_7_HOME:-/shared/common/jdk1.7.0_25}
+JAVA_5_HOME=${JAVA_5_HOME:-/shared/common/jdk1.5.0-latest}
+JAVA_6_HOME=${JAVA_6_HOME:-/shared/common/jdk1.6.0-latest}
+JAVA_7_HOME=${JAVA_7_HOME:-/shared/common/jdk1.7.0-latest}
export JAVA_HOME=${JAVA_7_HOME}
diff --git a/production/testScripts/configuration/sdk.tests/testConfigs/linux/testAll.sh b/production/testScripts/configuration/sdk.tests/testConfigs/linux/testAll.sh
index c840508b..b2d21241 100644
--- a/production/testScripts/configuration/sdk.tests/testConfigs/linux/testAll.sh
+++ b/production/testScripts/configuration/sdk.tests/testConfigs/linux/testAll.sh
@@ -11,7 +11,7 @@
source localTestsProperties.shsource 2>/dev/null
echo "PWD: $PWD"
-vmcmd=${vmcmd:-/shared/common/jdk-1.6.x86_64/jre/bin/java}
+vmcmd=${vmcmd:-/shared/common/jdk1.6.0-latest/jre/bin/java}
# production machine is x86_64, but some local setups may be 32 bit and will need to provide
# this value in localTestsProperties.shsource.
diff --git a/production/testScripts/configuration/sdk.tests/testConfigs/linux/vm.properties b/production/testScripts/configuration/sdk.tests/testConfigs/linux/vm.properties
index 7321c504..625d8739 100644
--- a/production/testScripts/configuration/sdk.tests/testConfigs/linux/vm.properties
+++ b/production/testScripts/configuration/sdk.tests/testConfigs/linux/vm.properties
@@ -10,7 +10,8 @@
###############################################################################
platform=linux.gtk.x86_6.0
#J2SE-6.0=/shared/common/jdk-1.6.x86_64/jre/bin/java
-J2SE-6.0=/shared/common/jdk-1.6.x86_64/jre/bin/java
+#J2SE-6.0=/shared/common/jdk-1.6.x86_64/jre/bin/java
+J2SE-6.0=/shared/common/jdk1.6.0-latest/jre/bin/java
# currently this variable is "hard coded" to work on Hudson.
# not required if no proxies to use or bypass

Back to the top