CVS update of <src>/org/continuent/sequoia (2 files)

    Date: Thursday, November 23, 2006 @ 10:19:39
  Author: olivier
    Path: /cvsroot/sequoia/sequoia/src/org/continuent/sequoia

Modified: common/jmx/mbeans/VirtualDatabaseMBean.java (1.17 -> 1.18)
          controller/virtualdatabase/management/VirtualDatabase.java (1.15
          -> 1.16)

- added deprecated initializeFromBackend(String) [no force]
  for backward compatibility (SEQUOIA-314/UNICLUSTER-18)


------------------------------------------------------------+
 common/jmx/mbeans/VirtualDatabaseMBean.java                |   14 +++++++++++
 controller/virtualdatabase/management/VirtualDatabase.java |   12 ++++++++-
 2 files changed, 25 insertions(+), 1 deletion(-)


Index: 
sequoia/src/org/continuent/sequoia/common/jmx/mbeans/VirtualDatabaseMBean.java
diff -u 
sequoia/src/org/continuent/sequoia/common/jmx/mbeans/VirtualDatabaseMBean.java:1.17
 
sequoia/src/org/continuent/sequoia/common/jmx/mbeans/VirtualDatabaseMBean.java:1.18
--- 
sequoia/src/org/continuent/sequoia/common/jmx/mbeans/VirtualDatabaseMBean.java:1.17
 Wed Nov 22 09:41:57 2006
+++ 
sequoia/src/org/continuent/sequoia/common/jmx/mbeans/VirtualDatabaseMBean.java  
    Thu Nov 23 10:19:39 2006
@@ -68,6 +68,20 @@
   void initializeFromBackend(String databaseBackendName, boolean force)
       throws VirtualDatabaseException;
 
+  /**
+   * Performs initializeFromBackend(databaseBackendName, force=false).
+   * This is a convenience method for backward compatibility.
+   * 
+   * @param databaseBackendName the name of the backend to use for
+   *          initialization.
+   * @throws VirtualDatabaseException if there is an active backend or a 
backend
+   *           which has a last known checkpoint, or if there is no recovery 
log
+   *           for this vdb.
+   * @deprecated use method with explicit force option.
+   */
+  void initializeFromBackend(String databaseBackendName)
+      throws VirtualDatabaseException;
+  
   //
   // Database backends management
   //
Index: 
sequoia/src/org/continuent/sequoia/controller/virtualdatabase/management/VirtualDatabase.java
diff -u 
sequoia/src/org/continuent/sequoia/controller/virtualdatabase/management/VirtualDatabase.java:1.15
 
sequoia/src/org/continuent/sequoia/controller/virtualdatabase/management/VirtualDatabase.java:1.16
--- 
sequoia/src/org/continuent/sequoia/controller/virtualdatabase/management/VirtualDatabase.java:1.15
  Wed Nov 22 09:41:57 2006
+++ 
sequoia/src/org/continuent/sequoia/controller/virtualdatabase/management/VirtualDatabase.java
       Thu Nov 23 10:19:39 2006
@@ -72,7 +72,8 @@
   }
 
   /**
-   * @see 
org.continuent.sequoia.common.jmx.mbeans.VirtualDatabaseMBean#initializeFromBackend(java.lang.String)
+   * @see 
org.continuent.sequoia.common.jmx.mbeans.VirtualDatabaseMBean#initializeFromBackend(java.lang.String,
+   *      boolean)
    */
   public void initializeFromBackend(String databaseBackendName, boolean force)
       throws VirtualDatabaseException
@@ -94,6 +95,15 @@
   }
 
   /**
+   * @see 
org.continuent.sequoia.common.jmx.mbeans.VirtualDatabaseMBean#initializeFromBackend(java.lang.String)
+   */
+  public void initializeFromBackend(String databaseBackendName)
+      throws VirtualDatabaseException
+  {
+         initializeFromBackend(databaseBackendName, false);
+  }
+  
+  /**
    * @see 
org.continuent.sequoia.common.jmx.mbeans.VirtualDatabaseMBean#forceEnableBackend(java.lang.String)
    */
   public void forceEnableBackend(String databaseBackendName)