[jboss-cvs] contrib/varia/src/main/org/jboss/jdbc ...

[Bill B. <bi...@jb...>]

  User: bill    
  Date: 06/03/17 18:13:07

  Modified:    varia/src/main/org/jboss/jdbc  HypersonicDatabase.java
  Log:
  add hook so that ServerConfigLocator isn't required and this bean can be used outside of app server
  
  Revision  Changes    Path
  1.36      +21 -5     contrib/varia/src/main/org/jboss/jdbc/HypersonicDatabase.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: HypersonicDatabase.java
  ===================================================================
  RCS file: /cvsroot/jboss/contrib/varia/src/main/org/jboss/jdbc/HypersonicDatabase.java,v
  retrieving revision 1.35
  retrieving revision 1.36
  diff -u -b -r1.35 -r1.36
  --- HypersonicDatabase.java	10 Mar 2006 06:35:28 -0000	1.35
  +++ HypersonicDatabase.java	17 Mar 2006 23:13:07 -0000	1.36
  @@ -26,7 +26,6 @@
   import java.io.IOException;
   import java.lang.reflect.Method;
   import java.sql.Connection;
  -import java.sql.Driver;
   import java.sql.DriverManager;
   import java.sql.Statement;
   
  @@ -42,7 +41,7 @@
    * @author <a href="mailto:ja...@pl...">Jason Dillon</a>
    * @author <a href="mailto:ves...@pr...">Claudio Vesco</a>
    * @author <a href="mailto:dim...@jb...">Dimitris Andreadis</a>
  - * @version $Revision: 1.35 $
  + * @version $Revision: 1.36 $
    */
   public class HypersonicDatabase extends ServiceMBeanSupport
      implements HypersonicDatabaseMBean
  @@ -139,6 +138,8 @@
      /** Hold a connection for in process hypersonic. */
      private Connection connection;
   
  +   private String dbDataDir;
  +
      // Constructors --------------------------------------------------
      
      /**
  @@ -151,6 +152,16 @@
   
      // Attributes ----------------------------------------------------
      
  +   public String getDbDataDir()
  +   {
  +      return dbDataDir;
  +   }
  +
  +   public void setDbDataDir(String dbDataDir)
  +   {
  +      this.dbDataDir = dbDataDir;
  +   }
  +
      /**
       * Set the database name.
       * 
  @@ -588,7 +599,10 @@
      private void startStandaloneDatabase() throws Exception
      {
         // Get the server data directory
  -      File dataDir = ServerConfigLocator.locate().getServerDataDir();
  +      File dataDir = null;
  +
  +      if (dbDataDir == null) dataDir = ServerConfigLocator.locate().getServerDataDir();
  +      else dataDir = new File(dbDataDir);
   
         // Get DB directory
         File hypersoniDir = new File(dataDir, HYPERSONIC_DATA_DIR);
  @@ -628,7 +642,9 @@
      private void startRemoteDatabase() throws Exception
      {
         // Get the server data directory
  -      File dataDir = ServerConfigLocator.locate().getServerDataDir();
  +      File dataDir = null;
  +      if (dbDataDir == null) dataDir = ServerConfigLocator.locate().getServerDataDir();
  +      else dataDir = new File(dbDataDir);
   
         // Get DB directory
         File hypersoniDir = new File(dataDir, HYPERSONIC_DATA_DIR);