Drivers with web source (Oracle)

Former-commit-id: 8b7eac35

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/driver/DriverEditDialog.java

@@ -865,8 +865,15 @@ public class DriverEditDialog extends HelpEnabledDialog
         protected void buttonPressed(int id)
         {
             if (id == IDialogConstants.RETRY_ID) {
-                DriverEditDialog dialog = new DriverEditDialog(getShell(), (DriverDescriptor) dataSource.getContainer().getDriver());
-                dialog.open();
+                UIUtils.runInDetachedUI(getShell(), new Runnable() {
+                    @Override
+                    public void run() {
+                        DriverEditDialog dialog = new DriverEditDialog(
+                            DBeaverUI.getActiveWorkbenchShell(),
+                            (DriverDescriptor) dataSource.getContainer().getDriver());
+                        dialog.open();
+                    }
+                });
                 super.buttonPressed(IDialogConstants.OK_ID);
             }
             super.buttonPressed(id);

plugins/org.jkiss.dbeaver.ext.generic/plugin.xml

@@ -157,6 +157,12 @@
 
                     <parameter name="query-get-active-db" value="select sys_context( 'userenv', 'current_schema' ) from dual"/>
                     <parameter name="query-set-active-db" value="alter session set current_schema=?"/>
+
+                    <fileSource url="http://www.oracle.com/technetwork/apps-tech/jdbc-112010-090769.html" name="Oracle 11g drivers">
+                        <file name="ojdbc6.jar" description="JDBC driver"/>
+                        <file name="orai18n.jar" description="NLS classes"/>
+                        <file name="xdb6.jar" description="SQLXML support"/>
+                    </fileSource>
                 </driver>
                 <driver
                     id="db2"
@@ -385,7 +391,7 @@
                     defaultPort="1360"
                     webURL="http://developer.mimer.com/"
                     description="Mimer SQL TCP/IP driver">
-                    <file type="jar" path="drivers/mimer/mimjdbc3.jar"/>
+                    <file type="jar" path="repo:/drivers/mimer/mimjdbc3.jar"/>
                 </driver>
                 <driver
                     id="hsqldb_server"

plugins/org.jkiss.dbeaver.ext.oracle/plugin.xml

@@ -269,24 +269,6 @@
             </tree>
 
             <drivers managable="true">
-                <driver
-                    id="oracle"
-                    label="Oracle"
-                    class="oracle.jdbc.OracleDriver"
-                    description="Oracle obsolete driver. Use Thin or OCI driver.">
-                </driver>
-                <driver
-                    id="oracle_oci"
-                    label="Oracle OCI"
-                    class="oracle.jdbc.OracleDriver"
-                    sampleURL="jdbc:oracle:oci:@{database}"
-                    defaultPort="1521"
-                    clientRequired="true"
-                    customDriverLoader="true"
-                    webURL="http://www.oracle.com/technetwork/database/features/jdbc/"
-                    description="Oracle OCI driver. Requires Oracle client installation.">
-                    <file type="license" path="platform:/plugin/org.jkiss.dbeaver.ext.oracle/LICENSE.txt"/>
-                </driver>
                 <driver
                     id="oracle_thin"
                     label="Oracle"
@@ -295,15 +277,20 @@
                     defaultPort="1521"
                     webURL="http://www.oracle.com/technetwork/database/features/jdbc/"
                     description="Oracle thin driver. Doesn't require Oracle client.">
-                    <file type="license" path="platform:/plugin/org.jkiss.dbeaver.ext.oracle/LICENSE.txt"/>
                     <replace provider="generic" driver="oracle"/>
                     <replace provider="oracle" driver="oracle"/>
                     <replace provider="oracle" driver="oracle_oci"/>
-                    <file type="license" path="drivers/oracle/LICENSE.txt" url="*"/>
-                    <file type="jar" path="drivers/oracle/ojdbc6.jar" url="*"/>
-                    <file type="jar" path="drivers/oracle/orai18n.jar" url="*"/>
-                    <file type="jar" path="drivers/oracle/xdb6.jar" url="*"/>
-                    <file type="jar" path="drivers/oracle/xmlparserv2.jar" url="*"/>
+
+                    <fileSource url="http://www.oracle.com/technetwork/apps-tech/jdbc-112010-090769.html" name="Oracle 11g drivers">
+                        <file name="ojdbc6.jar" description="JDBC driver"/>
+                        <file name="orai18n.jar" description="NLS classes"/>
+                        <file name="xdb6.jar" description="SQLXML support"/>
+                    </fileSource>
+                    <fileSource url="http://www.oracle.com/technetwork/database/features/jdbc/default-2280470.html" name="Oracle 12g drivers">
+                        <file name="ojdbc7.jar" description="JDBC driver"/>
+                        <file name="orai18n.jar" description="NLS classes"/>
+                        <file name="xdb6.jar" description="SQLXML support"/>
+                    </fileSource>
                 </driver>
             </drivers>
             <views>