Skip to content

Commit

Permalink
Fixes apache logging fragment problem
Browse files Browse the repository at this point in the history
* apache.directory's slf4j.api plugin requires a fragment that exports
the
  org.slf4j package. In JBDS, no fragment is resident, thus the
  org.apache.directory.studio.slf4j.eclipselog fragment is installed.

* In Eclipse Luna SR2, the ch.qos.logback.classic fragment is already
  resident hence apache's slf4j plugin latches onto it. However, its
host
  is an older version of slf4j.api and this causes a 'Uses Constraint'
  violation when installing Designer.

* To avoid this, Designer needs to ensure that the eclipselog fragment
is
  always installed as part of its dependencies. The seeming only way to
do
  this is by including it in a feature.

* Renames the 'crypto.dummy' feature to 'library' and adds the
eclipselog
  fragment to it. This does mean that the fragment is carried by the
  feature but there is not a lot that can be done about that since we
need
  to force its install and the apache.directory plugins/features cannot
be
  changed.
  • Loading branch information
Paul Richardson authored and blafond committed Oct 16, 2015
1 parent 1591f2d commit 630acb9
Show file tree
Hide file tree
Showing 11 changed files with 24 additions and 10 deletions.
2 changes: 1 addition & 1 deletion features/org.teiid.designer.feature/feature.xml
Expand Up @@ -38,7 +38,7 @@
ws="gtk"/>

<includes
id="org.teiid.designer.crypto.dummy.feature"
id="org.teiid.designer.library.feature"
version="0.0.0"
optional="true"/>

Expand Down
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>org.teiid.designer.crypto.dummy.feature</name>
<name>org.teiid.designer.library.feature</name>
<comment></comment>
<projects>
</projects>
Expand Down
Expand Up @@ -14,10 +14,10 @@


# Feature Information Page properties
description = The Teiid DataTools Connectivity Feature provides connectivity to Teiid to browse metadata and execute SQL in a DataTools context.
description = Provides miscellaneous plugins and fragments correcting deficiences with libraries depended on by Teiid Designer.

# "featureName" property - name of the feature
featureName=Teiid DataTools Connectivity Feature
featureName=Teiid Designer Library Feature

# "providerName" property - name of the company that provides the feature
providerName=JBoss by Red Hat
Expand Down
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.teiid.designer.crypto.dummy.feature"
label="Dummy Crypto Feature"
version="9.2.0.qualifier"
id="org.teiid.designer.library.feature"
label="Teiid Designer Library Feature"
version="9.0.4.qualifier"
provider-name="%providerName">

<description url="http://www.teiid.org/">
Expand All @@ -28,4 +28,12 @@
version="0.0.0"
unpack="false"/>

<plugin
id="org.apache.directory.studio.slf4j-eclipselog"
download-size="0"
install-size="0"
version="0.0.0"
fragment="true"
unpack="false"/>

</feature>
Expand Up @@ -7,7 +7,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
<version>0.0.4-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools</groupId>
<artifactId>org.teiid.designer.crypto.dummy.feature</artifactId>
<version>9.2.0-SNAPSHOT</version>
<artifactId>org.teiid.designer.library.feature</artifactId>
<version>9.0.4-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
4 changes: 3 additions & 1 deletion features/pom.xml
Expand Up @@ -14,7 +14,7 @@
<packaging>pom</packaging>

<modules>
<module>org.teiid.designer.crypto.dummy.feature</module>
<module>org.teiid.designer.library.feature</module>
<module>org.teiid.designer.teiid.client.feature</module>
<module>org.teiid.designer.feature</module>
<module>org.teiid.designer.test.feature</module>
Expand Down Expand Up @@ -43,6 +43,7 @@
<plugin id="org.teiid.designer.modelgenerator.salesforce.lib"/>
<plugin id="org.teiid.designer.webservice.lib"/>
<plugin id="org.jboss.tools.locus.mockito"/>
<plugin id="org.apache.directory.studio.slf4j-eclipselog"/>
<feature id="org.jboss.tools.foundation.security.linux.feature"/>
</excludes>
</configuration>
Expand All @@ -67,6 +68,7 @@
<plugin id="org.teiid.designer.modelgenerator.salesforce.lib"/>
<plugin id="org.teiid.designer.webservice.lib"/>
<plugin id="org.jboss.tools.locus.mockito"/>
<plugin id="org.apache.directory.studio.slf4j-eclipselog"/>
<feature id="org.jboss.tools.foundation.security.linux.feature"/>
</excludes>
</configuration>
Expand Down
4 changes: 4 additions & 0 deletions site/category.xml
Expand Up @@ -20,6 +20,10 @@ Visit the project home page at: http://www.teiid.org for details.
<category name="DataToolsSources"/>
</feature>

<feature id="org.teiid.designer.library.feature">
<category name="DataTools"/>
</feature>

<feature id="org.teiid.designer.runtime.feature">
<category name="DataTools"/>
</feature>
Expand Down

0 comments on commit 630acb9

Please sign in to comment.