perfsonar development work

Author: zurawski
Date: 2006-06-28 09:15:24 -0400 (Wed, 28 Jun 2006)
New Revision: 1341

Added:
   branches/release/perfsonar/releng/perfSONAR-1.0/perfSONAR-clear.png
Modified:
   branches/release/perfsonar/releng/perfSONAR-1.0/install.pl
   branches/release/perfsonar/releng/perfSONAR-1.0/install.xml
   branches/release/perfsonar/releng/perfSONAR-1.0/scripts/ls.catalina.sh
   branches/release/perfsonar/releng/perfSONAR-1.0/scripts/ma.catalina.sh
Log:
Fixed the catalina issue, added a graphic for the installer.

-jason



Modified: branches/release/perfsonar/releng/perfSONAR-1.0/install.pl
===================================================================
--- branches/release/perfsonar/releng/perfSONAR-1.0/install.pl  2006-06-27 
14:03:36 UTC (rev 1340)
+++ branches/release/perfsonar/releng/perfSONAR-1.0/install.pl  2006-06-28 
13:15:24 UTC (rev 1341)
@@ -420,6 +420,7 @@
   system("rm -f install.xml");  
 
   system("rm -f install.pl");  
+  system("rm -f perfSONAR-clear.png");  
   system("rm -frd lib");  
   
   if(!($lsFlag)) {

Modified: branches/release/perfsonar/releng/perfSONAR-1.0/install.xml
===================================================================
--- branches/release/perfsonar/releng/perfSONAR-1.0/install.xml 2006-06-27 
14:03:36 UTC (rev 1340)
+++ branches/release/perfsonar/releng/perfSONAR-1.0/install.xml 2006-06-28 
13:15:24 UTC (rev 1341)
@@ -130,6 +130,8 @@
         <res id="userInputLang.xml_eng" src="userInputLang.xml_eng"/>
         <!-- <res id="userInputLang.xml_pol" src="userInputLang.xml_pol"/> 
-->     
        <!-- add other language support? -->    
+       
+       <res id="Installer.image" src="perfSONAR-clear.png" />
     </resources>
     
     

Added: branches/release/perfsonar/releng/perfSONAR-1.0/perfSONAR-clear.png


Property changes on: 
branches/release/perfsonar/releng/perfSONAR-1.0/perfSONAR-clear.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: 
branches/release/perfsonar/releng/perfSONAR-1.0/scripts/ls.catalina.sh
===================================================================
--- branches/release/perfsonar/releng/perfSONAR-1.0/scripts/ls.catalina.sh    
  2006-06-27 14:03:36 UTC (rev 1340)
+++ branches/release/perfsonar/releng/perfSONAR-1.0/scripts/ls.catalina.sh    
  2006-06-28 13:15:24 UTC (rev 1341)
@@ -1,8 +1,10 @@
 #!/bin/sh
 
 cp ${1} ${1}.back
+
+echo ${1} | perl -ne '@array=split(/ /,$_);foreach $a (@array) { $a =~ 
s/\n//; } open(CONF, $array[0]);@contents = <CONF>;close(CONF);system("rm -f 
".$array[0]);open(NEWCONF, ">".$array[0]);foreach $line (@contents) { 
if(!($line =~ m/^service\.properties.*$/) && !($line =~ 
m/^components\.properties.*$/) && !($line =~ m/^\n$/)) { print NEWCONF $line; 
if(!($line =~ m/^#.*$/)) { print NEWCONF "\n"; }}} close(NEWCONF);'
+
 echo "" >> ${1}
 echo "service.properties=${2}/conf/service.properties.ls" >> ${1}
 echo "" >> ${1}
 echo "components.properties=${2}/conf/components.properties.ls" >> ${1}
-

Modified: 
branches/release/perfsonar/releng/perfSONAR-1.0/scripts/ma.catalina.sh
===================================================================
--- branches/release/perfsonar/releng/perfSONAR-1.0/scripts/ma.catalina.sh    
  2006-06-27 14:03:36 UTC (rev 1340)
+++ branches/release/perfsonar/releng/perfSONAR-1.0/scripts/ma.catalina.sh    
  2006-06-28 13:15:24 UTC (rev 1341)
@@ -1,8 +1,10 @@
 #!/bin/sh
 
 cp ${1} ${1}.back
+
+echo ${1} | perl -ne '@array=split(/ /,$_);foreach $a (@array) { $a =~ 
s/\n//; } open(CONF, $array[0]);@contents = <CONF>;close(CONF);system("rm -f 
".$array[0]);open(NEWCONF, ">".$array[0]);foreach $line (@contents) { 
if(!($line =~ m/^service\.properties.*$/) && !($line =~ 
m/^components\.properties.*$/) && !($line =~ m/^\n$/)) { print NEWCONF $line; 
if(!($line =~ m/^#.*$/)) { print NEWCONF "\n"; }}} close(NEWCONF);'
+
 echo "" >> ${1}
 echo "service.properties=${2}/conf/service.properties.ma" >> ${1}
 echo "" >> ${1}
 echo "components.properties=${2}/conf/components.properties.ma" >> ${1}
-