You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@directory.apache.org by cc...@apache.org on 2007/07/15 07:57:47 UTC

svn commit: r556365 - /directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/rpm/server.init

Author: ccustine
Date: Sat Jul 14 22:57:46 2007
New Revision: 556365

URL: http://svn.apache.org/viewvc?view=rev&rev=556365
Log:
DIRSERVER-921 - This commit makes the scripts work with JRE 1.6.  This isn't really necessary with the new daemon, but you will still be able to use Procrun and Jsvc so I am getting this fix in just in case someone still wants to use them.

Modified:
    directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/rpm/server.init

Modified: directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/rpm/server.init
URL: http://svn.apache.org/viewvc/directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/rpm/server.init?view=diff&rev=556365&r1=556364&r2=556365
==============================================================================
--- directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/rpm/server.init (original)
+++ directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/rpm/server.init Sat Jul 14 22:57:46 2007
@@ -66,7 +66,7 @@
 
     if [ ! -d "$JAVA_HOME" ] ; then
       if [ `uname` = Linux ] ; then
-        for jdkhome in `find /usr/java/ -type d -regex '.*\/jdk1\.5\.....$' | sort`; do
+        for jdkhome in `find /usr/java/ -type d -regex '.*\/jdk1\.[56]\.....$' | sort`; do
           JAVA_HOME=$jdkhome;
         done
       fi