diff options
| author | nhauge | 2010-08-24 20:18:00 +0000 |
|---|---|---|
| committer | nhauge | 2010-08-24 20:18:00 +0000 |
| commit | 2789a14603f86bca5c3ba37066faa77689515967 (patch) | |
| tree | afc596ad892a7a5022599e76ebfa97d77b56b666 /jpa/plugins | |
| parent | 1aa9f5d84a93ce7f081396e0402712fe5e525984 (diff) | |
| download | webtools.dali-2789a14603f86bca5c3ba37066faa77689515967.tar.gz webtools.dali-2789a14603f86bca5c3ba37066faa77689515967.tar.xz webtools.dali-2789a14603f86bca5c3ba37066faa77689515967.zip | |
321401 - Temporary support added for DTP Extension in adopter product. Sybase platform wasn't detected when using adopter's DTP extension.
Diffstat (limited to 'jpa/plugins')
3 files changed, 18 insertions, 2 deletions
diff --git a/jpa/plugins/org.eclipse.jpt.db/META-INF/MANIFEST.MF b/jpa/plugins/org.eclipse.jpt.db/META-INF/MANIFEST.MF index eba715983c..1930d62e1c 100644 --- a/jpa/plugins/org.eclipse.jpt.db/META-INF/MANIFEST.MF +++ b/jpa/plugins/org.eclipse.jpt.db/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-SymbolicName: org.eclipse.jpt.db -Bundle-Version: 1.2.200.qualifier +Bundle-Version: 1.2.201.qualifier Bundle-Activator: org.eclipse.jpt.db.JptDbPlugin Bundle-ActivationPolicy: lazy Bundle-ClassPath: . diff --git a/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/vendor/Sybase.java b/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/vendor/Sybase.java index e90b9b9a0f..ab44318edb 100644 --- a/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/vendor/Sybase.java +++ b/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/vendor/Sybase.java @@ -21,6 +21,10 @@ class Sybase static final Vendor ASA = new Sybase("Sybase_ASA"); //$NON-NLS-1$ static final Vendor ASE = new Sybase("Sybase_ASE"); //$NON-NLS-1$ + // 321401 - hack to support DTP vendor extension in adopter product. + // Applies to 2.3.x maintenance stream only + static final String DTP_VENDOR_EXTENSION_NAME = "Sybase"; + static final Vendor DTP_VENDOR_EXTENSION = new Sybase(DTP_VENDOR_EXTENSION_NAME); //$NON-NLS-1$ static Vendor asa() { return ASA; @@ -29,6 +33,10 @@ class Sybase static Vendor ase() { return ASE; } + + static Vendor dtpVendorExtension() { + return DTP_VENDOR_EXTENSION; + } /** * Ensure only static instances. @@ -45,7 +53,14 @@ class Sybase @Override CatalogStrategy getCatalogStrategy() { - return SimpleCatalogStrategy.instance(); + // 308947 - hack to support DTP vendor extension in adopter product + if (getDTPVendorName().equals(DTP_VENDOR_EXTENSION_NAME)) { + return UnknownCatalogStrategy.instance(); + } + // normal logic: + else { + return SimpleCatalogStrategy.instance(); + } } /** diff --git a/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/vendor/VendorRepository.java b/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/vendor/VendorRepository.java index 468f09ea44..9f0bb28724 100644 --- a/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/vendor/VendorRepository.java +++ b/jpa/plugins/org.eclipse.jpt.db/src/org/eclipse/jpt/db/internal/vendor/VendorRepository.java @@ -53,6 +53,7 @@ public class VendorRepository { this.addVendorTo(SQLServer.instance(), list); this.addVendorTo(Sybase.asa(), list); this.addVendorTo(Sybase.ase(), list); + this.addVendorTo(Sybase.dtpVendorExtension(), list); } private void addVendorTo(Vendor vendor, ArrayList<Vendor> list) { |