Build config fixed

Driver location experiments

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

@@ -31,10 +31,9 @@ Export-Package: org.apache.commons.logging,
  org.jkiss.dbeaver.model.impl.data,
  org.jkiss.dbeaver.model.impl.edit,
  org.jkiss.dbeaver.model.impl.jdbc,
- org.jkiss.dbeaver.model.impl.jdbc.api,
  org.jkiss.dbeaver.model.impl.jdbc.cache,
  org.jkiss.dbeaver.model.impl.jdbc.data,
- org.jkiss.dbeaver.model.impl.jdbc.dbc,
+ org.jkiss.dbeaver.model.impl.jdbc.exec,
  org.jkiss.dbeaver.model.impl.jdbc.edit,
  org.jkiss.dbeaver.model.impl.jdbc.edit.struct,
  org.jkiss.dbeaver.model.impl.jdbc.struct,

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

@@ -1431,7 +1431,7 @@
             <command commandId="org.jkiss.dbeaver.ui.editors.sql.run.statement"/>
             <command commandId="org.jkiss.dbeaver.ui.editors.sql.run.script"/>
             <command commandId="org.jkiss.dbeaver.ui.editors.sql.export.data"/>
-            <separator visible="true"/>
+            <separator name="other" visible="true"/>
         </menuContribution>
 
         <!-- QM menu & toolbar -->

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/DBeaverConstants.java

@@ -32,4 +32,6 @@ public class DBeaverConstants
     public static final String PRODUCT_PROP_WEBSITE = "website"; //$NON-NLS-1$
     public static final String PRODUCT_PROP_EMAIL = "email"; //$NON-NLS-1$
     public static final String DEFAULT_DRIVERS_SOURCE = "http://dbeaver.jkiss.org/files/jdbc/";
+
+    public static final String PROP_DRIVERS_LOCATION = "DRIVERS_LOCATION";
 }

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/DBeaverCore.java

@@ -434,6 +434,11 @@ public class DBeaverCore implements DBPApplication {
     {
         IPreferenceStore store = getGlobalPreferenceStore();
 
+        {
+            File driversHome = DriverDescriptor.getCustomDriversHome();
+            System.setProperty(DBeaverConstants.PROP_DRIVERS_LOCATION, driversHome.getAbsolutePath());
+        }
+
         // Agent
         RuntimeUtils.setDefaultPreferenceValue(store, PrefConstants.AGENT_ENABLED, true);
         RuntimeUtils.setDefaultPreferenceValue(store, PrefConstants.AGENT_LONG_OPERATION_NOTIFY, true);

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

@@ -14,5 +14,5 @@ Require-Bundle: org.eclipse.ui,
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-Vendor: Serge Rieder
-Bundle-ClassPath: .
+Bundle-ClassPath: .,external:$DRIVERS_LOCATION$/oracle/ojdbc6.jar
 Bundle-Localization: plugin