[jboss-svn-commits] JBL Code SVN: r27117 - labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/dependencies.

[jboss-svn-commits at lists.jboss.org]

Author: beve
Date: 2009-06-24 10:51:58 -0400 (Wed, 24 Jun 2009)
New Revision: 27117

Modified:
   labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/dependencies/HypersonicDatabase.java
   labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/dependencies/HypersonicDatabaseMBean.java
Log:
Added the ability to configure the data directory. This as been done for the H2Database but the test did not pick up on me missing this one. 


Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/dependencies/HypersonicDatabase.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/dependencies/HypersonicDatabase.java	2009-06-24 14:22:50 UTC (rev 27116)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/dependencies/HypersonicDatabase.java	2009-06-24 14:51:58 UTC (rev 27117)
@@ -29,7 +29,10 @@
 import java.sql.DriverManager;
 import java.sql.Statement;
 
+import org.jboss.mx.util.MBeanProxyExt;
 import org.jboss.system.ServiceMBeanSupport;
+import org.jboss.system.server.ServerConfig;
+import org.jboss.system.server.ServerConfigImplMBean;
 import org.jboss.system.server.ServerConfigLocator;
 
 /**
@@ -145,6 +148,8 @@
    /** Hold a connection for in process hypersonic. */
    private Connection connection;
 
+    private String datadir;
+
    // Constructors --------------------------------------------------
    
    /**
@@ -654,7 +659,7 @@
    private void startRemoteDatabase() throws Exception
    {
       // Get the server data directory
-      File dataDir = ServerConfigLocator.locate().getServerDataDir();
+      File dataDir = getDataDir();
 
       // Get DB directory
       File hypersoniDir = new File(dataDir, HYPERSONIC_DATA_DIR);
@@ -810,5 +815,20 @@
       }
       return connection;
    }
+   
+    File getDataDir()
+    {
+        if (datadir == null)
+        {
+            final ServerConfig serverConfig = (ServerConfig) MBeanProxyExt.create(ServerConfig.class, ServerConfigImplMBean.OBJECT_NAME);
+            return serverConfig.getServerDataDir();
+        }
+        return new File(datadir);
+    }
+   
+    public void setDataDir(String datadir)
+    {
+        this.datadir = datadir;
+    }
 
 }

Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/dependencies/HypersonicDatabaseMBean.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/dependencies/HypersonicDatabaseMBean.java	2009-06-24 14:22:50 UTC (rev 27116)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/dependencies/HypersonicDatabaseMBean.java	2009-06-24 14:51:58 UTC (rev 27117)
@@ -105,6 +105,9 @@
    /** The delay for initialisation of the remote hypersonic database, default is '5000'ms */
    long getDelay();
    void setDelay(long delay);
+   
+   /** Set the dir that will be used by the database. */
+   void setDataDir(final String datadir);
 
    // Operations ----------------------------------------------------