[teiid-commits] teiid SVN: r737 - trunk/adminshell/src/main/resources/scripts.

[teiid-commits at lists.jboss.org]

Author: vhalbert at redhat.com
Date: 2009-04-09 13:28:05 -0400 (Thu, 09 Apr 2009)
New Revision: 737

Modified:
   trunk/adminshell/src/main/resources/scripts/adminapi.bsh
Log:
JBEDSP 977 - In updating the utility scripts, the adminapi.bsh needed to expose the method to support passing in the AdminOptions

Modified: trunk/adminshell/src/main/resources/scripts/adminapi.bsh
===================================================================
--- trunk/adminshell/src/main/resources/scripts/adminapi.bsh	2009-04-09 15:57:28 UTC (rev 736)
+++ trunk/adminshell/src/main/resources/scripts/adminapi.bsh	2009-04-09 17:28:05 UTC (rev 737)
@@ -13,7 +13,7 @@
 
 /**
  * Import a {@link VDB} file. <br>
- * A VDB file with internal definitions. This is the default VDB export configuration begining with MetaMatrix version 4.3.</br>
+ * A VDB file with internal definitions. This is the default VDB export configuration beginning with MetaMatrix version 4.3.</br>
  * 
  * @param name
  *            VDB Name
@@ -33,7 +33,7 @@
 /**
  * Import a {@link VDB} file.
  * <br>A VDB file with internal definitions. This is the default VDB export configuration
- * begining with MetaMatrix version 4.3.</br>
+ * beginning with MetaMatrix version 4.3.</br>
  *
  * @param name
  *            VDB Name
@@ -54,6 +54,28 @@
 }
 
 /**
+ * Import a {@link VDB} file.
+ * <br>A VDB file with internal definitions. This is the default VDB export configuration
+ * begining with MetaMatrix version 4.3.</br>
+ *
+ * @param name
+ *            VDB Name
+ * @param vdbFile
+ *            byte array of the VDB Archive
+ * @param AdminOptions that defines the options on how to import the vdb and its related connector bindings.
+ * See {@link AdminOptions}.
+ * @throws AdminException
+ *             if there's a system error.
+ * @return the {@link VDB} representing the current property values and runtime state.
+ * @since 6.1.0
+ */
+VDB addVDB(String name, String vdbFile, AdminOptions options) {
+    debug("Adding VDB " + name + " from " + vdbFile);
+    checkAdmin();    
+    return currentContext().internalAdmin.addVDB(name, readBinaryFile(vdbFile), options);
+}
+
+/**
  * Export VDB to a file.
  * 
  * @param name