Author: jbonofre
Date: Thu May 30 13:59:34 2013
New Revision: 1487864
URL: http://svn.apache.org/r1487864
Log:
[KARAF-2125] Install Felix DS WebConsole plugin conditionnaly to the scr feature
Modified:
karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml
karaf/trunk/pom.xml
Modified: karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml?rev=1487864&r1=1487863&r2=1487864&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml
(original)
+++ karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml Thu
May 30 13:59:34 2013
@@ -124,12 +124,14 @@
<bundle
start-level="30">mvn:org.apache.felix/org.apache.felix.metatype/${felix.metatype.version}</bundle>
<bundle
start-level="30">mvn:org.apache.karaf.webconsole/org.apache.karaf.webconsole.branding/${project.version}</bundle>
<bundle
start-level="30">mvn:org.apache.karaf.webconsole/org.apache.karaf.webconsole.console/${project.version}</bundle>
- <!-- Normally this should be part of the eventadmin feature. This is a
workaround to a console error. -->
<conditional>
<condition>eventadmin</condition>
- <bundle
start-level="30">mvn:org.apache.felix/org.apache.felix.webconsole.plugins.event/${felix.eventadmin-plugin.version}</bundle>
+ <bundle
start-level="30">mvn:org.apache.felix/org.apache.felix.webconsole.plugins.event/${felix.eventadmin.webconsole.plugin.version}</bundle>
+ </conditional>
+ <conditional>
+ <condition>scr</condition>
+ <bundle
start-level="30">mvn:org.apache.felix/org.apache.felix.webconsole.plugins.ds/${felix.scr.webconsole.plugin.version}</bundle>
</conditional>
-
</feature>
<feature name="ssh" description="Provide a SSHd server on Karaf"
version="${project.version}">
@@ -159,6 +161,10 @@
<feature name="eventadmin" description="OSGi Event Admin service
specification for event-based communication" version="${project.version}"
resolver="(obr)">
<bundle
start-level="30">mvn:org.apache.felix/org.apache.felix.eventadmin/${felix.eventadmin.version}</bundle>
+ <conditional>
+ <condition>webconsole</condition>
+ <bundle
start-level="30">mvn:org.apache.felix/org.apache.felix.webconsole.plugins.event/${felix.eventadmin.webconsole.plugin.version}</bundle>
+ </conditional>
</feature>
<feature name="jasypt-encryption" description="Advanced encryption support
for Karaf security" version="${project.version}" resolver="(obr)">
@@ -177,6 +183,10 @@
<condition>management</condition>
<bundle
start-level="30">mvn:org.apache.karaf.scr/org.apache.karaf.scr.management/${project.version}</bundle>
</conditional>
+ <conditional>
+ <condition>webconsole</condition>
+ <bundle
start-level="30">mvn:org.apache.felix/org.apache.felix.webconsole.plugins.ds/${felix.scr.webconsole.plugin.version}</bundle>
+ </conditional>
</feature>
</features>
Modified: karaf/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/pom.xml?rev=1487864&r1=1487863&r2=1487864&view=diff
==============================================================================
--- karaf/trunk/pom.xml (original)
+++ karaf/trunk/pom.xml Thu May 30 13:59:34 2013
@@ -157,9 +157,10 @@
<felix.webconsole.api.version>3.1.2</felix.webconsole.api.version>
<felix.metatype.version>1.0.6</felix.metatype.version>
<felix.eventadmin.version>1.3.2</felix.eventadmin.version>
-
<felix.eventadmin-plugin.version>1.0.2</felix.eventadmin-plugin.version>
+
<felix.eventadmin.webconsole.plugin.version>1.0.2</felix.eventadmin.webconsole.plugin.version>
<felix.obr.version>1.0.2</felix.obr.version>
<felix.scr.version>1.6.2</felix.scr.version>
+
<felix.scr.webconsole.plugin.version>1.0.0</felix.scr.webconsole.plugin.version>
<felix.scr.annotation.version>1.6.0</felix.scr.annotation.version>
<aries.application.version>1.0.0</aries.application.version>
@@ -867,7 +868,12 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.webconsole.plugins.event</artifactId>
- <version>${felix.eventadmin-plugin.version}</version>
+
<version>${felix.eventadmin.webconsole.plugin.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.webconsole.plugins.ds</artifactId>
+ <version>${felix.scr.webconsole.plugin.version}</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
