perfsonar development work

Author: gijs
Date: 2008-04-15 11:29:08 -0400 (Tue, 15 Apr 2008)
New Revision: 3680

Modified:
   branches/rpm/specs/perfsonar-tomcat.sh
   branches/rpm/specs/perfsonar-tomcat6.specs
Log:
improved beyond perfection



Modified: branches/rpm/specs/perfsonar-tomcat.sh
===================================================================
--- branches/rpm/specs/perfsonar-tomcat.sh      2008-04-15 15:16:00 UTC (rev 
3679)
+++ branches/rpm/specs/perfsonar-tomcat.sh      2008-04-15 15:29:08 UTC (rev 
3680)
@@ -25,14 +25,13 @@
 
 
 # The first existing directory is used for JAVA_HOME
-JDK_DIRS="/usr/java /usr/lib/jvm/java-6-sun /usr/lib/jvm/java-1.5.0-sun 
/usr/lib/j2sdk1.5-sun /usr/lib/jvm/java /usr/lib/jvm/java-gcj"
+JDK_DIRS="/usr/java/latest /usr/lib/jvm/java-6-sun 
/usr/lib/jvm/java-1.5.0-sun /usr/lib/j2sdk1.5-sun /usr/lib/jvm/java 
/usr/lib/jvm/java-gcj"
 
 # Look for the right JVM to use
 for jdir in $JDK_DIRS; do
     if [ -r "$jdir/bin/java" -a -z "${JAVA_HOME}" ]; then
        JAVA_HOME_TMP="$jdir"
-       # checks for a real JDK like environment, needed to check if 
-       # really the java-gcj-compat-dev package is installed
+       # checks for a real JDK like environment
        if [ -r "$jdir/bin/jdb" ]; then
            JAVA_HOME="$JAVA_HOME_TMP"
        fi
@@ -45,9 +44,9 @@
 gij=no
 "$JAVA_HOME/bin/java" -version 2>&1 | grep -q "^gij (GNU libgcj)" && gij=yes
 
-# gij doesn't support a security manager yet (see bug #399595)
+# gij doesn't support a security manager
 if [ "$gij" = "yes" ]; then
-    echo -e "The java-gcj-compat-dev environment currently doesn't\nsupport 
a security manager." | logger -p daemon.warning -t $NAME
+    echo -e "gcj environment currently doesn't\nsupport a security manager."
 fi
 
 # Set java.awt.headless=true if JAVA_OPTS is not set so the

Modified: branches/rpm/specs/perfsonar-tomcat6.specs
===================================================================
--- branches/rpm/specs/perfsonar-tomcat6.specs  2008-04-15 15:16:00 UTC (rev 
3679)
+++ branches/rpm/specs/perfsonar-tomcat6.specs  2008-04-15 15:29:08 UTC (rev 
3680)
@@ -1,7 +1,7 @@
 Name: perfsonar-tomcat
 Version: 6.0.16
 License: Apache License, Version 2.0
-Release: 2
+Release: 3
 Summary: apache tomcat perfSONAR edition
 Source0: apache-tomcat-6.0.16.tar.gz
 Source1: perfsonar-tomcat.sh
@@ -63,6 +63,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 %{__install} -d -m 755 ${RPM_BUILD_ROOT}%{prefix}
+%{__install} -d -m 755 ${RPM_BUILD_ROOT}/etc/init.d
 
 ## copy everything
 pushd ${RPM_BUILD_DIR}/apache-tomcat-%{version}
@@ -74,7 +75,7 @@
 popd
 
 ## copy jsvc startup script
-%{__cp} %{SOURCE1}  ${RPM_BUILD_ROOT}%{prefix}/bin
+%{__cp} %{SOURCE1}  ${RPM_BUILD_ROOT}/etc/init.d/%{name}
 
 
 ## remove what we don't need and move stuff 
@@ -143,7 +144,13 @@
 ## the root of all
 %dir %{prefix}
 
+## init script
+%attr(755,root,root) /etc/init.d/%{name}
+
 %changelog
+* Tue Apr 15 2008 Gijs Molenaar 
<>
 6.0.14-3
+- improved startup script and moved to /etc/init.d
+
 * Mon Apr 14 2008 Gijs Molenaar 
<>
 6.0.14-2
 - added jsvc support