提交 c2b37d98 编写于 作者: S Serge Rider

5.2.5 config

上级 8d4e5e2f
......@@ -2,8 +2,8 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.jkiss.utils
Bundle-Version: 2.1.79.qualifier
Bundle-Release-Date: 20181105
Bundle-Version: 2.1.80.qualifier
Bundle-Release-Date: 20181119
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Export-Package: org.jkiss.code,
org.jkiss.utils,
......
......@@ -9,6 +9,6 @@
<relativePath>../</relativePath>
</parent>
<artifactId>org.jkiss.utils</artifactId>
<version>2.1.79-SNAPSHOT</version>
<version>2.1.80-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
......@@ -2,8 +2,8 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.jkiss.wmi
Bundle-Version: 2.0.89.qualifier
Bundle-Release-Date: 20181105
Bundle-Version: 2.0.90.qualifier
Bundle-Release-Date: 20181119
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-Vendor: %Bundle-Vendor
Export-Package: org.jkiss.wmi.service
......@@ -9,6 +9,6 @@
<relativePath>../</relativePath>
</parent>
<artifactId>org.jkiss.wmi</artifactId>
<version>2.0.89-SNAPSHOT</version>
<version>2.0.90-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
......@@ -2,7 +2,7 @@
<feature
id="org.jkiss.dbeaver.ce.feature"
label="%featureName"
version="5.2.4.qualifier"
version="5.2.5.qualifier"
provider-name="%providerName"
plugin="org.jkiss.dbeaver.core.application">
......
......@@ -10,7 +10,7 @@
<relativePath>../../</relativePath>
</parent>
<artifactId>org.jkiss.dbeaver.ce.feature</artifactId>
<version>5.2.4-SNAPSHOT</version>
<version>5.2.5-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
<build>
......
......@@ -2,7 +2,7 @@
<feature
id="org.jkiss.dbeaver.core.feature"
label="%featureName"
version="5.2.4.qualifier"
version="5.2.5.qualifier"
provider-name="%providerName"
plugin="org.jkiss.dbeaver.core">
......
......@@ -9,6 +9,6 @@
<relativePath>../../</relativePath>
</parent>
<artifactId>org.jkiss.dbeaver.core.feature</artifactId>
<version>5.2.4-SNAPSHOT</version>
<version>5.2.5-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
......@@ -2,7 +2,7 @@
<feature
id="org.jkiss.dbeaver.debug.feature"
label="%featureName"
version="5.2.4.qualifier"
version="5.2.5.qualifier"
provider-name="%providerName">
<description>
......
......@@ -9,6 +9,6 @@
<relativePath>../../</relativePath>
</parent>
<artifactId>org.jkiss.dbeaver.debug.feature</artifactId>
<version>5.2.4-SNAPSHOT</version>
<version>5.2.5-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
......@@ -2,7 +2,7 @@
<feature
id="org.jkiss.dbeaver.ext.db2.feature"
label="%featureName"
version="2.1.81.qualifier"
version="2.1.82.qualifier"
provider-name="%providerName"
plugin="org.jkiss.dbeaver.ext.db2">
......
......@@ -9,6 +9,6 @@
<relativePath>../../</relativePath>
</parent>
<artifactId>org.jkiss.dbeaver.ext.db2.feature</artifactId>
<version>2.1.81-SNAPSHOT</version>
<version>2.1.82-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
......@@ -2,7 +2,7 @@
<feature
id="org.jkiss.dbeaver.ext.exasol.feature"
label="%featureName"
version="1.0.54.qualifier"
version="1.0.55.qualifier"
provider-name="%providerName"
plugin="org.jkiss.dbeaver.ext.exasol">
......
......@@ -10,7 +10,7 @@
<relativePath>../../</relativePath>
</parent>
<artifactId>org.jkiss.dbeaver.ext.exasol.feature</artifactId>
<version>1.0.54-SNAPSHOT</version>
<version>1.0.55-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
......@@ -2,7 +2,7 @@
<feature
id="org.jkiss.dbeaver.ext.generic.feature"
label="%featureName"
version="2.1.82.qualifier"
version="2.1.83.qualifier"
provider-name="%providerName"
plugin="org.jkiss.dbeaver.ext.generic">
......
......@@ -9,6 +9,6 @@
<relativePath>../../</relativePath>
</parent>
<artifactId>org.jkiss.dbeaver.ext.generic.feature</artifactId>
<version>2.1.82-SNAPSHOT</version>
<version>2.1.83-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
......@@ -2,7 +2,7 @@
<feature
id="org.jkiss.dbeaver.ext.mysql.feature"
label="%featureName"
version="2.1.81.qualifier"
version="2.1.82.qualifier"
provider-name="%providerName"
plugin="org.jkiss.dbeaver.ext.mysql">
......
......@@ -9,6 +9,6 @@
<relativePath>../../</relativePath>
</parent>
<artifactId>org.jkiss.dbeaver.ext.mysql.feature</artifactId>
<version>2.1.81-SNAPSHOT</version>
<version>2.1.82-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
......@@ -2,7 +2,7 @@
<feature
id="org.jkiss.dbeaver.ext.office.feature"
label="%featureName"
version="1.1.33.qualifier"
version="1.1.34.qualifier"
provider-name="%providerName"
plugin="org.jkiss.dbeaver.data.office">
......
......@@ -9,7 +9,7 @@
<relativePath>../../</relativePath>
</parent>
<artifactId>org.jkiss.dbeaver.ext.office.feature</artifactId>
<version>1.1.33-SNAPSHOT</version>
<version>1.1.34-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
<groupId>org.jkiss.dbeaver</groupId>
</project>
......@@ -2,7 +2,7 @@
<feature
id="org.jkiss.dbeaver.ext.oracle.feature"
label="%featureName"
version="2.1.81.qualifier"
version="2.1.82.qualifier"
provider-name="%providerName"
plugin="org.jkiss.dbeaver.ext.oracle">
......
......@@ -9,6 +9,6 @@
<relativePath>../../</relativePath>
</parent>
<artifactId>org.jkiss.dbeaver.ext.oracle.feature</artifactId>
<version>2.1.81-SNAPSHOT</version>
<version>2.1.82-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
......@@ -2,7 +2,7 @@
<feature
id="org.jkiss.dbeaver.ext.ui.svg.feature"
label="%featureName"
version="1.0.32.qualifier"
version="1.0.33.qualifier"
provider-name="%providerName"
plugin="org.jkiss.dbeaver.ext.ui.svg">
......
......@@ -9,7 +9,7 @@
<relativePath>../../</relativePath>
</parent>
<artifactId>org.jkiss.dbeaver.ext.ui.svg.feature</artifactId>
<version>1.0.32-SNAPSHOT</version>
<version>1.0.33-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
<groupId>org.jkiss.dbeaver</groupId>
</project>
......@@ -2,7 +2,7 @@
<feature
id="org.jkiss.dbeaver.ext.wmi.feature"
label="%featureName"
version="2.0.98.qualifier"
version="2.0.99.qualifier"
provider-name="%providerName"
plugin="org.jkiss.dbeaver.ext.wmi">
......
......@@ -9,6 +9,6 @@
<relativePath>../../</relativePath>
</parent>
<artifactId>org.jkiss.dbeaver.ext.wmi.feature</artifactId>
<version>2.0.98-SNAPSHOT</version>
<version>2.0.99-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
......@@ -2,7 +2,7 @@
<feature
id="org.jkiss.dbeaver.net.sshj.feature"
label="%featureName"
version="1.0.17.qualifier"
version="1.0.18.qualifier"
provider-name="%providerName">
<description>
......
......@@ -9,6 +9,6 @@
<relativePath>../../</relativePath>
</parent>
<artifactId>org.jkiss.dbeaver.net.sshj.feature</artifactId>
<version>1.0.17-SNAPSHOT</version>
<version>1.0.18-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
......@@ -2,7 +2,7 @@
<feature
id="org.jkiss.dbeaver.rcp.feature"
label="%featureName"
version="2.1.71.qualifier"
version="2.1.72.qualifier"
provider-name="%providerName">
<description>
......
......@@ -9,6 +9,6 @@
<relativePath>../../</relativePath>
</parent>
<artifactId>org.jkiss.dbeaver.rcp.feature</artifactId>
<version>2.1.71-SNAPSHOT</version>
<version>2.1.72-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
......@@ -2,7 +2,7 @@
<feature
id="org.jkiss.dbeaver.runtime.feature"
label="%featureName"
version="5.2.4.qualifier"
version="5.2.5.qualifier"
provider-name="%providerName"
plugin="org.jkiss.dbeaver.core.eclipse">
......
......@@ -9,6 +9,6 @@
<relativePath>../../</relativePath>
</parent>
<artifactId>org.jkiss.dbeaver.runtime.feature</artifactId>
<version>5.2.4-SNAPSHOT</version>
<version>5.2.5-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
......@@ -2,7 +2,7 @@
<feature
id="org.jkiss.dbeaver.standalone.feature"
label="%featureName"
version="5.2.4.qualifier"
version="5.2.5.qualifier"
provider-name="%providerName"
plugin="org.jkiss.dbeaver.core.application">
......
......@@ -10,7 +10,7 @@
<relativePath>../../</relativePath>
</parent>
<artifactId>org.jkiss.dbeaver.standalone.feature</artifactId>
<version>5.2.4-SNAPSHOT</version>
<version>5.2.5-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
......@@ -5,8 +5,8 @@ Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.jkiss.dbeaver.core.application;singleton:=true
Bundle-Activator: org.jkiss.dbeaver.core.application.internal.CoreApplicationActivator
Bundle-ActivationPolicy: lazy
Bundle-Version: 5.2.4.qualifier
Bundle-Release-Date: 20181105
Bundle-Version: 5.2.5.qualifier
Bundle-Release-Date: 20181119
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Export-Package: org.jkiss.dbeaver.core.application
Bundle-ClassPath: .
......
......@@ -9,6 +9,6 @@
<relativePath>../</relativePath>
</parent>
<artifactId>org.jkiss.dbeaver.core.application</artifactId>
<version>5.2.4-SNAPSHOT</version>
<version>5.2.5-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
......@@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
Bundle-Vendor: %Bundle-Vendor
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.jkiss.dbeaver.core.eclipse;singleton:=true
Bundle-Version: 5.2.4.qualifier
Bundle-Release-Date: 20181105
Bundle-Version: 5.2.5.qualifier
Bundle-Release-Date: 20181119
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: org.eclipse.ui,
org.jkiss.dbeaver.core,
......
......@@ -9,6 +9,6 @@
<relativePath>../</relativePath>
</parent>
<artifactId>org.jkiss.dbeaver.core.eclipse</artifactId>
<version>5.2.4-SNAPSHOT</version>
<version>5.2.5-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
......@@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
Bundle-Vendor: %Bundle-Vendor
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.jkiss.dbeaver.core;singleton:=true
Bundle-Version: 5.2.4.qualifier
Bundle-Release-Date: 20181105
Bundle-Version: 5.2.5.qualifier
Bundle-Release-Date: 20181119
Bundle-Activator: org.jkiss.dbeaver.core.DBeaverActivator
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
......
......@@ -9,6 +9,6 @@
<relativePath>../</relativePath>
</parent>
<artifactId>org.jkiss.dbeaver.core</artifactId>
<version>5.2.4-SNAPSHOT</version>
<version>5.2.5-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
......@@ -45,11 +45,11 @@ import org.jkiss.dbeaver.model.struct.DBSObjectFilter;
import org.jkiss.dbeaver.model.struct.rdb.DBSCatalog;
import org.jkiss.dbeaver.model.struct.rdb.DBSSchema;
import org.jkiss.dbeaver.registry.driver.DriverDescriptor;
import org.jkiss.dbeaver.registry.network.NetworkHandlerDescriptor;
import org.jkiss.dbeaver.registry.network.NetworkHandlerRegistry;
import org.jkiss.dbeaver.runtime.encode.EncryptionException;
import org.jkiss.dbeaver.runtime.encode.PasswordEncrypter;
import org.jkiss.dbeaver.runtime.encode.SimpleStringEncrypter;
import org.jkiss.dbeaver.registry.network.NetworkHandlerDescriptor;
import org.jkiss.dbeaver.registry.network.NetworkHandlerRegistry;
import org.jkiss.dbeaver.utils.GeneralUtils;
import org.jkiss.dbeaver.utils.RuntimeUtils;
import org.jkiss.utils.ArrayUtils;
......@@ -477,12 +477,12 @@ public class DataSourceRegistry implements DBPDataSourceRegistry
/**
* Find data source in all available registries
*/
public static DataSourceDescriptor findDataSource(String dataSourceId) {
public static DBPDataSourceContainer findDataSource(String dataSourceId) {
ProjectRegistry projectRegistry = DBeaverCore.getInstance().getProjectRegistry();
for (IProject project : DBeaverCore.getInstance().getLiveProjects()) {
DataSourceRegistry dataSourceRegistry = projectRegistry.getDataSourceRegistry(project);
if (dataSourceRegistry != null) {
DataSourceDescriptor dataSourceContainer = dataSourceRegistry.getDataSource(dataSourceId);
DBPDataSourceContainer dataSourceContainer = dataSourceRegistry.getDataSource(dataSourceId);
if (dataSourceContainer != null) {
return dataSourceContainer;
}
......
......@@ -28,7 +28,6 @@ import org.jkiss.dbeaver.model.exec.DBCExecutionContext;
import org.jkiss.dbeaver.model.qm.QMTransactionState;
import org.jkiss.dbeaver.model.qm.QMUtils;
import org.jkiss.dbeaver.model.struct.DBSInstance;
import org.jkiss.dbeaver.registry.DataSourceDescriptor;
import org.jkiss.dbeaver.registry.DataSourceRegistry;
import org.jkiss.dbeaver.runtime.ui.DBUserInterface;
import org.jkiss.dbeaver.ui.DBeaverIcons;
......
......@@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
Bundle-Vendor: %Bundle-Vendor
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.jkiss.dbeaver.data.gis;singleton:=true
Bundle-Version: 1.0.20.qualifier
Bundle-Release-Date: 20181105
Bundle-Version: 1.0.21.qualifier
Bundle-Release-Date: 20181119
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: org.jkiss.dbeaver.model,
org.jkiss.dbeaver.core,
......
......@@ -10,7 +10,7 @@
<relativePath>../</relativePath>
</parent>
<artifactId>org.jkiss.dbeaver.data.gis</artifactId>
<version>1.0.20-SNAPSHOT</version>
<version>1.0.21-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
......@@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
Bundle-Vendor: %Bundle-Vendor
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.jkiss.dbeaver.data.office;singleton:=true
Bundle-Version: 1.1.33.qualifier
Bundle-Release-Date: 20181105
Bundle-Version: 1.1.34.qualifier
Bundle-Release-Date: 20181119
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.swt,
......
......@@ -10,7 +10,7 @@
<relativePath>../</relativePath>
</parent>
<artifactId>org.jkiss.dbeaver.data.office</artifactId>
<version>1.1.33-SNAPSHOT</version>
<version>1.1.34-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
......@@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
Bundle-Vendor: %Bundle-Vendor
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.jkiss.dbeaver.data.transfer;singleton:=true
Bundle-Version: 1.0.6.qualifier
Bundle-Release-Date: 20181105
Bundle-Version: 1.0.7.qualifier
Bundle-Release-Date: 20181119
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Export-Package: org.jkiss.dbeaver.tools.transfer,
org.jkiss.dbeaver.tools.transfer.database,
......
......@@ -10,7 +10,7 @@
<relativePath>../</relativePath>
</parent>
<artifactId>org.jkiss.dbeaver.data.transfer</artifactId>
<version>1.0.6-SNAPSHOT</version>
<version>1.0.7-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
......@@ -2,8 +2,8 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.jkiss.dbeaver.debug.core;singleton:=true
Bundle-Version: 1.0.25.qualifier
Bundle-Release-Date: 20181105
Bundle-Version: 1.0.26.qualifier
Bundle-Release-Date: 20181119
Bundle-Vendor: %Bundle-Vendor
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: org.eclipse.osgi.services,
......
......@@ -9,6 +9,6 @@
<relativePath>../</relativePath>
</parent>
<artifactId>org.jkiss.dbeaver.debug.core</artifactId>
<version>1.0.25-SNAPSHOT</version>
<version>1.0.26-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
......@@ -31,7 +31,6 @@ import org.jkiss.dbeaver.debug.DBGException;
import org.jkiss.dbeaver.debug.core.model.DatabaseDebugTarget;
import org.jkiss.dbeaver.debug.core.model.DatabaseProcess;
import org.jkiss.dbeaver.model.DBPDataSourceContainer;
import org.jkiss.dbeaver.registry.DataSourceDescriptor;
import org.jkiss.dbeaver.registry.DataSourceRegistry;
import org.jkiss.dbeaver.utils.GeneralUtils;
......@@ -43,7 +42,7 @@ public class DatabaseLaunchDelegate extends LaunchConfigurationDelegate {
public void launch(ILaunchConfiguration configuration, String mode, ILaunch launch, IProgressMonitor monitor)
throws CoreException {
String datasourceId = configuration.getAttribute(DBGConstants.ATTR_DATASOURCE_ID, (String)null);
DataSourceDescriptor datasourceDescriptor = DataSourceRegistry.findDataSource(datasourceId);
DBPDataSourceContainer datasourceDescriptor = DataSourceRegistry.findDataSource(datasourceId);
if (datasourceDescriptor == null) {
String message = NLS.bind("Unable to find data source with id {0}", datasourceId);
throw new CoreException(DebugUtils.newErrorStatus(message));
......
......@@ -25,7 +25,7 @@ import org.eclipse.debug.core.sourcelookup.ISourceContainer;
import org.eclipse.debug.core.sourcelookup.ISourcePathComputerDelegate;
import org.jkiss.dbeaver.debug.DBGConstants;
import org.jkiss.dbeaver.debug.core.DebugUtils;
import org.jkiss.dbeaver.registry.DataSourceDescriptor;
import org.jkiss.dbeaver.model.DBPDataSourceContainer;
import org.jkiss.dbeaver.registry.DataSourceRegistry;
public class DBGSourcePathComputer implements ISourcePathComputerDelegate {
......@@ -34,7 +34,7 @@ public class DBGSourcePathComputer implements ISourcePathComputerDelegate {
public ISourceContainer[] computeSourceContainers(ILaunchConfiguration configuration, IProgressMonitor monitor)
throws CoreException {
String datasourceId = configuration.getAttribute(DBGConstants.ATTR_DATASOURCE_ID, "");
DataSourceDescriptor dataSource = DataSourceRegistry.findDataSource(datasourceId);
DBPDataSourceContainer dataSource = DataSourceRegistry.findDataSource(datasourceId);
if (dataSource == null) {
throw new CoreException(DebugUtils.newErrorStatus("Can't find datasource " + datasourceId));
}
......
......@@ -32,14 +32,13 @@ import org.jkiss.dbeaver.debug.internal.core.DebugCoreMessages;
import org.jkiss.dbeaver.model.DBPDataSourceContainer;
import org.jkiss.dbeaver.model.navigator.DBNNode;
import org.jkiss.dbeaver.model.runtime.VoidProgressMonitor;
import org.jkiss.dbeaver.registry.DataSourceDescriptor;
public class DatabaseNavigatorSourceContainer extends CompositeSourceContainer {
private final DBPDataSourceContainer datasource;
private final IProject project;
public DatabaseNavigatorSourceContainer(DataSourceDescriptor descriptor) {
public DatabaseNavigatorSourceContainer(DBPDataSourceContainer descriptor) {
this.datasource = descriptor;
this.project = datasource.getRegistry().getProject();
}
......
......@@ -2,8 +2,8 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.jkiss.dbeaver.debug.ui;singleton:=true
Bundle-Version: 1.0.25.qualifier
Bundle-Release-Date: 20181105
Bundle-Version: 1.0.26.qualifier
Bundle-Release-Date: 20181119
Bundle-Vendor: %Bundle-Vendor
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-Activator: org.jkiss.dbeaver.debug.ui.internal.DebugUIActivator
......
......@@ -9,6 +9,6 @@
<relativePath>../</relativePath>
</parent>
<artifactId>org.jkiss.dbeaver.debug.ui</artifactId>
<version>1.0.25-SNAPSHOT</version>
<version>1.0.26-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
......@@ -40,7 +40,6 @@ import org.jkiss.dbeaver.debug.ui.internal.DebugUIMessages;
import org.jkiss.dbeaver.model.DBIcon;
import org.jkiss.dbeaver.model.DBPDataSourceContainer;
import org.jkiss.dbeaver.model.runtime.DBRRunnableContext;
import org.jkiss.dbeaver.registry.DataSourceDescriptor;
import org.jkiss.dbeaver.registry.DataSourceRegistry;
import org.jkiss.dbeaver.runtime.RunnableContextDelegate;
import org.jkiss.dbeaver.runtime.ui.DBUserInterface;
......@@ -205,7 +204,7 @@ public class DatabaseDebugConfigurationTab extends AbstractLaunchConfigurationTa
this.currentConfiguration = configuration;
try {
String dsId = configuration.getAttribute(DBGConstants.ATTR_DATASOURCE_ID, (String) null);
DataSourceDescriptor dataSource = DataSourceRegistry.findDataSource(dsId);
DBPDataSourceContainer dataSource = DataSourceRegistry.findDataSource(dsId);
connectionCombo.select(dataSource);
if (dataSource != null) {
driverText.setText(dataSource.getDriver().getFullName());
......
......@@ -2,8 +2,8 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Athena extension
Bundle-SymbolicName: org.jkiss.dbeaver.ext.athena;singleton:=true
Bundle-Version: 1.0.2.qualifier
Bundle-Release-Date: 20181105
Bundle-Version: 1.0.3.qualifier
Bundle-Release-Date: 20181119
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
org.jkiss.dbeaver.core,
......
......@@ -9,6 +9,6 @@
<relativePath>../</relativePath>
</parent>
<artifactId>org.jkiss.dbeaver.ext.athena</artifactId>
<version>1.0.2-SNAPSHOT</version>
<version>1.0.3-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
......@@ -2,8 +2,8 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: BigQuery extension
Bundle-SymbolicName: org.jkiss.dbeaver.ext.bigquery;singleton:=true
Bundle-Version: 1.0.2.qualifier
Bundle-Release-Date: 20181105
Bundle-Version: 1.0.3.qualifier
Bundle-Release-Date: 20181119
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
org.jkiss.dbeaver.core,
......
......@@ -9,6 +9,6 @@
<relativePath>../</relativePath>
</parent>
<artifactId>org.jkiss.dbeaver.ext.bigquery</artifactId>
<version>1.0.2-SNAPSHOT</version>
<version>1.0.3-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
......@@ -2,8 +2,8 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.jkiss.dbeaver.ext.clickhouse;singleton:=true
Bundle-Version: 1.0.1.qualifier
Bundle-Release-Date: 20181105
Bundle-Version: 1.0.2.qualifier
Bundle-Release-Date: 20181119
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
org.eclipse.ui.views,
......
......@@ -9,6 +9,6 @@
<relativePath>../</relativePath>
</parent>
<artifactId>org.jkiss.dbeaver.ext.clickhouse</artifactId>
<version>1.0.1-SNAPSHOT</version>
<version>1.0.2-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
......@@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
Bundle-Vendor: %Bundle-Vendor
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.jkiss.dbeaver.ext.db2;singleton:=true
Bundle-Version: 2.1.81.qualifier
Bundle-Release-Date: 20181105
Bundle-Version: 2.1.82.qualifier
Bundle-Release-Date: 20181119
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Bundle-Activator: org.jkiss.dbeaver.ext.db2.Activator
......
......@@ -9,6 +9,6 @@
<relativePath>../</relativePath>
</parent>
<artifactId>org.jkiss.dbeaver.ext.db2</artifactId>
<version>2.1.81-SNAPSHOT</version>
<version>2.1.82-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
......@@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
Bundle-Vendor: %Bundle-Vendor
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.jkiss.dbeaver.ext.derby;singleton:=true
Bundle-Version: 1.1.81.qualifier
Bundle-Release-Date: 20181105
Bundle-Version: 1.1.82.qualifier
Bundle-Release-Date: 20181119
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Require-Bundle: org.eclipse.core.runtime,
......
......@@ -9,6 +9,6 @@
<relativePath>../</relativePath>
</parent>
<artifactId>org.jkiss.dbeaver.ext.derby</artifactId>
<version>1.1.81-SNAPSHOT</version>
<version>1.1.82-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
......@@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
Bundle-Vendor: %Bundle-Vendor
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.jkiss.dbeaver.ext.erd;singleton:=true
Bundle-Version: 2.0.98.qualifier
Bundle-Release-Date: 20181105
Bundle-Version: 2.0.99.qualifier
Bundle-Release-Date: 20181119
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-Activator: org.jkiss.dbeaver.ext.erd.ERDActivator
Bundle-ActivationPolicy: lazy
......
......@@ -9,6 +9,6 @@
<relativePath>../</relativePath>
</parent>
<artifactId>org.jkiss.dbeaver.ext.erd</artifactId>
<version>2.0.98-SNAPSHOT</version>
<version>2.0.99-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
......@@ -39,7 +39,6 @@ import org.jkiss.dbeaver.model.*;
import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
import org.jkiss.dbeaver.model.runtime.VoidProgressMonitor;
import org.jkiss.dbeaver.model.struct.*;
import org.jkiss.dbeaver.registry.DataSourceDescriptor;
import org.jkiss.dbeaver.registry.DataSourceRegistry;
import org.jkiss.dbeaver.ui.UIUtils;
import org.jkiss.dbeaver.utils.GeneralUtils;
......@@ -163,7 +162,7 @@ public class DiagramLoader
String dsId = dsElem.getAttribute(ATTR_ID);
if (!CommonUtils.isEmpty(dsId)) {
// Get connected datasource
final DataSourceDescriptor dataSourceContainer = dsRegistry.getDataSource(dsId);
final DBPDataSourceContainer dataSourceContainer = dsRegistry.getDataSource(dsId);
if (dataSourceContainer != null) {
containers.add(dataSourceContainer);
}
......@@ -216,7 +215,7 @@ public class DiagramLoader
continue;
}
// Get connected datasource
final DataSourceDescriptor dataSourceContainer = dsRegistry.getDataSource(dsId);
final DBPDataSourceContainer dataSourceContainer = dsRegistry.getDataSource(dsId);
if (dataSourceContainer == null) {
log.warn("Datasource '" + dsId + "' not found");
continue;
......
......@@ -2,8 +2,8 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Elasticsearch UI
Bundle-SymbolicName: org.jkiss.dbeaver.ext.es.ui;singleton:=true
Bundle-Version: 1.0.7.qualifier
Bundle-Release-Date: 20181105
Bundle-Version: 1.0.8.qualifier
Bundle-Release-Date: 20181119
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
org.jkiss.dbeaver.core,
......
......@@ -9,6 +9,6 @@
<relativePath>../</relativePath>
</parent>
<artifactId>org.jkiss.dbeaver.ext.es.ui</artifactId>
<version>1.0.7-SNAPSHOT</version>
<version>1.0.8-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
......@@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
Bundle-Vendor: %Bundle-Vendor
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.jkiss.dbeaver.ext.exasol;singleton:=true
Bundle-Version: 1.0.54.qualifier
Bundle-Release-Date: 20181105
Bundle-Version: 1.0.55.qualifier
Bundle-Release-Date: 20181119
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-Activator: org.jkiss.dbeaver.ext.exasol.Activator
Bundle-ActivationPolicy: lazy
......
......@@ -9,6 +9,6 @@
<relativePath>../</relativePath>
</parent>
<artifactId>org.jkiss.dbeaver.ext.exasol</artifactId>
<version>1.0.54-SNAPSHOT</version>
<version>1.0.55-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
......@@ -2,8 +2,8 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.jkiss.dbeaver.ext.firebird;singleton:=true
Bundle-Version: 1.0.97.qualifier
Bundle-Release-Date: 20181105
Bundle-Version: 1.0.98.qualifier
Bundle-Release-Date: 20181119
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
org.eclipse.ui.views,
......
......@@ -9,6 +9,6 @@
<relativePath>../</relativePath>
</parent>
<artifactId>org.jkiss.dbeaver.ext.firebird</artifactId>
<version>1.0.97-SNAPSHOT</version>
<version>1.0.98-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
......@@ -2,8 +2,8 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Tester Plug-in
Bundle-SymbolicName: org.jkiss.dbeaver.ext.format.sqlworkbenchj;singleton:=true
Bundle-Version: 1.0.3.qualifier
Bundle-Release-Date: 20181105
Bundle-Version: 1.0.4.qualifier
Bundle-Release-Date: 20181119
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
org.jkiss.dbeaver.core,
......
......@@ -10,6 +10,6 @@
</parent>
<groupId>org.jkiss.dbeaver</groupId>
<artifactId>org.jkiss.dbeaver.ext.format.sqlworkbenchj</artifactId>
<version>1.0.3-SNAPSHOT</version>
<version>1.0.4-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
......@@ -2,8 +2,8 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: DBeaver Generic Plug-in
Bundle-SymbolicName: org.jkiss.dbeaver.ext.generic; singleton:=true
Bundle-Version: 2.3.82.qualifier
Bundle-Release-Date: 20181105
Bundle-Version: 2.3.83.qualifier
Bundle-Release-Date: 20181119
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
org.jkiss.dbeaver.core,
......
......@@ -9,6 +9,6 @@
<relativePath>../</relativePath>
</parent>
<artifactId>org.jkiss.dbeaver.ext.generic</artifactId>
<version>2.3.82-SNAPSHOT</version>
<version>2.3.83-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
......@@ -2,8 +2,8 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.jkiss.dbeaver.ext.h2;singleton:=true
Bundle-Version: 1.0.51.qualifier
Bundle-Release-Date: 20181105
Bundle-Version: 1.0.52.qualifier
Bundle-Release-Date: 20181119
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
org.eclipse.ui.views,
......
......@@ -9,6 +9,6 @@
<relativePath>../</relativePath>
</parent>
<artifactId>org.jkiss.dbeaver.ext.h2</artifactId>
<version>1.0.51-SNAPSHOT</version>
<version>1.0.52-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
......@@ -2,8 +2,8 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.jkiss.dbeaver.ext.hana;singleton:=true
Bundle-Version: 1.0.25.qualifier
Bundle-Release-Date: 20181105
Bundle-Version: 1.0.26.qualifier
Bundle-Release-Date: 20181119
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
org.eclipse.ui.views,
......
......@@ -9,6 +9,6 @@
<relativePath>../</relativePath>
</parent>
<artifactId>org.jkiss.dbeaver.ext.hana</artifactId>
<version>1.0.25-SNAPSHOT</version>
<version>1.0.26-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
......@@ -2,8 +2,8 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.jkiss.dbeaver.ext.hive;singleton:=true
Bundle-Version: 1.0.2.qualifier
Bundle-Release-Date: 20181105
Bundle-Version: 1.0.3.qualifier
Bundle-Release-Date: 20181119
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
org.eclipse.ui.views,
......
......@@ -9,6 +9,6 @@
<relativePath>../</relativePath>
</parent>
<artifactId>org.jkiss.dbeaver.ext.hive</artifactId>
<version>1.0.2-SNAPSHOT</version>
<version>1.0.3-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
......@@ -2,8 +2,8 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.jkiss.dbeaver.ext.hsqldb;singleton:=true
Bundle-Version: 1.0.43.qualifier
Bundle-Release-Date: 20181105
Bundle-Version: 1.0.44.qualifier
Bundle-Release-Date: 20181119
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
org.eclipse.ui.views,
......
......@@ -9,6 +9,6 @@
<relativePath>../</relativePath>
</parent>
<artifactId>org.jkiss.dbeaver.ext.hsqldb</artifactId>
<version>1.0.43-SNAPSHOT</version>
<version>1.0.44-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
......@@ -2,8 +2,8 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.jkiss.dbeaver.ext.import_config;singleton:=true
Bundle-Version: 2.1.59.qualifier
Bundle-Release-Date: 20181105
Bundle-Version: 2.1.60.qualifier
Bundle-Release-Date: 20181119
Bundle-Activator: org.jkiss.dbeaver.ext.import_config.Activator
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
......
......@@ -9,6 +9,6 @@
<relativePath>../</relativePath>
</parent>
<artifactId>org.jkiss.dbeaver.ext.import_config</artifactId>
<version>2.1.59-SNAPSHOT</version>
<version>2.1.60-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
......@@ -2,8 +2,8 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Informix Plug-in
Bundle-SymbolicName: org.jkiss.dbeaver.ext.informix;singleton:=true
Bundle-Version: 1.0.87.qualifier
Bundle-Release-Date: 20181105
Bundle-Version: 1.0.88.qualifier
Bundle-Release-Date: 20181119
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
org.eclipse.ui.views,
......
......@@ -9,6 +9,6 @@
<relativePath>../</relativePath>
</parent>
<artifactId>org.jkiss.dbeaver.ext.informix</artifactId>
<version>1.0.87-SNAPSHOT</version>
<version>1.0.88-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
......@@ -2,8 +2,8 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.jkiss.dbeaver.ext.mockdata;singleton:=true
Bundle-Version: 1.0.22.qualifier
Bundle-Release-Date: 20181105
Bundle-Version: 1.0.23.qualifier
Bundle-Release-Date: 20181119
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
org.eclipse.ui.views,
......
......@@ -9,6 +9,6 @@
<relativePath>../</relativePath>
</parent>
<artifactId>org.jkiss.dbeaver.ext.mockdata</artifactId>
<version>1.0.22-SNAPSHOT</version>
<version>1.0.23-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
......@@ -2,8 +2,8 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.jkiss.dbeaver.ext.mssql;singleton:=true
Bundle-Version: 1.0.90.qualifier
Bundle-Release-Date: 20181105
Bundle-Version: 1.0.91.qualifier
Bundle-Release-Date: 20181119
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
org.eclipse.ui.views,
......
......@@ -9,6 +9,6 @@
<relativePath>../</relativePath>
</parent>
<artifactId>org.jkiss.dbeaver.ext.mssql</artifactId>
<version>1.0.90-SNAPSHOT</version>
<version>1.0.91-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
......@@ -2,8 +2,8 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: DBeaver MySQL Support
Bundle-SymbolicName: org.jkiss.dbeaver.ext.mysql;singleton:=true
Bundle-Version: 2.1.81.qualifier
Bundle-Release-Date: 20181105
Bundle-Version: 2.1.82.qualifier
Bundle-Release-Date: 20181119
Bundle-Activator: org.jkiss.dbeaver.ext.mysql.Activator
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
......
......@@ -9,6 +9,6 @@
<relativePath>../</relativePath>
</parent>
<artifactId>org.jkiss.dbeaver.ext.mysql</artifactId>
<version>2.1.81-SNAPSHOT</version>
<version>2.1.82-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
......@@ -2,8 +2,8 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.jkiss.dbeaver.ext.netezza;singleton:=true
Bundle-Version: 1.0.61.qualifier
Bundle-Release-Date: 20181105
Bundle-Version: 1.0.62.qualifier
Bundle-Release-Date: 20181119
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
org.eclipse.ui.views,
......
......@@ -9,6 +9,6 @@
<relativePath>../</relativePath>
</parent>
<artifactId>org.jkiss.dbeaver.ext.netezza</artifactId>
<version>1.0.61-SNAPSHOT</version>
<version>1.0.62-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
......@@ -2,8 +2,8 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.jkiss.dbeaver.ext.oracle;singleton:=true
Bundle-Version: 2.1.81.qualifier
Bundle-Release-Date: 20181105
Bundle-Version: 2.1.82.qualifier
Bundle-Release-Date: 20181119
Bundle-Activator: org.jkiss.dbeaver.ext.oracle.Activator
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
......
此差异已折叠。
此差异已折叠。
此差异已折叠。
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册