Changeset 33417 in vbox

Timestamp:

Oct 25, 2010 12:32:50 PM (14 years ago)

Author:

vboxsync

Message:

FE;Main;OVF: On export name the disks like the ovf + disk + number.

Location:

trunk

Files:

• doc/manual/en_US/SDKRef.xml (modified) (1 diff)
• src/VBox/Frontends/VBoxManage/VBoxManageAppliance.cpp (modified) (3 diffs)
• src/VBox/Frontends/VirtualBox/src/wizards/Makefile.kup (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/src/Makefile.kup )
• src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/Makefile.kup (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/src/Makefile.kup )
• src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIExportApplianceWzd.cpp (modified) (15 diffs)
• src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIExportApplianceWzd.h (modified) (4 diffs)
• src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIExportApplianceWzdPage2.ui (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIExportApplianceWzdPage3.ui ) (1 diff)
• src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIExportApplianceWzdPage3.ui (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIExportApplianceWzdPage4.ui ) (1 diff)
• src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIExportApplianceWzdPage4.ui (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIExportApplianceWzdPage2.ui ) (1 diff)
• src/VBox/Main/ApplianceImpl.cpp (modified) (2 diffs)
• src/VBox/Main/ApplianceImplExport.cpp (modified) (5 diffs)
• src/VBox/Main/idl/VirtualBox.xidl (modified) (2 diffs)
• src/VBox/Main/include/ApplianceImpl.h (modified) (4 diffs)
• src/VBox/Main/include/ApplianceImplPrivate.h (modified) (2 diffs)
• src/VBox/Main/include/MachineImpl.h (modified) (1 diff)

trunk/doc/manual/en_US/SDKRef.xml

@@ -3499 +3499 @@
 
         <listitem>
+          <para><xref linkend="IMachine__export"
+          xreflabel="IMachine::export()" /> received an extra parameter
+          <computeroutput>location</computeroutput>, which is used to decide
+          for the disk nameing.</para>
+        </listitem>
+        <listitem>
           <para><xref linkend="IAppliance__write"
           xreflabel="IAppliance::write()" /> received an extra parameter

trunk/src/VBox/Frontends/VBoxManage/VBoxManageAppliance.cpp

@@ -927 +927 @@
         CHECK_ERROR_BREAK(a->virtualBox, CreateAppliance(pAppliance.asOutParam()));
 
+        char *pszAbsFilePath = 0;
+        if (strOutputFile.startsWith("S3://", iprt::MiniString::CaseInsensitive) ||
+            strOutputFile.startsWith("SunCloud://", iprt::MiniString::CaseInsensitive) ||
+            strOutputFile.startsWith("webdav://", iprt::MiniString::CaseInsensitive))
+            pszAbsFilePath = RTStrDup(strOutputFile.c_str());
+        else
+            pszAbsFilePath = RTPathAbsDup(strOutputFile.c_str());
+
         std::list< ComPtr<IMachine> >::iterator itM;
         uint32_t i=0;
@@ -935 +943 @@
             ComPtr<IMachine> pMachine = *itM;
             ComPtr<IVirtualSystemDescription> pVSD;
-            CHECK_ERROR_BREAK(pMachine, Export(pAppliance, pVSD.asOutParam()));
+            CHECK_ERROR_BREAK(pMachine, Export(pAppliance, Bstr(pszAbsFilePath).raw(), pVSD.asOutParam()));
             // Add additional info to the virtal system description if the user wants so
             ArgsMap *pmapArgs = NULL;
@@ -1001 +1009 @@
 
         ComPtr<IProgress> progress;
-        char *pszAbsFilePath;
-        if (strOutputFile.startsWith("S3://", iprt::MiniString::CaseInsensitive) ||
-            strOutputFile.startsWith("SunCloud://", iprt::MiniString::CaseInsensitive) ||
-            strOutputFile.startsWith("webdav://", iprt::MiniString::CaseInsensitive))
-            pszAbsFilePath = RTStrDup(strOutputFile.c_str());
-        else
-            pszAbsFilePath = RTPathAbsDup(strOutputFile.c_str());
         CHECK_ERROR_BREAK(pAppliance, Write(Bstr(strOvfFormat).raw(),
                                             fManifest,

trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIExportApplianceWzd.cpp

@@ -152 +152 @@
 }
 
+int UIExportApplianceWzdPage1::nextId() const
+{
+    /* Skip next (3rd, storage-type) page for now! */
+    return wizard()->page(QIWizardPage::nextId())->nextId();
+}
+
 void UIExportApplianceWzdPage1::sltSelectedVMChanged()
 {
@@ -204 +210 @@
     /* Decorate page */
     Ui::UIExportApplianceWzdPage2::setupUi(this);
-
-    /* Register ExportAppliancePointer class */
-    qRegisterMetaType<ExportAppliancePointer>();
-
-    /* Register 'applianceWidget' field! */
-    registerField("applianceWidget", this, "applianceWidget");
-    m_pApplianceWidget = m_pSettingsCnt;
-}
-
-void UIExportApplianceWzdPage2::retranslateUi()
-{
-    /* Translate uic generated strings */
-    Ui::UIExportApplianceWzdPage2::retranslateUi(this);
-
-    /* Wizard page 2 title */
-    setTitle(tr("Appliance Export Settings"));
-}
-
-void UIExportApplianceWzdPage2::initializePage()
-{
-    /* Fill and translate */
-    retranslateUi();
-
-    /* We propose a filename the first time the second page is displayed */
-    prepareSettingsWidget();
-}
-
-void UIExportApplianceWzdPage2::cleanupPage()
-{
-    /* Do NOT call superclass method, it will clean defailt (initially set) field - 'applianceWidget'! */
-}
-
-int UIExportApplianceWzdPage2::nextId() const
-{
-    /* Skip next (3rd, storage-type) page for now! */
-    return wizard()->page(QIWizardPage::nextId())->nextId();
-}
-
-bool UIExportApplianceWzdPage2::prepareSettingsWidget()
-{
-    CVirtualBox vbox = vboxGlobal().virtualBox();
-    CAppliance *appliance = m_pSettingsCnt->init();
-    bool fResult = appliance->isOk();
-    if (fResult)
-    {
-        /* Iterate over all the selected machine ids */
-        QStringList uuids = field("machineIDs").toStringList();
-        foreach (const QString &uuid, uuids)
-        {
-            /* Get the machine with the uuid */
-            CMachine m = vbox.FindMachine(uuid);
-            fResult = m.isOk();
-            if (fResult)
-            {
-                /* Add the export description to our appliance object */
-                CVirtualSystemDescription vsd = m.Export(*appliance);
-                fResult = m.isOk();
-                if (!fResult)
-                {
-                    vboxProblem().cannotExportAppliance(m, appliance, this);
-                    return false;
-                }
-                /* Now add some new fields the user may change */
-                vsd.AddDescription(KVirtualSystemDescriptionType_Product, "", "");
-                vsd.AddDescription(KVirtualSystemDescriptionType_ProductUrl, "", "");
-                vsd.AddDescription(KVirtualSystemDescriptionType_Vendor, "", "");
-                vsd.AddDescription(KVirtualSystemDescriptionType_VendorUrl, "", "");
-                vsd.AddDescription(KVirtualSystemDescriptionType_Version, "", "");
-                vsd.AddDescription(KVirtualSystemDescriptionType_License, "", "");
-            }
-            else
-                break;
-        }
-        /* Make sure the settings widget get the new descriptions */
-        m_pSettingsCnt->populate();
-    }
-    if (!fResult)
-        vboxProblem().cannotExportAppliance(appliance, this);
-    return fResult;
-}
-
-UIExportApplianceWzdPage3::UIExportApplianceWzdPage3()
-{
-    /* Decorate page */
-    Ui::UIExportApplianceWzdPage3::setupUi(this);
 
     /* Register StorageType class */
@@ -330 +251 @@
 }
 
-void UIExportApplianceWzdPage3::retranslateUi()
+void UIExportApplianceWzdPage2::retranslateUi()
 {
     /* Translate uic generated strings */
-    Ui::UIExportApplianceWzdPage3::retranslateUi(this);
+    Ui::UIExportApplianceWzdPage2::retranslateUi(this);
 
     /* Wizard page 3 title */
@@ -339 +260 @@
 }
 
-void UIExportApplianceWzdPage3::initializePage()
+void UIExportApplianceWzdPage2::initializePage()
 {
     /* Fill and translate */
@@ -348 +269 @@
 }
 
-void UIExportApplianceWzdPage3::sltStorageTypeChanged()
+void UIExportApplianceWzdPage2::sltStorageTypeChanged()
 {
     /* Update selected storage-type */
@@ -363 +284 @@
 }
 
-UIExportApplianceWzdPage4::UIExportApplianceWzdPage4()
+UIExportApplianceWzdPage3::UIExportApplianceWzdPage3()
 {
     /* Decorate page */
-    Ui::UIExportApplianceWzdPage4::setupUi(this);
+    Ui::UIExportApplianceWzdPage3::setupUi(this);
 
     /* Configure the file selector */
@@ -381 +302 @@
     connect(m_pFileSelector, SIGNAL(pathChanged(const QString &)), this, SIGNAL(completeChanged()));
 
+    /* Register 'target' fields! */
+    registerField("OVF09Selected", this, "OVF09Selected");
+    registerField("manifestSelected", this, "manifestSelected");
+    registerField("username", this, "username");
+    registerField("password", this, "password");
+    registerField("hostname", this, "hostname");
+    registerField("bucket", this, "bucket");
+    registerField("path", this, "path");
+
 #if 0
     /* Load default attributes from GUI extra data */
@@ -389 +319 @@
 }
 
-void UIExportApplianceWzdPage4::retranslateUi()
+void UIExportApplianceWzdPage3::retranslateUi()
 {
     /* Translate uic generated strings */
-    Ui::UIExportApplianceWzdPage4::retranslateUi(this);
+    Ui::UIExportApplianceWzdPage3::retranslateUi(this);
 
     /* Wizard page 4 title */
@@ -405 +335 @@
 }
 
-void UIExportApplianceWzdPage4::initializePage()
+void UIExportApplianceWzdPage3::initializePage()
 {
     /* Fill and translate */
@@ -489 +419 @@
 }
 
-bool UIExportApplianceWzdPage4::isComplete() const
+bool UIExportApplianceWzdPage3::isComplete() const
 {
     const QString &strFile = m_pFileSelector->path().toLower();
@@ -510 +440 @@
 }
 
+bool UIExportApplianceWzdPage3::validatePage()
+{
+    return true;
+//    return exportAppliance();
+}
+
+UIExportApplianceWzdPage4::UIExportApplianceWzdPage4()
+{
+    /* Decorate page */
+    Ui::UIExportApplianceWzdPage4::setupUi(this);
+
+    /* Register ExportAppliancePointer class */
+    qRegisterMetaType<ExportAppliancePointer>();
+
+    /* Register 'applianceWidget' field! */
+    registerField("applianceWidget", this, "applianceWidget");
+    m_pApplianceWidget = m_pSettingsCnt;
+}
+
+void UIExportApplianceWzdPage4::retranslateUi()
+{
+    /* Translate uic generated strings */
+    Ui::UIExportApplianceWzdPage4::retranslateUi(this);
+
+    /* Wizard page 2 title */
+    setTitle(tr("Appliance Export Settings"));
+}
+
+void UIExportApplianceWzdPage4::initializePage()
+{
+    /* Fill and translate */
+    retranslateUi();
+
+    /* We propose a filename the first time the second page is displayed */
+    prepareSettingsWidget();
+}
+
+void UIExportApplianceWzdPage4::cleanupPage()
+{
+    /* Do NOT call superclass method, it will clean defailt (initially set) field - 'applianceWidget'! */
+}
+
 bool UIExportApplianceWzdPage4::validatePage()
 {
     return exportAppliance();
+}
+
+bool UIExportApplianceWzdPage4::prepareSettingsWidget()
+{
+    CVirtualBox vbox = vboxGlobal().virtualBox();
+    CAppliance *appliance = m_pSettingsCnt->init();
+    bool fResult = appliance->isOk();
+    if (fResult)
+    {
+        /* Iterate over all the selected machine ids */
+        QStringList uuids = field("machineIDs").toStringList();
+        foreach (const QString &uuid, uuids)
+        {
+            /* Get the machine with the uuid */
+            CMachine m = vbox.FindMachine(uuid);
+            fResult = m.isOk();
+            if (fResult)
+            {
+                /* Add the export description to our appliance object */
+                CVirtualSystemDescription vsd = m.Export(*appliance, uri());
+                fResult = m.isOk();
+                if (!fResult)
+                {
+                    vboxProblem().cannotExportAppliance(m, appliance, this);
+                    return false;
+                }
+                /* Now add some new fields the user may change */
+                vsd.AddDescription(KVirtualSystemDescriptionType_Product, "", "");
+                vsd.AddDescription(KVirtualSystemDescriptionType_ProductUrl, "", "");
+                vsd.AddDescription(KVirtualSystemDescriptionType_Vendor, "", "");
+                vsd.AddDescription(KVirtualSystemDescriptionType_VendorUrl, "", "");
+                vsd.AddDescription(KVirtualSystemDescriptionType_Version, "", "");
+                vsd.AddDescription(KVirtualSystemDescriptionType_License, "", "");
+            }
+            else
+                break;
+        }
+        /* Make sure the settings widget get the new descriptions */
+        m_pSettingsCnt->populate();
+    }
+    if (!fResult)
+        vboxProblem().cannotExportAppliance(appliance, this);
+    return fResult;
 }
 
@@ -525 +540 @@
      * HardDiskImage. Also add the manifest file to the check. In the ova
      * case only the target file itself get checked. */
-    QFileInfo fi(m_pFileSelector->path());
+    QFileInfo fi(field("path").toString());
     QVector<QString> files;
     files << fi.fileName();
     if (fi.suffix().toLower() == "ovf")
     {
-        if (m_pSelectManifest->isChecked())
+        if (field("manifestSelected").toBool())
             files << fi.baseName() + ".mf";
         CVirtualSystemDescriptionVector vsds = appliance->GetVirtualSystemDescriptions();
@@ -600 +615 @@
 {
     /* Write the appliance */
-    const QString version = m_pSelectOVF09->isChecked() ? "ovf-0.9" : "ovf-1.0";
-    CProgress progress = appliance.Write(version, m_pSelectManifest->isChecked() /* fManifest */, uri());
+    const QString version = field("OVF09Selected").toBool() ? "ovf-0.9" : "ovf-1.0";
+    CProgress progress = appliance.Write(version, field("manifestSelected").toBool() /* fManifest */, uri());
     bool fResult = appliance.isOk();
     if (fResult)
@@ -629 +644 @@
         case Filesystem:
         {
-            return m_pFileSelector->path();
+            return field("path").toString();
         }
         case SunCloud:
         {
             QString uri("SunCloud://");
-            if (!m_pLeUsername->text().isEmpty())
-                uri = QString("%1%2").arg(uri).arg(m_pLeUsername->text());
-            if (!m_pLePassword->text().isEmpty())
-                uri = QString("%1:%2").arg(uri).arg(m_pLePassword->text());
-            if (!m_pLeUsername->text().isEmpty() || !m_pLePassword->text().isEmpty())
+            if (!field("username").toString().isEmpty())
+                uri = QString("%1%2").arg(uri).arg(field("username").toString());
+            if (!field("password").toString().isEmpty())
+                uri = QString("%1:%2").arg(uri).arg(field("password").toString());
+            if (!field("username").toString().isEmpty() || !field("username").toString().isEmpty())
                 uri = QString("%1@").arg(uri);
-            uri = QString("%1%2/%3/%4").arg(uri).arg("object.storage.network.com").arg(m_pLeBucket->text()).arg(m_pFileSelector->path());
+            uri = QString("%1%2/%3/%4").arg(uri).arg("object.storage.network.com").arg(field("bucket").toString()).arg(field("path").toString());
             return uri;
         }
@@ -646 +661 @@
         {
             QString uri("S3://");
-            if (!m_pLeUsername->text().isEmpty())
-                uri = QString("%1%2").arg(uri).arg(m_pLeUsername->text());
-            if (!m_pLePassword->text().isEmpty())
-                uri = QString("%1:%2").arg(uri).arg(m_pLePassword->text());
-            if (!m_pLeUsername->text().isEmpty() || !m_pLePassword->text().isEmpty())
+            if (!field("username").toString().isEmpty())
+                uri = QString("%1%2").arg(uri).arg(field("username").toString());
+            if (!field("password").toString().isEmpty())
+                uri = QString("%1:%2").arg(uri).arg(field("password").toString());
+            if (!field("username").toString().isEmpty() || !field("password").toString().isEmpty())
                 uri = QString("%1@").arg(uri);
-            uri = QString("%1%2/%3/%4").arg(uri).arg(m_pLeHostname->text()).arg(m_pLeBucket->text()).arg(m_pFileSelector->path());
+            uri = QString("%1%2/%3/%4").arg(uri).arg(field("hostname").toString()).arg(field("bucket").toString()).arg(field("path").toString());
             return uri;
         }

trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIExportApplianceWzd.h

@@ -78 +78 @@
     bool isComplete() const;
 
+    int nextId() const;
+
 private slots:
 
@@ -102 +104 @@
 {
     Q_OBJECT;
+    Q_PROPERTY(StorageType storageType READ storageType WRITE setStorageType);
+
+public:
+
+    UIExportApplianceWzdPage2();
+
+protected:
+
+    void retranslateUi();
+
+    void initializePage();
+
+private slots:
+
+    void sltStorageTypeChanged();
+
+private:
+
+    StorageType storageType() const { return m_StorageType; }
+    void setStorageType(StorageType storageType) { m_StorageType = storageType; }
+    StorageType m_StorageType;
+};
+
+class UIExportApplianceWzdPage3 : public QIWizardPage, public Ui::UIExportApplianceWzdPage3
+{
+    Q_OBJECT;
+
+    Q_PROPERTY(bool OVF09Selected READ isOVF09Selected);
+    Q_PROPERTY(bool manifestSelected READ isManifestSelected);
+    Q_PROPERTY(QString username READ username);
+    Q_PROPERTY(QString password READ password);
+    Q_PROPERTY(QString hostname READ hostname);
+    Q_PROPERTY(QString bucket READ bucket);
+    Q_PROPERTY(QString path READ path);
+
+public:
+
+    UIExportApplianceWzdPage3();
+
+protected:
+
+    void retranslateUi();
+
+    void initializePage();
+
+    bool isComplete() const;
+    bool validatePage();
+
+private:
+
+    bool isOVF09Selected() const { return m_pSelectOVF09->isChecked(); }
+    bool isManifestSelected() const { return m_pSelectManifest->isChecked(); }
+    QString username() const { return m_pLeUsername->text(); }
+    QString password() const { return m_pLePassword->text(); }
+    QString hostname() const { return m_pLeHostname->text(); }
+    QString bucket() const { return m_pLeBucket->text(); }
+    QString path() const { return m_pFileSelector->path(); }
+
+    QString m_strDefaultApplianceName;
+};
+
+class UIExportApplianceWzdPage4 : public QIWizardPage, public Ui::UIExportApplianceWzdPage4
+{
+    Q_OBJECT;
     Q_PROPERTY(ExportAppliancePointer applianceWidget READ applianceWidget WRITE setApplianceWidget);
 
 public:
 
-    UIExportApplianceWzdPage2();
+    UIExportApplianceWzdPage4();
 
 protected:
@@ -115 +181 @@
     void cleanupPage();
 
-    int nextId() const;
+    bool validatePage();
 
 private:
 
     bool prepareSettingsWidget();
+
+    bool exportAppliance();
+    bool exportVMs(CAppliance &appliance);
+    QString uri() const;
 
     ExportAppliancePointer applianceWidget() const { return m_pApplianceWidget; }
@@ -126 +196 @@
 };
 
-class UIExportApplianceWzdPage3 : public QIWizardPage, public Ui::UIExportApplianceWzdPage3
-{
-    Q_OBJECT;
-    Q_PROPERTY(StorageType storageType READ storageType WRITE setStorageType);
-
-public:
-
-    UIExportApplianceWzdPage3();
-
-protected:
-
-    void retranslateUi();
-
-    void initializePage();
-
-private slots:
-
-    void sltStorageTypeChanged();
-
-private:
-
-    StorageType storageType() const { return m_StorageType; }
-    void setStorageType(StorageType storageType) { m_StorageType = storageType; }
-    StorageType m_StorageType;
-};
-
-class UIExportApplianceWzdPage4 : public QIWizardPage, public Ui::UIExportApplianceWzdPage4
-{
-    Q_OBJECT;
-
-public:
-
-    UIExportApplianceWzdPage4();
-
-protected:
-
-    void retranslateUi();
-
-    void initializePage();
-
-    bool isComplete() const;
-    bool validatePage();
-
-private:
-
-    bool exportAppliance();
-    bool exportVMs(CAppliance &appliance);
-    QString uri() const;
-
-    QString m_strDefaultApplianceName;
-};
 
 #endif /* __UIExportApplianceWzd_h__ */

trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIExportApplianceWzdPage2.ui

@@ -14 +14 @@
      hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
  </comment>
- <class>UIExportApplianceWzdPage3</class>
- <widget class="QWidget" name="UIExportApplianceWzdPage3">
+ <class>UIExportApplianceWzdPage2</class>
+ <widget class="QWidget" name="UIExportApplianceWzdPage2">
   <property name="geometry">
    <rect>

trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIExportApplianceWzdPage3.ui

@@ -14 +14 @@
      hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
  </comment>
- <class>UIExportApplianceWzdPage4</class>
- <widget class="QWidget" name="UIExportApplianceWzdPage4">
+ <class>UIExportApplianceWzdPage3</class>
+ <widget class="QWidget" name="UIExportApplianceWzdPage3">
   <property name="geometry">
    <rect>

trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIExportApplianceWzdPage4.ui

@@ -14 +14 @@
      hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
  </comment>
- <class>UIExportApplianceWzdPage2</class>
- <widget class="QWidget" name="UIExportApplianceWzdPage2">
+ <class>UIExportApplianceWzdPage4</class>
+ <widget class="QWidget" name="UIExportApplianceWzdPage4">
   <property name="geometry">
    <rect>

trunk/src/VBox/Main/ApplianceImpl.cpp

@@ -854 +854 @@
 }
 
-void Appliance::parseURI(Utf8Str strUri, LocationInfo &locInfo) const
+void Appliance::parseBucket(Utf8Str &aPath, Utf8Str &aBucket)
+{
+    /* Buckets are S3 specific. So parse the bucket out of the file path */
+    if (!aPath.startsWith("/"))
+        throw setError(E_INVALIDARG,
+                       tr("The path '%s' must start with /"), aPath.c_str());
+    size_t bpos = aPath.find("/", 1);
+    if (bpos != Utf8Str::npos)
+    {
+        aBucket = aPath.substr(1, bpos - 1); /* The bucket without any slashes */
+        aPath = aPath.substr(bpos); /* The rest of the file path */
+    }
+    /* If there is no bucket name provided reject it */
+    if (aBucket.isEmpty())
+        throw setError(E_INVALIDARG,
+                       tr("You doesn't provide a bucket name in the URI '%s'"), aPath.c_str());
+}
+
+/**
+ *
+ * @return
+ */
+int Appliance::TaskOVF::startThread()
+{
+    int vrc = RTThreadCreate(NULL, Appliance::taskThreadImportOrExport, this,
+                             0, RTTHREADTYPE_MAIN_HEAVY_WORKER, 0,
+                             "Appliance::Task");
+
+    if (RT_FAILURE(vrc))
+        return Appliance::setErrorStatic(E_FAIL,
+                                         Utf8StrFmt("Could not create OVF task thread (%Rrc)\n", vrc));
+
+    return S_OK;
+}
+
+/**
+ * Thread function for the thread started in Appliance::readImpl() and Appliance::importImpl()
+ * and Appliance::writeImpl().
+ * This will in turn call Appliance::readFS() or Appliance::readS3() or Appliance::importFS()
+ * or Appliance::importS3() or Appliance::writeFS() or Appliance::writeS3().
+ *
+ * @param aThread
+ * @param pvUser
+ */
+/* static */
+DECLCALLBACK(int) Appliance::taskThreadImportOrExport(RTTHREAD /* aThread */, void *pvUser)
+{
+    std::auto_ptr<TaskOVF> task(static_cast<TaskOVF*>(pvUser));
+    AssertReturn(task.get(), VERR_GENERAL_FAILURE);
+
+    Appliance *pAppliance = task->pAppliance;
+
+    LogFlowFuncEnter();
+    LogFlowFunc(("Appliance %p\n", pAppliance));
+
+    HRESULT taskrc = S_OK;
+
+    switch (task->taskType)
+    {
+        case TaskOVF::Read:
+            if (task->locInfo.storageType == VFSType_File)
+                taskrc = pAppliance->readFS(task.get());
+            else if (task->locInfo.storageType == VFSType_S3)
+                taskrc = pAppliance->readS3(task.get());
+        break;
+
+        case TaskOVF::Import:
+            if (task->locInfo.storageType == VFSType_File)
+                taskrc = pAppliance->importFS(task.get());
+            else if (task->locInfo.storageType == VFSType_S3)
+                taskrc = pAppliance->importS3(task.get());
+        break;
+
+        case TaskOVF::Write:
+            if (task->locInfo.storageType == VFSType_File)
+                taskrc = pAppliance->writeFS(task.get());
+            else if (task->locInfo.storageType == VFSType_S3)
+                taskrc = pAppliance->writeS3(task.get());
+        break;
+    }
+
+    task->rc = taskrc;
+
+    if (!task->pProgress.isNull())
+        task->pProgress->notifyComplete(taskrc);
+
+    LogFlowFuncLeave();
+
+    return VINF_SUCCESS;
+}
+
+/* static */
+int Appliance::TaskOVF::updateProgress(unsigned uPercent, void *pvUser)
+{
+    Appliance::TaskOVF* pTask = *(Appliance::TaskOVF**)pvUser;
+
+    if (    pTask
+         && !pTask->pProgress.isNull())
+    {
+        BOOL fCanceled;
+        pTask->pProgress->COMGETTER(Canceled)(&fCanceled);
+        if (fCanceled)
+            return -1;
+        pTask->pProgress->SetCurrentOperationProgress(uPercent);
+    }
+    return VINF_SUCCESS;
+}
+
+void parseURI(Utf8Str strUri, LocationInfo &locInfo)
 {
     /* Check the URI for the protocol */
@@ -901 +1009 @@
 }
 
-void Appliance::parseBucket(Utf8Str &aPath, Utf8Str &aBucket)
-{
-    /* Buckets are S3 specific. So parse the bucket out of the file path */
-    if (!aPath.startsWith("/"))
-        throw setError(E_INVALIDARG,
-                       tr("The path '%s' must start with /"), aPath.c_str());
-    size_t bpos = aPath.find("/", 1);
-    if (bpos != Utf8Str::npos)
-    {
-        aBucket = aPath.substr(1, bpos - 1); /* The bucket without any slashes */
-        aPath = aPath.substr(bpos); /* The rest of the file path */
-    }
-    /* If there is no bucket name provided reject it */
-    if (aBucket.isEmpty())
-        throw setError(E_INVALIDARG,
-                       tr("You doesn't provide a bucket name in the URI '%s'"), aPath.c_str());
-}
-
-/**
- *
- * @return
- */
-int Appliance::TaskOVF::startThread()
-{
-    int vrc = RTThreadCreate(NULL, Appliance::taskThreadImportOrExport, this,
-                             0, RTTHREADTYPE_MAIN_HEAVY_WORKER, 0,
-                             "Appliance::Task");
-
-    if (RT_FAILURE(vrc))
-        return Appliance::setErrorStatic(E_FAIL,
-                                         Utf8StrFmt("Could not create OVF task thread (%Rrc)\n", vrc));
-
-    return S_OK;
-}
-
-/**
- * Thread function for the thread started in Appliance::readImpl() and Appliance::importImpl()
- * and Appliance::writeImpl().
- * This will in turn call Appliance::readFS() or Appliance::readS3() or Appliance::importFS()
- * or Appliance::importS3() or Appliance::writeFS() or Appliance::writeS3().
- *
- * @param aThread
- * @param pvUser
- */
-/* static */
-DECLCALLBACK(int) Appliance::taskThreadImportOrExport(RTTHREAD /* aThread */, void *pvUser)
-{
-    std::auto_ptr<TaskOVF> task(static_cast<TaskOVF*>(pvUser));
-    AssertReturn(task.get(), VERR_GENERAL_FAILURE);
-
-    Appliance *pAppliance = task->pAppliance;
-
-    LogFlowFuncEnter();
-    LogFlowFunc(("Appliance %p\n", pAppliance));
-
-    HRESULT taskrc = S_OK;
-
-    switch (task->taskType)
-    {
-        case TaskOVF::Read:
-            if (task->locInfo.storageType == VFSType_File)
-                taskrc = pAppliance->readFS(task.get());
-            else if (task->locInfo.storageType == VFSType_S3)
-                taskrc = pAppliance->readS3(task.get());
-        break;
-
-        case TaskOVF::Import:
-            if (task->locInfo.storageType == VFSType_File)
-                taskrc = pAppliance->importFS(task.get());
-            else if (task->locInfo.storageType == VFSType_S3)
-                taskrc = pAppliance->importS3(task.get());
-        break;
-
-        case TaskOVF::Write:
-            if (task->locInfo.storageType == VFSType_File)
-                taskrc = pAppliance->writeFS(task.get());
-            else if (task->locInfo.storageType == VFSType_S3)
-                taskrc = pAppliance->writeS3(task.get());
-        break;
-    }
-
-    task->rc = taskrc;
-
-    if (!task->pProgress.isNull())
-        task->pProgress->notifyComplete(taskrc);
-
-    LogFlowFuncLeave();
-
-    return VINF_SUCCESS;
-}
-
-/* static */
-int Appliance::TaskOVF::updateProgress(unsigned uPercent, void *pvUser)
-{
-    Appliance::TaskOVF* pTask = *(Appliance::TaskOVF**)pvUser;
-
-    if (    pTask
-         && !pTask->pProgress.isNull())
-    {
-        BOOL fCanceled;
-        pTask->pProgress->COMGETTER(Canceled)(&fCanceled);
-        if (fCanceled)
-            return -1;
-        pTask->pProgress->SetCurrentOperationProgress(uPercent);
-    }
-    return VINF_SUCCESS;
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 //

trunk/src/VBox/Main/ApplianceImplExport.cpp

@@ -57 +57 @@
 * @return
 */
-
-STDMETHODIMP Machine::Export(IAppliance *aAppliance, IVirtualSystemDescription **aDescription)
+STDMETHODIMP Machine::Export(IAppliance *aAppliance, IN_BSTR location, IVirtualSystemDescription **aDescription)
 {
     HRESULT rc = S_OK;
@@ -72 +71 @@
     try
     {
+        Appliance *pAppliance = static_cast<Appliance*>(aAppliance);
+        AutoCaller autoCaller1(pAppliance);
+        if (FAILED(autoCaller1.rc())) return autoCaller1.rc();
+
+        LocationInfo locInfo;
+        parseURI(location, locInfo);
         // create a new virtual system to store in the appliance
         rc = pNewDesc.createObject();
@@ -342 +347 @@
                 if (FAILED(rc)) throw rc;
 
-                strTargetVmdkName = bstrBaseName;
-                strTargetVmdkName.stripExt();
-                strTargetVmdkName.append(".vmdk");
+                Utf8Str strTargetName = Utf8Str(locInfo.strPath).stripPath().stripExt();
+                strTargetVmdkName = Utf8StrFmt("%s-disk%d.vmdk", strTargetName.c_str(), ++pAppliance->m->cDisks);
 
                 // force reading state, or else size will be returned as 0
@@ -521 +525 @@
                                Utf8StrFmt("%RI32", audioController));
 
-        // finally, add the virtual system to the appliance
-        Appliance *pAppliance = static_cast<Appliance*>(aAppliance);
-        AutoCaller autoCaller1(pAppliance);
-        if (FAILED(autoCaller1.rc())) return autoCaller1.rc();
-
         /* We return the new description to the caller */
         ComPtr<IVirtualSystemDescription> copy(pNewDesc);
@@ -531 +530 @@
 
         AutoWriteLock alock(pAppliance COMMA_LOCKVAL_SRC_POS);
-
+        // finally, add the virtual system to the appliance
         pAppliance->m->virtualSystemDescriptions.push_back(pNewDesc);
     }

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -3379 +3379 @@
   <interface
      name="IMachine" extends="$unknown"
-     uuid="8934e426-1c09-459f-bbc4-58dba016fbbe"
+     uuid="cc4fec9a-3150-45df-9ee9-f00ba54d6ac3"
      wsmap="managed"
      >
@@ -5093 +5093 @@
       <param name="aAppliance" type="IAppliance" dir="in">
         <desc>Appliance to export this machine to.</desc>
+      </param>
+      <param name="location" type="wstring" dir="in">
+        <desc>The target location.</desc>
       </param>
       <param name="aDescription" type="IVirtualSystemDescription" dir="return">

trunk/src/VBox/Main/include/ApplianceImpl.h

@@ -32 +32 @@
 class VirtualSystemDescription;
 struct VirtualSystemDescriptionEntry;
+struct LocationInfo;
 typedef struct VDINTERFACE   *PVDINTERFACE;
 typedef struct VDINTERFACEIO *PVDINTERFACEIO;
@@ -120 +121 @@
     struct ImportStack;
     struct TaskOVF;
-    struct LocationInfo;
     struct Data;            // opaque, defined in ApplianceImpl.cpp
     Data *m;
@@ -139 +139 @@
     void addWarning(const char* aWarning, ...);
     void disksWeight();
-    void parseURI(Utf8Str strUri, LocationInfo &locInfo) const;
     void parseBucket(Utf8Str &aPath, Utf8Str &aBucket);
 
@@ -223 +222 @@
 };
 
+void parseURI(Utf8Str strUri, LocationInfo &locInfo);
+
 struct VirtualSystemDescriptionEntry
 {

trunk/src/VBox/Main/include/ApplianceImplPrivate.h

@@ -33 +33 @@
 /* Describe a location for the import/export. The location could be a file on a
  * local hard disk or a remote target based on the supported inet protocols. */
-struct Appliance::LocationInfo
+struct LocationInfo
 {
     LocationInfo()
@@ -53 +53 @@
       , fManifest(true)
       , pReader(NULL)
+      , ulWeightForXmlOperation(0)
+      , ulWeightForManifestOperation(0)
+      , ulTotalDisksMB(0)
+      , cDisks(0)
     {
     }

trunk/src/VBox/Main/include/MachineImpl.h

@@ -490 +490 @@
     STDMETHOD(Unregister)(CleanupMode_T cleanupMode, ComSafeArrayOut(IMedium*, aMedia));
     STDMETHOD(Delete)(ComSafeArrayIn(IMedium*, aMedia), IProgress **aProgress);
-    STDMETHOD(Export)(IAppliance *aAppliance, IVirtualSystemDescription **aDescription);
+    STDMETHOD(Export)(IAppliance *aAppliance, IN_BSTR location, IVirtualSystemDescription **aDescription);
     STDMETHOD(FindSnapshot)(IN_BSTR aNameOrId, ISnapshot **aSnapshot);
     STDMETHOD(CreateSharedFolder)(IN_BSTR aName, IN_BSTR aHostPath, BOOL aWritable, BOOL aAutoMount);