[Aplaws-commit] r806 - tools/trunk/tools/lib/CCM

[<ap...@vh...>]

Author: apevec
Date: 2005-09-14 18:01:56 +0200 (Wed, 14 Sep 2005)
New Revision: 806

Modified:
   tools/trunk/tools/lib/CCM/Runtime.pm
Log:
fix pg jdbc searching to work with different PostgreSQL versions/packagings


Modified: tools/trunk/tools/lib/CCM/Runtime.pm
===================================================================
--- tools/trunk/tools/lib/CCM/Runtime.pm	2005-09-14 09:57:10 UTC (rev 805)
+++ tools/trunk/tools/lib/CCM/Runtime.pm	2005-09-14 16:01:56 UTC (rev 806)
@@ -37,6 +37,7 @@
 
 use CCM::Util;
 use File::Spec;
+use Data::Dumper;
 
 sub new {
     my $proto = shift;
@@ -158,16 +159,18 @@
             $classpath = CCM::Util::catpath($classpath, $jar);
         }
         my $postgresql_jdbc = $ENV{'PG_JDBC2_LIB'};
-        my @pg_jdbc_locs = (
-            "/usr/share/java/rh-postgresql3.jar",
-            "/usr/share/pgsql/java/rh-postgresql3.jar",
-            "/usr/share/java/postgresql-jdbc3.jar",
-            "/usr/share/java/postgresql.jar" );
-        # try 8.0, then 7.4, then everything else
-        my @pg80jars = glob("/usr/share/java/postgresql-8.0.*.jar");
-        unshift @pg_jdbc_locs, (pop @pg80jars)  if @pg80jars;
+        # try universal symlink first (pg8.0-FC4 rpm)
+        my @pg_jdbc_locs = ( "/usr/share/java/postgresql.jar",
+                             "/usr/share/java/postgresql-jdbc3.jar" );
+        # then 8.0 (PGDG rpm)
+        my @pg80jars = glob("/usr/share/java/postgresql-8.0*jdbc3.jar");
+        push @pg_jdbc_locs, (pop @pg80jars)  if @pg80jars;
+        # then 7.4 (FC3 rpm)
         my @pg74jars = glob("/usr/share/java/pg74*jdbc3.jar");
-        unshift @pg_jdbc_locs, (pop @pg74jars)  if @pg74jars;
+        push @pg_jdbc_locs, (pop @pg74jars)  if @pg74jars;
+        # then RHDB (RHEL3 rpm)
+        push @pg_jdbc_locs, ("/usr/share/java/rh-postgresql3.jar",
+                             "/usr/share/pgsql/java/rh-postgresql3.jar");
         for my $jar (@pg_jdbc_locs) {
             last if defined $postgresql_jdbc;
             $postgresql_jdbc = $jar if -f $jar;