Skip to content

Commit

Permalink
TEIIDDES-879: Migrate driver template to teiid runtime plugins
Browse files Browse the repository at this point in the history
* Migrates the common Teiid driver template defined in the connectivity
  plugins and moves the version-related parts down to the runtime plugins
  so that 3 versions of the driver template and default instances will be
  available to the user.

* The advantage is that the runtimes themselves become the driver jars so
  users have no need to specify the jar to use as the sql driver.
  • Loading branch information
Paul Richardson committed Jun 19, 2013
1 parent 4703cbc commit 0f9f2f2
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 90 deletions.
37 changes: 0 additions & 37 deletions plugins/org.teiid.datatools.connectivity.ui/plugin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -50,43 +50,6 @@
</enabledWhen>
</page>
</extension>

<extension point="org.eclipse.datatools.connectivity.ui.driverUIContributor">
<driverUIContributor
class="org.teiid.datatools.connectivity.ui.TeiidDriverUIContributor"
driverTemplateID="org.teiid.datatools.connectivity.driver.serverDriverTemplate"
id="org.teiid.datatools.connectivity.ui.TeiidServerUIContributor">
</driverUIContributor>
</extension>

<extension point="org.eclipse.datatools.connectivity.ui.driverPropertyEditor">
<propertyEditor
customPropertyDescriptor="org.eclipse.datatools.connectivity.ui.PasswordTextPropertyDescriptor"
driverPropertyID="org.eclipse.datatools.connectivity.db.password"
driverTemplateID="org.teiid.datatools.connectivity.driver.serverDriverTemplate"
id="org.eclipse.datatools.connectivity.teiid.ui.propertyEditor.password">
</propertyEditor>
</extension>

<extension
point="org.eclipse.datatools.sqltools.editor.core.ui.dbUIConfigurations">
<dbUIConfiguration
configurationClass="org.teiid.datatools.connectivity.ui.TeiidDBUIConfiguration"
default="false"
product="Teiid"
version="8.x">
</dbUIConfiguration>
</extension>
<extension
point="org.eclipse.datatools.sqltools.editor.core.dbConfigurations">
<dbConfiguration
configurationClass="org.teiid.datatools.connectivity.ui.TeiidDBConfiguration"
default="false"
product="Teiid"
supportsDebugging="false"
version="8.x">
</dbConfiguration>
</extension>
<extension
point="org.eclipse.datatools.sqltools.result.ui.resultSetViewer"
id="org.teiid.datatools.data.extensions.externalResultSetViewer ">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Require-Bundle: org.eclipse.ui;bundle-version="[3.103.0,4.0.0)",
org.eclipse.datatools.connectivity.sqm.core;bundle-version="[1.2.5,2.0.0)",
org.eclipse.datatools.sqltools.parsers.sql;bundle-version="[1.0.2,2.0.0)",
org.eclipse.datatools.connectivity.sqm.server.ui;bundle-version="[1.1.100,2.0.0)",
org.teiid.datatools.connectivity.model;bundle-version="[8.1.0,9.0.0)",
org.teiid.datatools.connectivity.model;bundle-version="[8.1.0,9.0.0)";visibility:=reexport,
org.eclipse.equinox.security;bundle-version="[1.1.100,2.0.0)",
org.teiid.designer.spi;bundle-version="[8.1.0,9.0.0)"
Bundle-ActivationPolicy: lazy
Expand Down
51 changes: 0 additions & 51 deletions plugins/org.teiid.datatools.connectivity/plugin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,51 +15,8 @@
name="Teiid"
description="Drivers for Teiid Federating Query Engine" />

<driverTemplate
createDefault="false"
defaultDefinitionName="Teiid Server Driver"
description="Driver for the Teiid Federating Query Engine"
emptyJarListIsOK="false"
id="org.teiid.datatools.connectivity.driver.serverDriverTemplate"
jarList="TEIID_HOME/client/teiid-version-client.jar"
name="Teiid Server JDBC Driver"
parentCategory="org.teiid.datatools.connectivity.driver.teiidCategory">
<properties>
<property generated="false"
id="org.eclipse.datatools.connectivity.db.driverClass" name="Driver Class"
value="org.teiid.jdbc.TeiidDriver" required="true" visible="true" />
<property generated="false"
id="org.eclipse.datatools.connectivity.db.vendor" name="Vendor"
value="Teiid" required="true" visible="true" />
<property generated="false"
id="org.eclipse.datatools.connectivity.db.version" name="Version"
value="8.x" required="true" visible="true" />
<property generated="false"
id="org.eclipse.datatools.connectivity.db.URL" name="Connection URL"
value="jdbc:teiid:vdb-name@mms://localhost:31000" required="false"
visible="true" />
<property generated="false"
id="org.eclipse.datatools.connectivity.db.username" name="User ID"
value="" required="false" visible="true" />
<property generated="false"
id="org.eclipse.datatools.connectivity.db.password" name="Password"
value="" required="false" visible="true" />
</properties>
</driverTemplate>

</extension>
<extension
point="org.eclipse.datatools.connectivity.sqm.core.databaseDefinition">
<definition
allowsConnections="true"
description="Definition of the Teiid Database"
file="src/org/teiid/datatools/connectivity/database/teiidDB.xmi"
product="Teiid"
productDisplayString="Teiid"
version="8.x"
versionDisplayString="8.x">
</definition>
</extension>
<extension
point="org.eclipse.datatools.connectivity.connectionProfile">
<category
Expand Down Expand Up @@ -87,14 +44,6 @@
</providerIDtoDriverCategoryID>
</extension>

<extension
point="org.eclipse.datatools.connectivity.sqm.core.catalog">
<overrideLoader
provider="org.teiid.datatools.connectivity.sql.TeiidSchemaLoader"
eclass="org.eclipse.datatools.modelbase.sql.schema.Schema"
product="Teiid"
version="8.x"/>
</extension>

<extension
point="org.eclipse.datatools.connectivity.sqm.core.logicalContainment">
Expand Down

0 comments on commit 0f9f2f2

Please sign in to comment.