Tools packages refactoring

Project export fix

Former-commit-id: 8aab3e9b

plugins/org.jkiss.dbeaver.core/META-INF/MANIFEST.MF

@@ -58,6 +58,13 @@ Export-Package: org.apache.commons.logging,
  org.jkiss.dbeaver.runtime.qm,
  org.jkiss.dbeaver.runtime.qm.meta,
  org.jkiss.dbeaver.runtime.sql,
+ org.jkiss.dbeaver.tools,
+ org.jkiss.dbeaver.tools.data,
+ org.jkiss.dbeaver.tools.data.encoders,
+ org.jkiss.dbeaver.tools.data.handlers,
+ org.jkiss.dbeaver.tools.data.impl,
+ org.jkiss.dbeaver.tools.data.wizard,
+ org.jkiss.dbeaver.tools.project,
  org.jkiss.dbeaver.ui,
  org.jkiss.dbeaver.ui.actions,
  org.jkiss.dbeaver.ui.actions.common,
@@ -97,12 +104,6 @@ Export-Package: org.apache.commons.logging,
  org.jkiss.dbeaver.ui.editors.sql.syntax,
  org.jkiss.dbeaver.ui.editors.sql.util,
  org.jkiss.dbeaver.ui.editors.text,
- org.jkiss.dbeaver.ui.export.data,
- org.jkiss.dbeaver.ui.export.data.encoders,
- org.jkiss.dbeaver.ui.export.data.handlers,
- org.jkiss.dbeaver.ui.export.data.impl,
- org.jkiss.dbeaver.ui.export.data.wizard,
- org.jkiss.dbeaver.ui.export.project,
  org.jkiss.dbeaver.ui.preferences,
  org.jkiss.dbeaver.ui.properties,
  org.jkiss.dbeaver.ui.properties.tabbed,

plugins/org.jkiss.dbeaver.core/plugin.xml

@@ -356,7 +356,7 @@
                 </with>
             </activeWhen>
         </handler>
-        <handler commandId="org.jkiss.dbeaver.core.export.data" class="org.jkiss.dbeaver.ui.export.data.handlers.DataExportHandler">
+        <handler commandId="org.jkiss.dbeaver.core.export.data" class="org.jkiss.dbeaver.tools.data.handlers.DataExportHandler">
             <enabledWhen>
                 <with variable="selection">
                     <count value="+"/>
@@ -1714,7 +1714,7 @@
     <extension point="org.jkiss.dbeaver.dataExportProvider">
         <export
                 id="org.jkiss.dbeaver.core.dataExport.html"
-                class="org.jkiss.dbeaver.ui.export.data.impl.DataExporterHTML"
+                class="org.jkiss.dbeaver.tools.data.impl.DataExporterHTML"
                 description="%command.org.jkiss.dbeaver.core.resultset.export.html.description"
                 extension="html"
                 icon="icons/misc/html.png"
@@ -1725,7 +1725,7 @@
         </export>
         <export
                 id="org.jkiss.dbeaver.core.dataExport.csv"
-                class="org.jkiss.dbeaver.ui.export.data.impl.DataExporterCSV"
+                class="org.jkiss.dbeaver.tools.data.impl.DataExporterCSV"
                 description="%command.org.jkiss.dbeaver.core.resultset.export.csv.description"
                 extension="csv"
                 icon="icons/misc/csv.png"
@@ -1738,7 +1738,7 @@
         </export>
         <export
                 id="org.jkiss.dbeaver.core.dataExport.sql"
-                class="org.jkiss.dbeaver.ui.export.data.impl.DataExporterSQL"
+                class="org.jkiss.dbeaver.tools.data.impl.DataExporterSQL"
                 description="%command.org.jkiss.dbeaver.core.resultset.export.sql.description"
                 extension="sql"
                 icon="icons/misc/sql.png"
@@ -1780,7 +1780,7 @@
         <category id="org.jkiss.dbeaver.core.export.resources" name="DBeaver"/>
         <wizard
              category="org.jkiss.dbeaver.core.export.resources"
-             class="org.jkiss.dbeaver.ui.export.project.ProjectExportWizard"
+             class="org.jkiss.dbeaver.tools.project.ProjectExportWizard"
              icon="icons/project.png"
              id="org.jkiss.dbeaver.core.wizard.export.project"
              name="Project">
@@ -1790,7 +1790,7 @@
         </wizard>
         <wizard
              category="org.jkiss.dbeaver.core.export.resources"
-             class="org.jkiss.dbeaver.ui.export.scripts.ScriptsExportWizard"
+             class="org.jkiss.dbeaver.tools.scripts.ScriptsExportWizard"
              icon="icons/sql/sql_script.png"
              id="org.jkiss.dbeaver.core.wizard.export.scripts"
              name="Scripts">
@@ -1804,7 +1804,7 @@
         <category id="org.jkiss.dbeaver.core.import.resources" name="DBeaver"/>
         <wizard
             category="org.jkiss.dbeaver.core.import.resources"
-            class="org.jkiss.dbeaver.ui.export.project.ProjectImportWizard"
+            class="org.jkiss.dbeaver.tools.project.ProjectImportWizard"
             icon="icons/project.png"
             id="org.jkiss.dbeaver.core.wizard.import.project"
             name="Project">
@@ -1814,7 +1814,7 @@
         </wizard>
         <wizard
             category="org.jkiss.dbeaver.core.import.resources"
-            class="org.jkiss.dbeaver.ui.export.scripts.ScriptsImportWizard"
+            class="org.jkiss.dbeaver.tools.scripts.ScriptsImportWizard"
             icon="icons/sql/sql_script.png"
             id="org.jkiss.dbeaver.core.wizard.import.scripts"
             name="Scripts">
@@ -1828,7 +1828,7 @@
         <category id="org.jkiss.dbeaver.core.new.general" name="DBeaver"/>
         <wizard
              category="org.jkiss.dbeaver.core.new.general"
-             class="org.jkiss.dbeaver.ui.export.project.ProjectCreateWizard"
+             class="org.jkiss.dbeaver.tools.project.ProjectCreateWizard"
              icon="icons/project.png"
              id="org.jkiss.dbeaver.core.wizard.new.project"
              name="Project">

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/impl/resources/ScriptsHandlerImpl.java

@@ -113,7 +113,7 @@ public class ScriptsHandlerImpl extends AbstractResourceHandler {
         }
 
         // Make new script file
-        IFile tempFile = ContentUtils.getUniqueFile(scriptsFolder, CoreMessages.model_project_Script, SCRIPT_FILE_EXTENSION);
+        IFile tempFile = ContentUtils.getUniqueFile(scriptsFolder, "Script", SCRIPT_FILE_EXTENSION);
         tempFile.create(new ByteArrayInputStream(new byte[]{}), true, progressMonitor);
 
         // Save ds container reference

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/navigator/DBNResource.java

@@ -40,8 +40,6 @@ import java.util.List;
  */
 public class DBNResource extends DBNNode
 {
-    private final String PROJECT_CFG_FILE = ".project";
-
     private IResource resource;
     private DBPResourceHandler handler;
     private List<DBNNode> children;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/DataExporterDescriptor.java

@@ -22,7 +22,7 @@ package org.jkiss.dbeaver.registry;
 import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.ui.views.properties.IPropertyDescriptor;
-import org.jkiss.dbeaver.ui.export.data.IDataExporter;
+import org.jkiss.dbeaver.tools.data.IDataExporter;
 import org.jkiss.dbeaver.ui.properties.PropertyDescriptorEx;
 import org.jkiss.utils.CommonUtils;
 

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/DataSourceToolDescriptor.java

@@ -22,7 +22,7 @@ package org.jkiss.dbeaver.registry;
 import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.swt.graphics.Image;
 import org.jkiss.dbeaver.DBException;
-import org.jkiss.dbeaver.model.DBPTool;
+import org.jkiss.dbeaver.tools.IExternalTool;
 
 /**
  * DataSourceToolDescriptor
@@ -66,10 +66,10 @@ public class DataSourceToolDescriptor extends AbstractContextDescriptor
         return icon;
     }
 
-    public DBPTool createTool()
+    public IExternalTool createTool()
         throws DBException
     {
-        Class<DBPTool> toolClass = getObjectClass(toolClassName, DBPTool.class);
+        Class<IExternalTool> toolClass = getObjectClass(toolClassName, IExternalTool.class);
         if (toolClass == null) {
             throw new DBException("Tool class '" + toolClassName + "' not found");
         }

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/DriverDescriptor.java

@@ -1144,7 +1144,9 @@ public class DriverDescriptor extends AbstractDescriptor implements DBPDriver
         xml.addAttribute(RegistryConstants.ATTR_CUSTOM, this.isCustom());
         xml.addAttribute(RegistryConstants.ATTR_NAME, this.getName());
         xml.addAttribute(RegistryConstants.ATTR_CLASS, this.getDriverClassName());
-        xml.addAttribute(RegistryConstants.ATTR_URL, this.getSampleURL());
+        if (!CommonUtils.isEmpty(this.getSampleURL())) {
+            xml.addAttribute(RegistryConstants.ATTR_URL, this.getSampleURL());
+        }
         if (this.getDefaultPort() != null) {
             xml.addAttribute(RegistryConstants.ATTR_PORT, this.getDefaultPort());
         }

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/DBPTool.java → plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/IExternalTool.java

@@ -17,15 +17,17 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-package org.jkiss.dbeaver.model;
+package org.jkiss.dbeaver.tools;
 
 import org.eclipse.ui.IWorkbenchWindow;
 import org.jkiss.dbeaver.DBException;
+import org.jkiss.dbeaver.model.DBPObject;
 
 /**
- * Database utility
+ * Database external utility.
+ * Usually utilizes external native software to perform specific database tasks.
  */
-public interface DBPTool {
+public interface IExternalTool {
 
     void execute(IWorkbenchWindow window, DBPObject object)
         throws DBException;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/IDataExporter.java → plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/IDataExporter.java

@@ -17,7 +17,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-package org.jkiss.dbeaver.ui.export.data;
+package org.jkiss.dbeaver.tools.data;
 
 import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/IDataExporterSite.java → plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/IDataExporterSite.java

@@ -16,7 +16,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-package org.jkiss.dbeaver.ui.export.data;
+package org.jkiss.dbeaver.tools.data;
 
 import org.jkiss.dbeaver.model.DBPNamedObject;
 import org.jkiss.dbeaver.model.data.DBDAttributeBinding;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/encoders/BinaryStreamReader.java → plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/encoders/BinaryStreamReader.java

@@ -17,7 +17,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-package org.jkiss.dbeaver.ui.export.data.encoders;
+package org.jkiss.dbeaver.tools.data.encoders;
 
 import java.io.IOException;
 import java.io.InputStream;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/handlers/DataExportHandler.java → plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/handlers/DataExportHandler.java

@@ -16,7 +16,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-package org.jkiss.dbeaver.ui.export.data.handlers;
+package org.jkiss.dbeaver.tools.data.handlers;
 
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
@@ -28,8 +28,8 @@ import org.eclipse.ui.handlers.HandlerUtil;
 import org.jkiss.dbeaver.model.struct.DBSDataContainer;
 import org.jkiss.dbeaver.runtime.RuntimeUtils;
 import org.jkiss.dbeaver.ui.dialogs.ActiveWizardDialog;
-import org.jkiss.dbeaver.ui.export.data.wizard.DataExportProvider;
-import org.jkiss.dbeaver.ui.export.data.wizard.DataExportWizard;
+import org.jkiss.dbeaver.tools.data.wizard.DataExportProvider;
+import org.jkiss.dbeaver.tools.data.wizard.DataExportWizard;
 
 import java.util.ArrayList;
 import java.util.Iterator;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/impl/DataExporterAbstract.java → plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/impl/DataExporterAbstract.java

@@ -16,14 +16,14 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-package org.jkiss.dbeaver.ui.export.data.impl;
+package org.jkiss.dbeaver.tools.data.impl;
 
 import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.model.data.DBDAttributeBinding;
 import org.jkiss.dbeaver.model.data.DBDValueHandler;
 import org.jkiss.dbeaver.model.data.DBDValueHandler2;
-import org.jkiss.dbeaver.ui.export.data.IDataExporter;
-import org.jkiss.dbeaver.ui.export.data.IDataExporterSite;
+import org.jkiss.dbeaver.tools.data.IDataExporter;
+import org.jkiss.dbeaver.tools.data.IDataExporterSite;
 
 /**
  * Abstract Exporter

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/impl/DataExporterCSV.java → plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/impl/DataExporterCSV.java

@@ -16,7 +16,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-package org.jkiss.dbeaver.ui.export.data.impl;
+package org.jkiss.dbeaver.tools.data.impl;
 
 import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.model.DBUtils;
@@ -24,7 +24,7 @@ import org.jkiss.dbeaver.model.data.DBDAttributeBinding;
 import org.jkiss.dbeaver.model.data.DBDContent;
 import org.jkiss.dbeaver.model.data.DBDContentStorage;
 import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
-import org.jkiss.dbeaver.ui.export.data.IDataExporterSite;
+import org.jkiss.dbeaver.tools.data.IDataExporterSite;
 import org.jkiss.dbeaver.utils.ContentUtils;
 
 import java.io.IOException;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/impl/DataExporterHTML.java → plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/impl/DataExporterHTML.java

@@ -16,7 +16,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-package org.jkiss.dbeaver.ui.export.data.impl;
+package org.jkiss.dbeaver.tools.data.impl;
 
 import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.model.DBUtils;
@@ -24,7 +24,7 @@ import org.jkiss.dbeaver.model.data.DBDAttributeBinding;
 import org.jkiss.dbeaver.model.data.DBDContent;
 import org.jkiss.dbeaver.model.data.DBDContentStorage;
 import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
-import org.jkiss.dbeaver.ui.export.data.IDataExporterSite;
+import org.jkiss.dbeaver.tools.data.IDataExporterSite;
 import org.jkiss.dbeaver.utils.ContentUtils;
 
 import javax.imageio.ImageIO;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/impl/DataExporterSQL.java → plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/impl/DataExporterSQL.java

@@ -16,7 +16,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-package org.jkiss.dbeaver.ui.export.data.impl;
+package org.jkiss.dbeaver.tools.data.impl;
 
 import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.model.DBPNamedObject;
@@ -26,7 +26,7 @@ import org.jkiss.dbeaver.model.data.DBDContent;
 import org.jkiss.dbeaver.model.data.DBDContentStorage;
 import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
 import org.jkiss.dbeaver.model.struct.rdb.DBSTable;
-import org.jkiss.dbeaver.ui.export.data.IDataExporterSite;
+import org.jkiss.dbeaver.tools.data.IDataExporterSite;
 import org.jkiss.dbeaver.utils.ContentUtils;
 
 import java.io.File;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/wizard/DataExportErrorJob.java → plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/wizard/DataExportErrorJob.java

@@ -16,7 +16,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-package org.jkiss.dbeaver.ui.export.data.wizard;
+package org.jkiss.dbeaver.tools.data.wizard;
 
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/wizard/DataExportJob.java → plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/wizard/DataExportJob.java

@@ -17,7 +17,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-package org.jkiss.dbeaver.ui.export.data.wizard;
+package org.jkiss.dbeaver.tools.data.wizard;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -36,8 +36,8 @@ import org.jkiss.dbeaver.model.exec.*;
 import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
 import org.jkiss.dbeaver.model.struct.DBSDataContainer;
 import org.jkiss.dbeaver.runtime.AbstractJob;
-import org.jkiss.dbeaver.ui.export.data.IDataExporter;
-import org.jkiss.dbeaver.ui.export.data.IDataExporterSite;
+import org.jkiss.dbeaver.tools.data.IDataExporter;
+import org.jkiss.dbeaver.tools.data.IDataExporterSite;
 import org.jkiss.dbeaver.utils.ContentUtils;
 import org.jkiss.utils.Base64;
 import org.jkiss.utils.IOUtils;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/wizard/DataExportPageFinal.java → plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/wizard/DataExportPageFinal.java

@@ -16,7 +16,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-package org.jkiss.dbeaver.ui.export.data.wizard;
+package org.jkiss.dbeaver.tools.data.wizard;
 
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.ControlAdapter;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/wizard/DataExportPageInit.java → plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/wizard/DataExportPageInit.java

@@ -16,7 +16,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-package org.jkiss.dbeaver.ui.export.data.wizard;
+package org.jkiss.dbeaver.tools.data.wizard;
 
 import org.eclipse.jface.viewers.*;
 import org.eclipse.swt.SWT;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/wizard/DataExportPageOutput.java → plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/wizard/DataExportPageOutput.java

@@ -16,7 +16,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-package org.jkiss.dbeaver.ui.export.data.wizard;
+package org.jkiss.dbeaver.tools.data.wizard;
 
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.ModifyEvent;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/wizard/DataExportPageSettings.java → plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/wizard/DataExportPageSettings.java

@@ -16,7 +16,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-package org.jkiss.dbeaver.ui.export.data.wizard;
+package org.jkiss.dbeaver.tools.data.wizard;
 
 import org.eclipse.jface.preference.PreferenceDialog;
 import org.eclipse.swt.SWT;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/wizard/DataExportProvider.java → plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/wizard/DataExportProvider.java

@@ -17,7 +17,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-package org.jkiss.dbeaver.ui.export.data.wizard;
+package org.jkiss.dbeaver.tools.data.wizard;
 
 import org.jkiss.dbeaver.model.data.DBDDataFilter;
 import org.jkiss.dbeaver.model.struct.DBSDataContainer;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/wizard/DataExportSettings.java → plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/wizard/DataExportSettings.java

@@ -17,7 +17,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-package org.jkiss.dbeaver.ui.export.data.wizard;
+package org.jkiss.dbeaver.tools.data.wizard;
 
 import org.eclipse.jface.dialogs.IDialogSettings;
 import org.eclipse.swt.program.Program;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/data/wizard/DataExportWizard.java → plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/data/wizard/DataExportWizard.java

@@ -16,7 +16,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-package org.jkiss.dbeaver.ui.export.data.wizard;
+package org.jkiss.dbeaver.tools.data.wizard;
 
 import org.eclipse.jface.dialogs.IDialogSettings;
 import org.eclipse.jface.viewers.IStructuredSelection;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/project/ExportConstants.java → plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/project/ExportConstants.java

@@ -17,7 +17,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-package org.jkiss.dbeaver.ui.export.project;
+package org.jkiss.dbeaver.tools.project;
 
 /**
  * Import/Export constants

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/project/ProjectCreateData.java → plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/project/ProjectCreateData.java

@@ -17,7 +17,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-package org.jkiss.dbeaver.ui.export.project;
+package org.jkiss.dbeaver.tools.project;
 
 /**
  * Create data

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/project/ProjectCreateWizard.java → plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/project/ProjectCreateWizard.java

@@ -16,7 +16,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-package org.jkiss.dbeaver.ui.export.project;
+package org.jkiss.dbeaver.tools.project;
 
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IProjectDescription;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/project/ProjectCreateWizardPageSettings.java → plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/project/ProjectCreateWizardPageSettings.java

@@ -16,7 +16,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-package org.jkiss.dbeaver.ui.export.project;
+package org.jkiss.dbeaver.tools.project;
 
 import org.eclipse.jface.wizard.WizardPage;
 import org.eclipse.swt.events.ModifyEvent;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/project/ProjectExportData.java → plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/project/ProjectExportData.java

@@ -17,7 +17,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-package org.jkiss.dbeaver.ui.export.project;
+package org.jkiss.dbeaver.tools.project;
 
 import org.eclipse.core.resources.IProject;
 import org.jkiss.dbeaver.registry.DriverDescriptor;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/project/ProjectExportWizard.java → plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/project/ProjectExportWizard.java

@@ -16,7 +16,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-package org.jkiss.dbeaver.ui.export.project;
+package org.jkiss.dbeaver.tools.project;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -272,6 +272,8 @@ public class ProjectExportWizard extends Wizard implements IExportWizard {
     private void exportProject(DBRProgressMonitor monitor, ProjectExportData exportData, IProject project) throws InterruptedException, CoreException, IOException
     {
         monitor.subTask(project.getName());
+        // Refresh project
+        project.refreshLocal(IResource.DEPTH_INFINITE, monitor.getNestedMonitor());
 
         // Write meta info
         exportData.meta.startElement(ExportConstants.TAG_PROJECT);
@@ -316,6 +318,9 @@ public class ProjectExportWizard extends Wizard implements IExportWizard {
             // Export children
             final IResource[] members = ((IContainer) resource).members();
             for (IResource child : members) {
+                if (child.isLinked()) {
+                    continue;
+                }
                 exportResourceTree(monitor, exportData, parentPath, child);
             }
         } else if (resource instanceof IFile) {

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/project/ProjectExportWizardPage.java → plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/project/ProjectExportWizardPage.java

@@ -16,7 +16,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-package org.jkiss.dbeaver.ui.export.project;
+package org.jkiss.dbeaver.tools.project;
 
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/project/ProjectImportData.java → plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/project/ProjectImportData.java

@@ -17,7 +17,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-package org.jkiss.dbeaver.ui.export.project;
+package org.jkiss.dbeaver.tools.project;
 
 import org.eclipse.jface.dialogs.IMessageProvider;
 import org.eclipse.jface.wizard.WizardPage;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/project/ProjectImportWizard.java → plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/project/ProjectImportWizard.java

@@ -16,7 +16,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-package org.jkiss.dbeaver.ui.export.project;
+package org.jkiss.dbeaver.tools.project;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/project/ProjectImportWizardPageFile.java → plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/project/ProjectImportWizardPageFile.java

@@ -16,7 +16,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-package org.jkiss.dbeaver.ui.export.project;
+package org.jkiss.dbeaver.tools.project;
 
 import org.eclipse.core.resources.IProject;
 import org.eclipse.jface.dialogs.IMessageProvider;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/scripts/ScriptsExportData.java → plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/scripts/ScriptsExportData.java

@@ -17,7 +17,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-package org.jkiss.dbeaver.ui.export.scripts;
+package org.jkiss.dbeaver.tools.scripts;
 
 import org.eclipse.core.resources.IResource;
 

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/scripts/ScriptsExportUtils.java → plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/scripts/ScriptsExportUtils.java

@@ -17,7 +17,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-package org.jkiss.dbeaver.ui.export.scripts;
+package org.jkiss.dbeaver.tools.scripts;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/scripts/ScriptsExportWizard.java → plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/scripts/ScriptsExportWizard.java

@@ -16,7 +16,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-package org.jkiss.dbeaver.ui.export.scripts;
+package org.jkiss.dbeaver.tools.scripts;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/scripts/ScriptsExportWizardPage.java → plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/scripts/ScriptsExportWizardPage.java

@@ -16,7 +16,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-package org.jkiss.dbeaver.ui.export.scripts;
+package org.jkiss.dbeaver.tools.scripts;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/scripts/ScriptsImportData.java → plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/scripts/ScriptsImportData.java

@@ -17,7 +17,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-package org.jkiss.dbeaver.ui.export.scripts;
+package org.jkiss.dbeaver.tools.scripts;
 
 import org.jkiss.dbeaver.model.navigator.DBNResource;
 import org.jkiss.dbeaver.model.struct.DBSDataSourceContainer;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/scripts/ScriptsImportWizard.java → plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/scripts/ScriptsImportWizard.java

@@ -16,7 +16,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-package org.jkiss.dbeaver.ui.export.scripts;
+package org.jkiss.dbeaver.tools.scripts;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/export/scripts/ScriptsImportWizardPage.java → plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/tools/scripts/ScriptsImportWizardPage.java

@@ -16,7 +16,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-package org.jkiss.dbeaver.ui.export.scripts;
+package org.jkiss.dbeaver.tools.scripts;
 
 import org.eclipse.core.resources.IFolder;
 import org.eclipse.jface.viewers.*;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/actions/navigator/NavigatorActionExecuteTool.java

@@ -25,7 +25,7 @@ import org.eclipse.ui.IActionDelegate;
 import org.eclipse.ui.IWorkbenchWindow;
 import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.model.DBPObject;
-import org.jkiss.dbeaver.model.DBPTool;
+import org.jkiss.dbeaver.tools.IExternalTool;
 import org.jkiss.dbeaver.model.DBUtils;
 import org.jkiss.dbeaver.model.struct.DBSWrapper;
 import org.jkiss.dbeaver.registry.DataSourceToolDescriptor;
@@ -59,7 +59,7 @@ public class NavigatorActionExecuteTool implements IActionDelegate
     private void executeTool(DBPObject object)
     {
         try {
-            DBPTool toolInstance = tool.createTool();
+            IExternalTool toolInstance = tool.createTool();
             toolInstance.execute(window, DBUtils.getPublicObject(object));
         } catch (DBException e) {
             UIUtils.showErrorDialog(window.getShell(), "Tool error", "Error executing tool '" + tool.getLabel() + "'", e);

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/actions/navigator/NavigatorHandlerProjectCreate.java

@@ -22,7 +22,7 @@ import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.ui.handlers.HandlerUtil;
 import org.jkiss.dbeaver.ui.dialogs.ActiveWizardDialog;
-import org.jkiss.dbeaver.ui.export.project.ProjectCreateWizard;
+import org.jkiss.dbeaver.tools.project.ProjectCreateWizard;
 
 public class NavigatorHandlerProjectCreate extends NavigatorHandlerObjectBase {
 

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetViewer.java

@@ -41,9 +41,7 @@ import org.eclipse.swt.graphics.*;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.*;
-import org.eclipse.ui.IEditorPart;
 import org.eclipse.ui.ISaveablePart2;
-import org.eclipse.ui.IWorkbenchPart;
 import org.eclipse.ui.IWorkbenchPartSite;
 import org.eclipse.ui.commands.ICommandService;
 import org.eclipse.ui.menus.CommandContributionItem;
@@ -60,8 +58,6 @@ import org.jkiss.dbeaver.model.data.*;
 import org.jkiss.dbeaver.model.data.query.DBQCondition;
 import org.jkiss.dbeaver.model.data.query.DBQOrderColumn;
 import org.jkiss.dbeaver.model.exec.*;
-import org.jkiss.dbeaver.model.navigator.DBNAdapterFactory;
-import org.jkiss.dbeaver.model.navigator.DBNNode;
 import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
 import org.jkiss.dbeaver.model.runtime.DBRRunnableWithProgress;
 import org.jkiss.dbeaver.model.struct.*;
@@ -83,8 +79,8 @@ import org.jkiss.dbeaver.ui.dialogs.ActiveWizardDialog;
 import org.jkiss.dbeaver.ui.dialogs.ConfirmationDialog;
 import org.jkiss.dbeaver.ui.dialogs.EditTextDialog;
 import org.jkiss.dbeaver.ui.dialogs.struct.EditConstraintDialog;
-import org.jkiss.dbeaver.ui.export.data.wizard.DataExportProvider;
-import org.jkiss.dbeaver.ui.export.data.wizard.DataExportWizard;
+import org.jkiss.dbeaver.tools.data.wizard.DataExportProvider;
+import org.jkiss.dbeaver.tools.data.wizard.DataExportWizard;
 import org.jkiss.dbeaver.ui.help.IHelpContextIds;
 import org.jkiss.dbeaver.ui.preferences.PrefConstants;
 import org.jkiss.dbeaver.ui.preferences.PrefPageDatabaseGeneral;

plugins/org.jkiss.dbeaver.mysql/src/org/jkiss/dbeaver/ext/mysql/tools/MySQLToolExport.java

@@ -22,13 +22,13 @@ import org.eclipse.ui.IWorkbenchWindow;
 import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.ext.mysql.model.MySQLCatalog;
 import org.jkiss.dbeaver.model.DBPObject;
-import org.jkiss.dbeaver.model.DBPTool;
+import org.jkiss.dbeaver.tools.IExternalTool;
 import org.jkiss.dbeaver.ui.dialogs.tools.ToolWizardDialog;
 
 /**
  * Database export
  */
-public class MySQLToolExport implements DBPTool
+public class MySQLToolExport implements IExternalTool
 {
     @Override
     public void execute(IWorkbenchWindow window, DBPObject object) throws DBException

plugins/org.jkiss.dbeaver.mysql/src/org/jkiss/dbeaver/ext/mysql/tools/MySQLToolImport.java

@@ -22,13 +22,13 @@ import org.eclipse.ui.IWorkbenchWindow;
 import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.ext.mysql.model.MySQLCatalog;
 import org.jkiss.dbeaver.model.DBPObject;
-import org.jkiss.dbeaver.model.DBPTool;
+import org.jkiss.dbeaver.tools.IExternalTool;
 import org.jkiss.dbeaver.ui.dialogs.tools.ToolWizardDialog;
 
 /**
  * Database import
  */
-public class MySQLToolImport implements DBPTool
+public class MySQLToolImport implements IExternalTool
 {
     @Override
     public void execute(IWorkbenchWindow window, DBPObject object) throws DBException

plugins/org.jkiss.dbeaver.mysql/src/org/jkiss/dbeaver/ext/mysql/tools/MySQLToolScript.java

@@ -23,7 +23,7 @@ import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.ext.mysql.model.MySQLCatalog;
 import org.jkiss.dbeaver.model.DBPConnectionInfo;
 import org.jkiss.dbeaver.model.DBPObject;
-import org.jkiss.dbeaver.model.DBPTool;
+import org.jkiss.dbeaver.tools.IExternalTool;
 import org.jkiss.dbeaver.ui.dialogs.tools.AbstractToolWizard;
 import org.jkiss.dbeaver.ui.dialogs.tools.ToolWizardDialog;
 import org.jkiss.utils.CommonUtils;
@@ -35,7 +35,7 @@ import java.util.List;
 /**
  * Database import
  */
-public class MySQLToolScript implements DBPTool
+public class MySQLToolScript implements IExternalTool
 {
     @Override
     public void execute(IWorkbenchWindow window, DBPObject object) throws DBException

plugins/org.jkiss.dbeaver.oracle/src/org/jkiss/dbeaver/ext/oracle/tools/OracleToolScript.java

@@ -22,14 +22,14 @@ import org.eclipse.ui.IWorkbenchWindow;
 import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.ext.oracle.model.OracleDataSource;
 import org.jkiss.dbeaver.model.DBPObject;
-import org.jkiss.dbeaver.model.DBPTool;
+import org.jkiss.dbeaver.tools.IExternalTool;
 import org.jkiss.dbeaver.model.struct.DBSObject;
 import org.jkiss.dbeaver.ui.dialogs.tools.ToolWizardDialog;
 
 /**
  * Database import
  */
-public class OracleToolScript implements DBPTool
+public class OracleToolScript implements IExternalTool
 {
     @Override
     public void execute(IWorkbenchWindow window, DBPObject object) throws DBException