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

[<ssk...@vh...>]

Author: sskracic
Date: 2005-09-12 15:44:07 +0200 (Mon, 12 Sep 2005)
New Revision: 768

Modified:
   tools/trunk/tools/lib/CCM/Runtime.pm
Log:
  Try PG 8.0, then 7.4 JDBC, then everything else.
Fixed uninitialized value issue.


Modified: tools/trunk/tools/lib/CCM/Runtime.pm
===================================================================
--- tools/trunk/tools/lib/CCM/Runtime.pm	2005-09-12 12:21:39 UTC (rev 767)
+++ tools/trunk/tools/lib/CCM/Runtime.pm	2005-09-12 13:44:07 UTC (rev 768)
@@ -158,12 +158,16 @@
             $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;
         my @pg74jars = glob("/usr/share/java/pg74*jdbc3.jar");
-        # take the latest available
-        my $pg74jar = pop @pg74jars;
-        my @pg_jdbc_locs = ( $pg74jar,
-            "/usr/share/java/rh-postgresql3.jar",
-            "/usr/share/pgsql/java/rh-postgresql3.jar" );
+        unshift @pg_jdbc_locs, (pop @pg74jars)  if @pg74jars;
         for my $jar (@pg_jdbc_locs) {
             last if defined $postgresql_jdbc;
             $postgresql_jdbc = $jar if -f $jar;