Skip to content

Commit

Permalink
TEIIDDES-879: Ensure the feature dependencies are correct
Browse files Browse the repository at this point in the history
* The teiid runtime client plugins now depend on the connectivity plugins
  and as such that feature must be included in the client feature when
  installing.

* The main designer feature does not include the connectivity feature either
  so its a miracle that no errors have been reported when this has not
  been installed, since it depends on at least connecitivity.ui

* Likewise the connectivity feature must include the spi since it is relied
  upon by the plugins. Its never been a problem before since all 3 features
  are installed together so the spi has been present. However, installing
  the connectivity feature on its own will fail due to the lack of the spi
  plugin.
  • Loading branch information
Paul Richardson committed Jun 20, 2013
1 parent 110054d commit aae76fc
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 14 deletions.
7 changes: 7 additions & 0 deletions features/org.teiid.datatools.connectivity.feature/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -51,4 +51,11 @@
version="0.0.0"
unpack="false"/>

<plugin
id="org.teiid.designer.spi"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>

</feature>
4 changes: 4 additions & 0 deletions features/org.teiid.designer.feature/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@
%license
</license>

<includes
id="org.teiid.datatools.connectivity.feature"
version="0.0.0"/>

<requires>
<import plugin="org.eclipse.ui.cheatsheets" version="3.4.200" match="compatible"/>
<import plugin="org.eclipse.ui.ide" version="3.8.0" match="compatible"/>
Expand Down
17 changes: 3 additions & 14 deletions features/org.teiid.designer.teiid.client.feature/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,20 +17,9 @@
%license
</license>

<requires>
<import plugin="org.jdom" version="1.1.1" match="compatible"/>
<import plugin="org.jboss.tools.locus.sf.saxon" version="9.2.1" match="compatible"/>
<import plugin="org.hamcrest.core" version="1.1.0" match="compatible"/>
<import plugin="org.teiid.designer.spi" version="8.1.0" match="compatible"/>
<import plugin="org.eclipse.core.runtime" version="3.8.0" match="compatible"/>
<import plugin="org.eclipse.core.resources" version="3.8.0" match="compatible"/>
<import plugin="org.eclipse.wst.server.core" version="1.4.0" match="compatible"/>
<import plugin="org.eclipse.datatools.connectivity" version="1.2.5" match="compatible"/>
<import plugin="org.jboss.ide.eclipse.as.core" version="2.4.0" match="compatible"/>
<import plugin="org.jboss.ide.eclipse.as.dmr" version="2.4.0" match="compatible"/>
<import plugin="org.jboss.ide.eclipse.as.management.core" version="2.4.0" match="compatible"/>
<import plugin="org.eclipse.osgi"/>
</requires>
<includes
id="org.teiid.datatools.connectivity.feature"
version="0.0.0"/>

<plugin
id="org.teiid.8.4.x"
Expand Down

0 comments on commit aae76fc

Please sign in to comment.