You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jd...@apache.org on 2007/01/18 00:42:35 UTC

svn commit: r497248 - /geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/internaldb/DerbyConnectionUtil.java

Author: jdillon
Date: Wed Jan 17 15:42:34 2007
New Revision: 497248

URL: http://svn.apache.org/viewvc?view=rev&rev=497248
Log:
(GERONIMO-2748) Added getDerbyHome() helper to query DerbySystemGBean for the configured value

Modified:
    geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/internaldb/DerbyConnectionUtil.java

Modified: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/internaldb/DerbyConnectionUtil.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/internaldb/DerbyConnectionUtil.java?view=diff&rev=497248&r1=497247&r2=497248
==============================================================================
--- geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/internaldb/DerbyConnectionUtil.java (original)
+++ geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/internaldb/DerbyConnectionUtil.java Wed Jan 17 15:42:34 2007
@@ -33,6 +33,8 @@
 import org.apache.geronimo.kernel.repository.Artifact;
 import org.apache.geronimo.kernel.repository.Version;
 
+import org.apache.geronimo.derby.DerbySystemGBean;
+
 /**
  * A static class to handle retreiving connections. This class is built to
  * handle lookups to the SystemDatabase as a special case. If a connection is
@@ -94,7 +96,24 @@
             throw new Error(t);
         }
     }
-
+    
+    private static String derbyHome = null;
+    
+    /**
+     * Get the Derby home directory path.
+     */
+    public static String getDerbyHome() {
+        if (derbyHome == null) {
+            try {
+                derbyHome = (String)KernelRegistry.getSingleKernel().getAttribute(DerbySystemGBean.class, "derbyHome");
+            }
+            catch (Exception e) {
+                throw new RuntimeException("Failed to query derbyHome", e);
+            }
+        }
+        return derbyHome;
+    }
+    
     /**
      * Get database connection.
      *