perfsonar development work

Author: psnc.lopatowski
Date: 2010-05-19 13:09:41 +0100 (Wed, 19 May 2010)
New Revision: 5655

Modified:
   trunk/perfsonar-install-dvd/CentOS-5.4/desktop/postinstall0
   trunk/perfsonar-install-dvd/CentOS-5.4/server/postinstall0
Log:


Modified: trunk/perfsonar-install-dvd/CentOS-5.4/desktop/postinstall0
===================================================================
--- trunk/perfsonar-install-dvd/CentOS-5.4/desktop/postinstall0 2010-05-19 
08:24:28 UTC (rev 5654)
+++ trunk/perfsonar-install-dvd/CentOS-5.4/desktop/postinstall0 2010-05-19 
12:09:41 UTC (rev 5655)
@@ -6,16 +6,14 @@
 dialog --title "Java Installation" --backtitle "perfSONAR MDM 3.3 on CentOS 
5.4 Installation" \
        --msgbox "\nThis will install the Sun Microsystems Java 
Platform.\nPlease, accept the license terms; otherwise, perfSONAR 
\ninstallation will not be fully operational." 8 60
 
-if /root/perfSONAR/rpms/jdk-1_5_0_14-linux-i586-rpm.bin; then
-       rpm -ivh --nosignature 
/root/perfSONAR/rpms/java-1.5.0-sun-compat-1.5.0.14-1jpp.i586.rpm
-       /usr/sbin/alternatives --set java /usr/lib/jvm/jre-1.5.0-sun/bin/java
+if /root/perfSONAR/rpms/jre-6u20-linux-i586-rpm.bin; then
        /etc/init.d/tomcat5 restart
        dialog --title "perfSONAR MDM 3.3 Installation" --backtitle 
"perfSONAR MDM 3.3 on CentOS 5.4 Installation" \
                --infobox "\n                Installation finished." 5 60
        sleep 3
 else
        dialog --title "perfSONAR MDM 3.3 Installation" --backtitle 
"perfSONAR MDM 3.3 on CentOS 5.4 Installation" \
-               --msgbox "\n The installation of the Sun Microsystems Java 
Platform has not been done. Remember that this is a required step to get a 
fully operational perfSONAR installation. Next time you boot your server it 
will be requested the acceptance of the license terms, in order to do the 
installation." 10 60
+               --msgbox "\n The installation of the Sun Microsystems Java 
Platform has not been done. Remember that this is a required step to get a 
fully operational perfSONAR installation." 10 60
 fi
 echo
 clear
@@ -51,8 +49,7 @@
 cp -vf /root/perfSONAR/rpms/perfsonar-mdm-3.1.repo /etc/yum.repos.d
 cp -vf /root/perfSONAR/rpms/perfsonar-testing.repo /etc/yum.repos.d
 cat <<EOF>/etc/profile.d/jdk.sh
-export JAVA_HOME=/usr/java/jdk1.5.0_14
-export JRE_HOME=/usr/java/jdk1.5.0_14/jre
+export JRE_HOME=/usr/java/jre1.6.0_20
 EOF
 chmod a+x /etc/profile.d/jdk.sh
 echo

Modified: trunk/perfsonar-install-dvd/CentOS-5.4/server/postinstall0
===================================================================
--- trunk/perfsonar-install-dvd/CentOS-5.4/server/postinstall0  2010-05-19 
08:24:28 UTC (rev 5654)
+++ trunk/perfsonar-install-dvd/CentOS-5.4/server/postinstall0  2010-05-19 
12:09:41 UTC (rev 5655)
@@ -6,16 +6,14 @@
 dialog --title "Java Installation" --backtitle "perfSONAR MDM 3.3 on CentOS 
5.4 Installation" \
        --msgbox "\nThis will install the Sun Microsystems Java 
Platform.\nPlease, accept the license terms; otherwise, perfSONAR 
\ninstallation will not be fully operational." 8 60
 
-if /root/perfSONAR/rpms/jdk-1_5_0_14-linux-i586-rpm.bin; then
-       rpm -ivh --nosignature 
/root/perfSONAR/rpms/java-1.5.0-sun-compat-1.5.0.14-1jpp.i586.rpm
-       /usr/sbin/alternatives --set java /usr/lib/jvm/jre-1.5.0-sun/bin/java
+if /root/perfSONAR/rpms/jre-6u20-linux-i586-rpm.bin; then
        /etc/init.d/tomcat5 restart
        dialog --title "perfSONAR MDM 3.3 Installation" --backtitle 
"perfSONAR MDM 3.3 on CentOS 5.4 Installation" \
                --infobox "\n                Installation finished." 5 60
        sleep 3
 else
        dialog --title "perfSONAR MDM 3.3 Installation" --backtitle 
"perfSONAR MDM 3.3 on CentOS 5.4 Installation" \
-               --msgbox "\n The installation of the Sun Microsystems Java 
Platform has not been done. Remember that this is a required step to get a 
fully operational perfSONAR installation. Next time you boot your server it 
will be requested the acceptance of the license terms, in order to do the 
installation." 10 60
+               --msgbox "\n The installation of the Sun Microsystems Java 
Platform has not been done. Remember that this is a required step to get a 
fully operational perfSONAR installation." 10 60
 fi
 echo
 clear
@@ -51,8 +49,7 @@
 cp -vf /root/perfSONAR/rpms/perfsonar-mdm-3.1.repo /etc/yum.repos.d
 cp -vf /root/perfSONAR/rpms/perfsonar-testing.repo /etc/yum.repos.d
 cat <<EOF>/etc/profile.d/jdk.sh
-export JAVA_HOME=/usr/java/jdk1.5.0_14
-export JRE_HOME=/usr/java/jdk1.5.0_14/jre
+export JRE_HOME=/usr/java/jre1.6.0_20
 EOF
 chmod a+x /etc/profile.d/jdk.sh
 echo
@@ -68,8 +65,8 @@
        exec >> $LOGFILE 2>&1
        echo ">>> Installing perfSONAR Lookup Service <<<"
        echo
-       rpm -ivh --nosignature 
/root/perfSONAR/rpms/tomcat5-exist-1.2.3-1.noarch.rpm
-       rpm -ivh --nosignature 
/root/perfSONAR/rpms/geant2-java-xml-ls-1.3-12.noarch.rpm
+       rpm -ivh --nosignature /root/perfSONAR/rpms/exist-1.2.6-1.noarch.rpm
+       rpm -ivh --nosignature 
/root/perfSONAR/rpms/perfsonar-java-xml-ls-1.5-rc3.noarch.rpm
        echo
 fi
 
@@ -177,6 +174,7 @@
        exec 6>&1
        exec >> $LOGFILE 2>&1
        echo ">>> Installing perfSONAR E2EMon MP <<<"
+       rpm -ivh 
/root/perfSONAR/rpms/perfsonar-perl-e2emon-mp-1.1-rc1.noarch.rpm
        echo
 fi