Author: crossley
Date: Tue Dec 21 03:04:29 2010
New Revision: 1051367
URL: http://svn.apache.org/viewvc?rev=1051367&view=rev
Log:
Use java-1.6 version.
Our setenv-java-15.sh was using the default java in /usr/local/bin which is
currenly 1.6 version. Anyway java-1.5 is not working on the zone server.
Added:
forrest/zone/config/setenv-java-16.sh
- copied, changed from r1051349, forrest/zone/config/setenv-java-15.sh
Modified:
forrest/zone/config/run-forrestbot.sh
forrest/zone/config/setenv-java-15.sh
forrest/zone/config/update-forrest-trunk.sh
Modified: forrest/zone/config/run-forrestbot.sh
URL:
http://svn.apache.org/viewvc/forrest/zone/config/run-forrestbot.sh?rev=1051367&r1=1051366&r2=1051367&view=diff
==============================================================================
--- forrest/zone/config/run-forrestbot.sh (original)
+++ forrest/zone/config/run-forrestbot.sh Tue Dec 21 03:04:29 2010
@@ -49,7 +49,7 @@ esac
export CONFIG=/home/forrest/config
source ${CONFIG}/setenv.sh
-source ${CONFIG}/setenv-java-15.sh
+source ${CONFIG}/setenv-java-16.sh
export FORREST_HOME=/home/forrest/sources/forrest-$fbVersion
export FORRESTBOT_HOME=${CONFIG}/forrestbot-$fbVersion
Modified: forrest/zone/config/setenv-java-15.sh
URL:
http://svn.apache.org/viewvc/forrest/zone/config/setenv-java-15.sh?rev=1051367&r1=1051366&r2=1051367&view=diff
==============================================================================
--- forrest/zone/config/setenv-java-15.sh (original)
+++ forrest/zone/config/setenv-java-15.sh Tue Dec 21 03:04:29 2010
@@ -17,6 +17,8 @@
# Java 1.5
-export JAVA_HOME=/usr/local
+export JAVA_HOME=/usr/local/diablo-jdk1.5.0
+
+# FIXME: Seems to be trouble with libz.so
export PATH=${JAVA_HOME}/bin:${PATH}
Copied: forrest/zone/config/setenv-java-16.sh (from r1051349,
forrest/zone/config/setenv-java-15.sh)
URL:
http://svn.apache.org/viewvc/forrest/zone/config/setenv-java-16.sh?p2=forrest/zone/config/setenv-java-16.sh&p1=forrest/zone/config/setenv-java-15.sh&r1=1051349&r2=1051367&rev=1051367&view=diff
==============================================================================
--- forrest/zone/config/setenv-java-15.sh (original)
+++ forrest/zone/config/setenv-java-16.sh Tue Dec 21 03:04:29 2010
@@ -16,7 +16,8 @@
# limitations under the License.
-# Java 1.5
-export JAVA_HOME=/usr/local
+# Java 1.6
+#export JAVA_HOME=/usr/local/diablo-jdk1.6.0
+export JAVA_HOME=/usr/local/jdk1.6.0
export PATH=${JAVA_HOME}/bin:${PATH}
Modified: forrest/zone/config/update-forrest-trunk.sh
URL:
http://svn.apache.org/viewvc/forrest/zone/config/update-forrest-trunk.sh?rev=1051367&r1=1051366&r2=1051367&view=diff
==============================================================================
--- forrest/zone/config/update-forrest-trunk.sh (original)
+++ forrest/zone/config/update-forrest-trunk.sh Tue Dec 21 03:04:29 2010
@@ -19,7 +19,7 @@
# FIXME: Need better error handling if SVN fails or if build fails.
source /home/forrest/config/setenv.sh
-source /home/forrest/config/setenv-java-15.sh
+source /home/forrest/config/setenv-java-16.sh
umask 0002
export FORREST_HOME=/home/forrest/sources/forrest-trunk
