Author: jbonofre
Date: Mon Jun 3 07:30:28 2013
New Revision: 1488875
URL: http://svn.apache.org/r1488875
Log:
[KARAF-2125] Add webconsole-scr feature to install the Declarative Service
WebConsole plugin
Modified:
karaf/branches/karaf-2.x/assemblies/features/standard/src/main/resources/features.xml
karaf/branches/karaf-2.x/pom.xml
Modified:
karaf/branches/karaf-2.x/assemblies/features/standard/src/main/resources/features.xml
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.x/assemblies/features/standard/src/main/resources/features.xml?rev=1488875&r1=1488874&r2=1488875&view=diff
==============================================================================
---
karaf/branches/karaf-2.x/assemblies/features/standard/src/main/resources/features.xml
(original)
+++
karaf/branches/karaf-2.x/assemblies/features/standard/src/main/resources/features.xml
Mon Jun 3 07:30:28 2013
@@ -397,7 +397,7 @@
<bundle
start-level="30">mvn:org.apache.karaf.webconsole/org.apache.karaf.webconsole.admin/${project.version}</bundle>
<bundle
start-level="30">mvn:org.apache.karaf.webconsole/org.apache.karaf.webconsole.features/${project.version}</bundle>
<bundle
start-level="30">mvn:org.apache.karaf.webconsole/org.apache.karaf.webconsole.gogo/${project.version}</bundle>
- <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>
</feature>
<feature name="ssh" description="Provide a SSHd server on Karaf"
version="${project.version}">
@@ -445,4 +445,10 @@
<bundle
start-level="30">mvn:org.apache.karaf.shell/org.apache.karaf.shell.scr/${project.version}</bundle>
<bundle
start-level="30">mvn:org.apache.karaf.management.mbeans/org.apache.karaf.management.mbeans.scr/${project.version}</bundle>
</feature>
+ <feature name="webconsole-scr" description="WebConsole SCR plugin support"
version="${project.version}" resolver="(obr)">
+ <feature>scr</feature>
+ <feature>webconsole</feature>
+ <bundle
start-level="30">mvn:org.apache.felix/org.apache.felix.webconsole.plugins.ds/${felix.scr.webconsole.plugin.version}</bundle>
+ </feature>
+
</features>
Modified: karaf/branches/karaf-2.x/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.x/pom.xml?rev=1488875&r1=1488874&r2=1488875&view=diff
==============================================================================
--- karaf/branches/karaf-2.x/pom.xml (original)
+++ karaf/branches/karaf-2.x/pom.xml Mon Jun 3 07:30:28 2013
@@ -137,9 +137,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>
<aries.application.version>1.0.0</aries.application.version>
<aries.application.api.version>1.0.0</aries.application.api.version>
<aries.application.management.version>1.0.0</aries.application.management.version>
