You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by an...@apache.org on 2011/02/25 00:48:44 UTC

svn commit: r1074354 - /karaf/trunk/features/assembly/standard/src/main/resources/features.xml

Author: anierbeck
Date: Thu Feb 24 23:48:44 2011
New Revision: 1074354

URL: http://svn.apache.org/viewvc?rev=1074354&view=rev
Log:
[KARAF-465] - Merge http with war feature 
Actually introduced another http-whiteboard feature which contains extra whiteboard extensions.

Modified:
    karaf/trunk/features/assembly/standard/src/main/resources/features.xml

Modified: karaf/trunk/features/assembly/standard/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/features/assembly/standard/src/main/resources/features.xml?rev=1074354&r1=1074353&r2=1074354&view=diff
==============================================================================
--- karaf/trunk/features/assembly/standard/src/main/resources/features.xml (original)
+++ karaf/trunk/features/assembly/standard/src/main/resources/features.xml Thu Feb 24 23:48:44 2011
@@ -106,15 +106,18 @@
         <bundle>mvn:org.ops4j.pax.web/pax-web-runtime/${pax.web.version}</bundle>
         <bundle>mvn:org.ops4j.pax.web/pax-web-jetty/${pax.web.version}</bundle>
     </feature>
+    <feature name="http-whiteboard" version="${project.version}" resolver="(obr)">
+        <feature>http</feature>
+        <bundle>mvn:org.ops4j.pax.web/pax-web-jsp/${pax.web.version}</bundle>
+        <bundle>mvn:org.ops4j.pax.web/pax-web-extender-whiteboard/${pax.web.version}</bundle>
+    </feature> 
     <feature name="war" version="${project.version}" resolver="(obr)">
         <config name="org.ops4j.pax.url.war">
             org.ops4j.pax.url.war.importPaxLoggingPackages=true
         </config>
-        <feature>http</feature>
+        <feature>http-whiteboard</feature>
         <bundle start-level='30'>mvn:org.apache.karaf.shell/org.apache.karaf.shell.web/${project.version}</bundle>
-        <bundle>mvn:org.ops4j.pax.web/pax-web-jsp/${pax.web.version}</bundle>
         <bundle>mvn:org.ops4j.pax.web/pax-web-extender-war/${pax.web.version}</bundle>
-        <bundle>mvn:org.ops4j.pax.web/pax-web-extender-whiteboard/${pax.web.version}</bundle>
         <bundle>mvn:org.ops4j.pax.web/pax-web-deployer/${pax.web.version}</bundle>
         <bundle>mvn:org.ops4j.pax.url/pax-url-war/${pax.url.version}</bundle>
     </feature>