NEW - bug 225025: Sybase 15.x  and 12.x Other Driver has no UI
https://bugs.eclipse.org/bugs/show_bug.cgi?id=225025
NEW - bug 225014: Bundle version ranges missing for many Sybase enablement plug-ins
https://bugs.eclipse.org/bugs/show_bug.cgi?id=225014
as well as bug 225024 and bug 225019
diff --git a/plugins/org.eclipse.datatools.enablement.sybase.asa.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.datatools.enablement.sybase.asa.ui/META-INF/MANIFEST.MF
index 5b3e70c..1daebd5 100644
--- a/plugins/org.eclipse.datatools.enablement.sybase.asa.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.datatools.enablement.sybase.asa.ui/META-INF/MANIFEST.MF
@@ -5,18 +5,18 @@
 Bundle-Version: 1.0.1.qualifier
 Bundle-Activator: org.eclipse.datatools.enablement.sybase.asa.ui.ASAUIPlugin
 Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.datatools.connectivity,
- org.eclipse.datatools.connectivity.ui,
- org.eclipse.datatools.enablement.sybase,
- org.eclipse.datatools.help,
- org.eclipse.ltk.core.refactoring,
- org.eclipse.datatools.connectivity.sqm.core.ui,
- org.eclipse.datatools.enablement.sybase.asa.models,
- org.eclipse.datatools.connectivity.sqm.core,
- org.eclipse.datatools.connectivity.sqm.server.ui,
- org.eclipse.ui.navigator,
- org.eclipse.datatools.enablement.sybase.asa
+Require-Bundle: org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.datatools.connectivity;bundle-version="[1.1.0,2.0.0)",
+ org.eclipse.datatools.connectivity.ui;bundle-version="[1.1.0,2.0.0)",
+ org.eclipse.datatools.enablement.sybase;bundle-version="[1.0.1,2.0.0)",
+ org.eclipse.datatools.help;bundle-version="[1.5.0,2.0.0)",
+ org.eclipse.ltk.core.refactoring;bundle-version="[3.3.1,4.0.0)",
+ org.eclipse.datatools.connectivity.sqm.core.ui;bundle-version="[1.1.0,2.0.0)",
+ org.eclipse.datatools.enablement.sybase.asa.models;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.datatools.connectivity.sqm.core;bundle-version="[1.0.1,2.0.0)",
+ org.eclipse.datatools.connectivity.sqm.server.ui;bundle-version="[1.1.0,2.0.0)",
+ org.eclipse.ui.navigator;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.datatools.enablement.sybase.asa;bundle-version="[1.0.1,2.0.0)"
 Eclipse-LazyStart: true
 Bundle-Vendor: Eclipse.org
diff --git a/plugins/org.eclipse.datatools.enablement.sybase.asa.ui/plugin.xml b/plugins/org.eclipse.datatools.enablement.sybase.asa.ui/plugin.xml
index ea2f689..9721a4c 100644
--- a/plugins/org.eclipse.datatools.enablement.sybase.asa.ui/plugin.xml
+++ b/plugins/org.eclipse.datatools.enablement.sybase.asa.ui/plugin.xml
@@ -194,5 +194,21 @@
             id="org.eclipse.datatools.enablement.sybase.asa.ui.connection.drivers.ASA10DriverUIContributor">
       </driverUIContributor>
    </extension>
+    <extension
+          point="org.eclipse.datatools.connectivity.ui.driverUIContributor">
+       <driverUIContributor
+             class="org.eclipse.datatools.enablement.sybase.asa.ui.ASAOtherDriverUIContributor"
+             driverTemplateID="org.eclipse.datatools.enablement.sybase.asa.9_x.other.driverTemplate"
+             id="org.eclipse.datatools.enablement.sybase.asa.9_x.other.ASAOtherDriverUIContributor">
+       </driverUIContributor>
+    </extension>
+    <extension
+          point="org.eclipse.datatools.connectivity.ui.driverUIContributor">
+       <driverUIContributor
+             class="org.eclipse.datatools.enablement.sybase.asa.ui.ASAOtherDriverUIContributor"
+             driverTemplateID="org.eclipse.datatools.enablement.sybase.asa.10_x.other.driverTemplate"
+             id="org.eclipse.datatools.enablement.sybase.asa.10_x.other.ASAOtherDriverUIContributor">
+       </driverUIContributor>
+    </extension>
  
 </plugin>
diff --git a/plugins/org.eclipse.datatools.enablement.sybase.asa.ui/src/org/eclipse/datatools/enablement/sybase/asa/ui/ASAOtherDriverUIContributor.java b/plugins/org.eclipse.datatools.enablement.sybase.asa.ui/src/org/eclipse/datatools/enablement/sybase/asa/ui/ASAOtherDriverUIContributor.java
new file mode 100644
index 0000000..01576fa
--- /dev/null
+++ b/plugins/org.eclipse.datatools.enablement.sybase.asa.ui/src/org/eclipse/datatools/enablement/sybase/asa/ui/ASAOtherDriverUIContributor.java
@@ -0,0 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2007 IBM Corporation and others. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors: IBM Corporation - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.datatools.enablement.sybase.asa.ui;
+
+import org.eclipse.datatools.connectivity.ui.wizards.OtherDriverUIContributor;
+
+public class ASAOtherDriverUIContributor extends OtherDriverUIContributor {
+
+}
\ No newline at end of file
diff --git a/plugins/org.eclipse.datatools.enablement.sybase.asa/META-INF/MANIFEST.MF b/plugins/org.eclipse.datatools.enablement.sybase.asa/META-INF/MANIFEST.MF
index f533596..a84d397 100644
--- a/plugins/org.eclipse.datatools.enablement.sybase.asa/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.datatools.enablement.sybase.asa/META-INF/MANIFEST.MF
@@ -14,9 +14,10 @@
  org.eclipse.datatools.enablement.sybase.asa.models;bundle-version="[1.0.0,2.0.0)",
  org.eclipse.datatools.enablement.sybase;bundle-version="[1.0.0,2.0.0)",
  com.ibm.icu;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.datatools.sqltools.editor.core,
+ org.eclipse.datatools.sqltools.editor.core;bundle-version="[1.0.0,2.0.0)",
  org.eclipse.datatools.connectivity.sqm.core.ui;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.datatools.sqltools.ddlgen.ui;bundle-version="[1.0.0,2.0.0)"
+ org.eclipse.datatools.sqltools.ddlgen.ui;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.datatools.connectivity.ui;bundle-version="[1.0.0,2.0.0)"
 Eclipse-LazyStart: true
 Bundle-Vendor: Eclipse.org
 Export-Package: org.eclipse.datatools.enablement.sybase.asa,
diff --git a/plugins/org.eclipse.datatools.enablement.sybase.asa/plugin.xml b/plugins/org.eclipse.datatools.enablement.sybase.asa/plugin.xml
index 44e9835..4af2da6 100644
--- a/plugins/org.eclipse.datatools.enablement.sybase.asa/plugin.xml
+++ b/plugins/org.eclipse.datatools.enablement.sybase.asa/plugin.xml
@@ -172,14 +172,18 @@
       </extension>
  
  <extension
-         point="org.eclipse.datatools.connectivity.driverExtension">     
+         point="org.eclipse.datatools.connectivity.driverExtension">
+         <!--     
+            jarList="[com.sybase.jconnect60]\lib\jconn3.jar"
+            -->
       <driverTemplate
             createDefault="false"
             emptyJarListIsOK="false"
             id="org.eclipse.datatools.enablement.sybase.asa.drivertemplate"
-            jarList="[com.sybase.jconnect60]\lib\jconn3.jar"
+            jarList="jconn3.jar"
             name="%asa9.driver.template"
-            parentCategory="org.eclipse.datatools.enablement.sybase.asa.9x">
+            parentCategory="org.eclipse.datatools.enablement.sybase.asa.9x"
+            valuesProvider="org.eclipse.datatools.enablement.sybase.asa.ASADriverValuesProvider">
          <properties>
             <property
                   generated="false"
@@ -261,9 +265,10 @@
             createDefault="false"
             emptyJarListIsOK="false"
             id="org.eclipse.datatools.enablement.sybase.asa.drivertemplate10"
-            jarList="[com.sybase.jconnect60]\lib\jconn3.jar"
+            jarList="jconn3.jar"
             name="%asa10.driver.template"
-            parentCategory="org.eclipse.datatools.enablement.sybase.asa.10x">
+            parentCategory="org.eclipse.datatools.enablement.sybase.asa.10x"
+            valuesProvider="org.eclipse.datatools.enablement.sybase.asa.ASADriverValuesProvider">
          <properties>
             <property
                   generated="false"
diff --git a/plugins/org.eclipse.datatools.enablement.sybase.asa/src/org/eclipse/datatools/enablement/sybase/asa/ASADriverValuesProvider.java b/plugins/org.eclipse.datatools.enablement.sybase.asa/src/org/eclipse/datatools/enablement/sybase/asa/ASADriverValuesProvider.java
new file mode 100644
index 0000000..cf7e601
--- /dev/null
+++ b/plugins/org.eclipse.datatools.enablement.sybase.asa/src/org/eclipse/datatools/enablement/sybase/asa/ASADriverValuesProvider.java
@@ -0,0 +1,54 @@
+package org.eclipse.datatools.enablement.sybase.asa;
+
+import java.io.IOException;
+import java.net.URL;
+
+import org.eclipse.core.runtime.FileLocator;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.datatools.connectivity.drivers.DefaultDriverValuesProvider;
+import org.eclipse.datatools.connectivity.drivers.IDriverValuesProvider;
+import org.osgi.framework.Bundle;
+
+public class ASADriverValuesProvider extends DefaultDriverValuesProvider {
+
+	public String createDefaultValue(String key) {
+		/**
+		 * Check to see if the org.apache.derby.core wrapper plug-in is 
+		 * in the Eclipse environment. If it is (most recently with 10.3 support),
+		 * we'll use it and grab the derby jar from there.
+		 */
+		if (key.equals(IDriverValuesProvider.VALUE_CREATE_DEFAULT)) {
+			Bundle[] bundles =
+				Platform.getBundles("com.sybase.jconnect60", null); //$NON-NLS-1$
+			if (bundles != null && bundles.length > 0) {
+				URL url =
+					bundles[0].getEntry("\\lib\\jconn3.jar"); //$NON-NLS-1$
+				if (url != null) {
+					return Boolean.toString(true);
+				}
+			}
+		}
+		if (key.equals(IDriverValuesProvider.VALUE_JARLIST)) {
+			Bundle[] bundles =
+				Platform.getBundles("com.sybase.jconnect60", null); //$NON-NLS-1$
+			if (bundles != null && bundles.length > 0) {
+				URL url =
+					bundles[0].getEntry("\\lib\\jconn3.jar"); //$NON-NLS-1$
+				if (url != null) {
+					try {
+						url = FileLocator.toFileURL(url);
+						IPath path = new Path(url.getFile());
+						return path.toOSString();
+					}
+					catch (IOException e) {
+						e.printStackTrace();
+					}
+				}
+			}
+		}
+		return super.createDefaultValue(key);
+	}
+
+}
diff --git a/plugins/org.eclipse.datatools.enablement.sybase.ase.models/META-INF/MANIFEST.MF b/plugins/org.eclipse.datatools.enablement.sybase.ase.models/META-INF/MANIFEST.MF
index b2b24bc..150d537 100644
--- a/plugins/org.eclipse.datatools.enablement.sybase.ase.models/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.datatools.enablement.sybase.ase.models/META-INF/MANIFEST.MF
@@ -4,9 +4,9 @@
 Bundle-SymbolicName: org.eclipse.datatools.enablement.sybase.ase.models
 Bundle-Version: 1.0.1.qualifier
 Bundle-Localization: plugin
-Require-Bundle: org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.datatools.modelbase.sql;visibility:=reexport,
- org.eclipse.datatools.enablement.sybase
+Require-Bundle: org.eclipse.emf.ecore;visibility:=reexport;bundle-version="[2.2.0,3.0.0)",
+ org.eclipse.datatools.modelbase.sql;visibility:=reexport;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.datatools.enablement.sybase;bundle-version="[1.0.1,2.0.0)"
 Export-Package: org.eclipse.datatools.enablement.sybase.ase.models.sybaseasesqlmodel,
  org.eclipse.datatools.enablement.sybase.ase.models.sybaseasesqlmodel.impl,
  org.eclipse.datatools.enablement.sybase.ase.models.sybaseasesqlmodel.partition,
diff --git a/plugins/org.eclipse.datatools.enablement.sybase.ase.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.datatools.enablement.sybase.ase.ui/META-INF/MANIFEST.MF
index f5351e8..4f4bd8e 100644
--- a/plugins/org.eclipse.datatools.enablement.sybase.ase.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.datatools.enablement.sybase.ase.ui/META-INF/MANIFEST.MF
@@ -4,17 +4,17 @@
 Bundle-SymbolicName: org.eclipse.datatools.enablement.sybase.ase.ui;singleton:=true
 Bundle-Version: 1.0.1.qualifier
 Bundle-Activator: org.eclipse.datatools.enablement.sybase.ase.ui.ASEUIPlugin
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.datatools.connectivity.ui,
- org.eclipse.datatools.sqltools.editor.core,
- org.eclipse.datatools.enablement.sybase,
- org.eclipse.datatools.enablement.sybase.ase,
- org.eclipse.datatools.enablement.sybase.ase.models,
- org.eclipse.datatools.help,
- org.eclipse.ui.navigator,
- org.eclipse.datatools.connectivity.sqm.core.ui,
- org.eclipse.datatools.connectivity.sqm.server.ui
+Require-Bundle: org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.datatools.connectivity.ui;bundle-version="[1.1.0,2.0.0)" ,
+ org.eclipse.datatools.sqltools.editor.core;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.datatools.enablement.sybase;bundle-version="[1.0.1,2.0.0)",
+ org.eclipse.datatools.enablement.sybase.ase;bundle-version="[1.0.1,2.0.0)",
+ org.eclipse.datatools.enablement.sybase.ase.models;bundle-version="[1.0.1,2.0.0)",
+ org.eclipse.datatools.help;bundle-version="[1.5.0,2.0.0)",
+ org.eclipse.ui.navigator;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.datatools.connectivity.sqm.core.ui;bundle-version="[1.1.0,2.0.0)",
+ org.eclipse.datatools.connectivity.sqm.server.ui;bundle-version="[1.1.0,2.0.0)"
 Eclipse-LazyStart: true
 Bundle-Localization: plugin
 Bundle-Vendor: Eclipse.org
diff --git a/plugins/org.eclipse.datatools.enablement.sybase.ase.ui/plugin.xml b/plugins/org.eclipse.datatools.enablement.sybase.ase.ui/plugin.xml
index 7ee9c38..9cb3162 100644
--- a/plugins/org.eclipse.datatools.enablement.sybase.ase.ui/plugin.xml
+++ b/plugins/org.eclipse.datatools.enablement.sybase.ase.ui/plugin.xml
@@ -216,4 +216,20 @@
             id="org.eclipse.datatools.enablement.sybase.ase.ui.connection.drivers.ASE15XADriverUIContributor">
       </driverUIContributor>
    </extension>
+       <extension
+             point="org.eclipse.datatools.connectivity.ui.driverUIContributor">
+          <driverUIContributor
+                class="org.eclipse.datatools.enablement.sybase.ase.ui.ASEOtherDriverUIContributor"
+                driverTemplateID="org.eclipse.datatools.enablement.sybase.ase.12_x.other.driverTemplate"
+                id="org.eclipse.datatools.enablement.sybase.ase.12_x.other.ASEOtherDriverUIContributor">
+          </driverUIContributor>
+       </extension>
+       <extension
+             point="org.eclipse.datatools.connectivity.ui.driverUIContributor">
+          <driverUIContributor
+                class="org.eclipse.datatools.enablement.sybase.ase.ui.ASEOtherDriverUIContributor"
+                driverTemplateID="org.eclipse.datatools.enablement.sybase.ase.15_0.other.driverTemplate"
+                id="org.eclipse.datatools.enablement.sybase.ase.15_0.other.ASEOtherDriverUIContributor">
+          </driverUIContributor>
+       </extension>
 </plugin>
diff --git a/plugins/org.eclipse.datatools.enablement.sybase.ase.ui/src/org/eclipse/datatools/enablement/sybase/ase/ui/ASEOtherDriverUIContributor.java b/plugins/org.eclipse.datatools.enablement.sybase.ase.ui/src/org/eclipse/datatools/enablement/sybase/ase/ui/ASEOtherDriverUIContributor.java
new file mode 100644
index 0000000..fefe047
--- /dev/null
+++ b/plugins/org.eclipse.datatools.enablement.sybase.ase.ui/src/org/eclipse/datatools/enablement/sybase/ase/ui/ASEOtherDriverUIContributor.java
@@ -0,0 +1,15 @@
+/*******************************************************************************
+ * Copyright (c) 2007 IBM Corporation and others. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors: IBM Corporation - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.datatools.enablement.sybase.ase.ui;
+
+import org.eclipse.datatools.connectivity.ui.wizards.OtherDriverUIContributor;
+
+public class ASEOtherDriverUIContributor extends OtherDriverUIContributor {
+
+}
\ No newline at end of file
diff --git a/plugins/org.eclipse.datatools.enablement.sybase.ase/META-INF/MANIFEST.MF b/plugins/org.eclipse.datatools.enablement.sybase.ase/META-INF/MANIFEST.MF
index e121d3b..34049c1 100644
--- a/plugins/org.eclipse.datatools.enablement.sybase.ase/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.datatools.enablement.sybase.ase/META-INF/MANIFEST.MF
@@ -5,19 +5,20 @@
 Bundle-Version: 1.0.1.qualifier
 Bundle-Activator: org.eclipse.datatools.enablement.ase.JDBCASEPlugin
 Bundle-Localization: plugin
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.datatools.modelbase.dbdefinition,
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.datatools.modelbase.dbdefinition;bundle-version="[1.0.0,2.0.0)",
  org.eclipse.datatools.modelbase.sql;visibility:=reexport,
- org.eclipse.datatools.connectivity,
- org.eclipse.datatools.connectivity.sqm.core,
- org.eclipse.ui.navigator,
- org.eclipse.datatools.enablement.sybase.ase.models,
- org.eclipse.datatools.sqltools.editor.core,
- org.eclipse.datatools.sqltools.sql,
- org.eclipse.datatools.enablement.sybase,
- com.ibm.icu,
- org.eclipse.datatools.connectivity.sqm.core.ui,
- org.eclipse.datatools.sqltools.ddlgen.ui;bundle-version="[1.0.0,2.0.0)"
+ org.eclipse.datatools.connectivity;bundle-version="[1.1.0,2.0.0)",
+ org.eclipse.datatools.connectivity.sqm.core;bundle-version="[1.0.1,2.0.0)",
+ org.eclipse.ui.navigator;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.datatools.enablement.sybase.ase.models;bundle-version="[1.0.1,2.0.0)",
+ org.eclipse.datatools.sqltools.editor.core;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.datatools.sqltools.sql;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.datatools.enablement.sybase;bundle-version="[1.0.1,2.0.0)",
+ com.ibm.icu;bundle-version="[3.4.0,4.0.0)",
+ org.eclipse.datatools.connectivity.sqm.core.ui;bundle-version="[1.1.0,2.0.0)",
+ org.eclipse.datatools.sqltools.ddlgen.ui;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.datatools.connectivity.ui;bundle-version="[1.0.0,2.0.0)"
 Eclipse-LazyStart: true
 Bundle-Vendor: Eclipse.org
 Export-Package: org.eclipse.datatools.enablement.ase,
diff --git a/plugins/org.eclipse.datatools.enablement.sybase.ase/plugin.xml b/plugins/org.eclipse.datatools.enablement.sybase.ase/plugin.xml
index b64832a..8eb3628 100644
--- a/plugins/org.eclipse.datatools.enablement.sybase.ase/plugin.xml
+++ b/plugins/org.eclipse.datatools.enablement.sybase.ase/plugin.xml
@@ -243,9 +243,10 @@
             createDefault="false"
             emptyJarListIsOK="false"
             id="org.eclipse.datatools.connectivity.db.sybase.ase.genericDriverTemplate_12"
-            jarList="[com.sybase.jconnect60]\lib\jconn3.jar"
+            jarList="jconn3.jar"
             name="%ase12.driver.template"
-            parentCategory="org.eclipse.datatools.enablement.sybase.ase.12x">
+            parentCategory="org.eclipse.datatools.enablement.sybase.ase.12x"
+            valuesProvider="org.eclipse.datatools.enablement.ase.ASEDriverValuesProvider">
          <properties>
             <property
                   generated="false"
@@ -327,9 +328,10 @@
             createDefault="false"
             emptyJarListIsOK="false"
             id="org.eclipse.datatools.connectivity.db.sybase.ase.genericDriverTemplate_15"
-            jarList="[com.sybase.jconnect60]\lib\jconn3.jar"
+            jarList="jconn3.jar"
             name="%ase15.driver.template"
-            parentCategory="org.eclipse.datatools.enablement.sybase.ase.15x">
+            parentCategory="org.eclipse.datatools.enablement.sybase.ase.15x"
+            valuesProvider="org.eclipse.datatools.enablement.ase.ASEDriverValuesProvider">
          <properties>
             <property
                   generated="false"
@@ -411,9 +413,10 @@
             createDefault="false"
             emptyJarListIsOK="false"
             id="org.eclipse.datatools.connectivity.db.sybase.ase.genericDriverTemplate_12_xa"
-            jarList="[com.sybase.jconnect60]\lib\jconn3.jar"
+            jarList="jconn3.jar"
             name="%ase12.xa.driver.template"
-            parentCategory="org.eclipse.datatools.enablement.sybase.ase.12x">
+            parentCategory="org.eclipse.datatools.enablement.sybase.ase.12x"
+            valuesProvider="org.eclipse.datatools.enablement.ase.ASEDriverValuesProvider">
          <properties>
             <property
                   generated="false"
@@ -501,9 +504,10 @@
             createDefault="false"
             emptyJarListIsOK="false"
             id="org.eclipse.datatools.connectivity.db.sybase.ase.genericDriverTemplate_15_xa"
-            jarList="[com.sybase.jconnect60]\lib\jconn3.jar"
+            jarList="jconn3.jar"
             name="%ase15.xa.driver.template"
-            parentCategory="org.eclipse.datatools.enablement.sybase.ase.15x">
+            parentCategory="org.eclipse.datatools.enablement.sybase.ase.15x"
+            valuesProvider="org.eclipse.datatools.enablement.ase.ASEDriverValuesProvider">
          <properties>
             <property
                   generated="false"
diff --git a/plugins/org.eclipse.datatools.enablement.sybase.ase/src/org/eclipse/datatools/enablement/ase/ASEDriverValuesProvider.java b/plugins/org.eclipse.datatools.enablement.sybase.ase/src/org/eclipse/datatools/enablement/ase/ASEDriverValuesProvider.java
new file mode 100644
index 0000000..f977485
--- /dev/null
+++ b/plugins/org.eclipse.datatools.enablement.sybase.ase/src/org/eclipse/datatools/enablement/ase/ASEDriverValuesProvider.java
@@ -0,0 +1,54 @@
+package org.eclipse.datatools.enablement.ase;
+
+import java.io.IOException;
+import java.net.URL;
+
+import org.eclipse.core.runtime.FileLocator;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.datatools.connectivity.drivers.DefaultDriverValuesProvider;
+import org.eclipse.datatools.connectivity.drivers.IDriverValuesProvider;
+import org.osgi.framework.Bundle;
+
+public class ASEDriverValuesProvider extends DefaultDriverValuesProvider {
+
+	public String createDefaultValue(String key) {
+		/**
+		 * Check to see if the org.apache.derby.core wrapper plug-in is 
+		 * in the Eclipse environment. If it is (most recently with 10.3 support),
+		 * we'll use it and grab the derby jar from there.
+		 */
+		if (key.equals(IDriverValuesProvider.VALUE_CREATE_DEFAULT)) {
+			Bundle[] bundles =
+				Platform.getBundles("com.sybase.jconnect60", null); //$NON-NLS-1$
+			if (bundles != null && bundles.length > 0) {
+				URL url =
+					bundles[0].getEntry("\\lib\\jconn3.jar"); //$NON-NLS-1$
+				if (url != null) {
+					return Boolean.toString(true);
+				}
+			}
+		}
+		if (key.equals(IDriverValuesProvider.VALUE_JARLIST)) {
+			Bundle[] bundles =
+				Platform.getBundles("com.sybase.jconnect60", null); //$NON-NLS-1$
+			if (bundles != null && bundles.length > 0) {
+				URL url =
+					bundles[0].getEntry("\\lib\\jconn3.jar"); //$NON-NLS-1$
+				if (url != null) {
+					try {
+						url = FileLocator.toFileURL(url);
+						IPath path = new Path(url.getFile());
+						return path.toOSString();
+					}
+					catch (IOException e) {
+						e.printStackTrace();
+					}
+				}
+			}
+		}
+		return super.createDefaultValue(key);
+	}
+
+}
diff --git a/plugins/org.eclipse.datatools.enablement.sybase/META-INF/MANIFEST.MF b/plugins/org.eclipse.datatools.enablement.sybase/META-INF/MANIFEST.MF
index 79059b5..e6f7a0c 100644
--- a/plugins/org.eclipse.datatools.enablement.sybase/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.datatools.enablement.sybase/META-INF/MANIFEST.MF
@@ -13,13 +13,13 @@
  org.eclipse.datatools.connectivity.sqm.core;bundle-version="[1.0.0,2.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.2.0,3.0.0)",
  org.eclipse.datatools.modelbase.sql;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.datatools.connectivity.sqm.core.ui,
- org.eclipse.ui.navigator,
- org.eclipse.datatools.connectivity.sqm.server.ui,
- org.eclipse.datatools.sqltools.editor.core,
- org.eclipse.datatools.help,
- org.eclipse.help,
- org.eclipse.emf.ecore.change
+ org.eclipse.datatools.connectivity.sqm.core.ui;bundle-version="[1.1.0,2.0.0)",
+ org.eclipse.ui.navigator;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.datatools.connectivity.sqm.server.ui;bundle-version="[1.1.0,2.0.0)",
+ org.eclipse.datatools.sqltools.editor.core;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.datatools.help;bundle-version="[1.5.0,2.0.0)",
+ org.eclipse.help;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.emf.ecore.change;bundle-version="[2.2.0,3.0.0)"
 Eclipse-LazyStart: true
 Export-Package: org.eclipse.datatools.enablement.sybase,
  org.eclipse.datatools.enablement.sybase.containment,
diff --git a/plugins/org.eclipse.datatools.enablement.sybase/plugin.xml b/plugins/org.eclipse.datatools.enablement.sybase/plugin.xml
index 8ef0cdd..a6de08c 100644
--- a/plugins/org.eclipse.datatools.enablement.sybase/plugin.xml
+++ b/plugins/org.eclipse.datatools.enablement.sybase/plugin.xml
@@ -41,19 +41,19 @@
    
    <!--For PrimaryKeyNode,UniqueConstraintNode,CheckConstraintNode,ForeignKeyNode -->
    <extension point = "org.eclipse.datatools.connectivity.sqm.core.ui.labelService">
-      <contributor
+<!--      <contributor
         displayType="%temptable.name"
         iconLocation="/icons/temporary_table.gif"
         type="org.eclipse.datatools.modelbase.sql.tables.TemporaryTable"/>
       <contributor
         displayType="%trigger.name"
         iconLocation="/icons/trigger.gif"
-        type="org.eclipse.datatools.modelbase.sql.tables.Trigger"/>
+        type="org.eclipse.datatools.modelbase.sql.tables.Trigger"/> -->
       <contributor
         displayType="%parameters.node.name"
         iconLocation="/icons/folder.gif"
         type="org.eclipse.datatools.enablement.sybase.virtual.ParametersNode"/>
-      <contributor
+<!--      <contributor
         displayType="%storedprocedure.node.name"
         iconLocation="/icons/folder.gif"
         type="org.eclipse.datatools.connectivity.sqm.core.internal.ui.explorer.providers.content.virtual.StoredProcedureNode"/>
@@ -92,7 +92,7 @@
       <contributor
         displayType="%udf.node.name"
         iconLocation="/icons/folder.gif"
-        type="org.eclipse.datatools.connectivity.sqm.core.internal.ui.explorer.providers.content.virtual.UDFNode"/>
+        type="org.eclipse.datatools.connectivity.sqm.core.internal.ui.explorer.providers.content.virtual.UDFNode"/> -->
       <contributor
         displayType="%checkconstraint.node.name"
         iconLocation="/icons/folder.gif"
@@ -109,15 +109,15 @@
         displayType="%uniqueconstraint.node.name"
         iconLocation="/icons/folder.gif"
         type="org.eclipse.datatools.enablement.sybase.virtual.UniqueConstraintNode"/>
-      <contributor
+<!--      <contributor
         displayType="%parameter.name"
         iconLocation="/icons/param_obj.gif"
-        type="org.eclipse.datatools.modelbase.sql.routines.Parameter"/>
+        type="org.eclipse.datatools.modelbase.sql.routines.Parameter"/>-->
    </extension>
    <!--end -->
    
 	<!-- Label Providers -->
-	<extension point = "org.eclipse.datatools.connectivity.sqm.core.ui.labelService">
+<!--	<extension point = "org.eclipse.datatools.connectivity.sqm.core.ui.labelService">
 		<contributor
 			type = "org.eclipse.datatools.modelbase.sql.schema.Database"
 			iconLocation = "/icons/database.gif"
@@ -208,7 +208,7 @@
 			displayType = "%foreignKey"
 			selector = "org.eclipse.datatools.enablement.sybase.SybaseLabelSelector">
 		</contributor>
-	</extension>
+	</extension>-->
 	<!-- end -->   
    <extension
          point="org.eclipse.ui.decorators">