Author: cschneider Date: Wed Feb 8 15:55:06 2012 New Revision: 1241950 URL: http://svn.apache.org/viewvc?rev=1241950&view=rev Log: CXF-4090 Let the war feature also depend on http-whiteboard to avoid duplicating the whiteboard extender bundle
Modified: karaf/branches/karaf-2.2.x/assemblies/features/standard/src/main/resources/features.xml Modified: karaf/branches/karaf-2.2.x/assemblies/features/standard/src/main/resources/features.xml URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/assemblies/features/standard/src/main/resources/features.xml?rev=1241950&r1=1241949&r2=1241950&view=diff ============================================================================== --- karaf/branches/karaf-2.2.x/assemblies/features/standard/src/main/resources/features.xml (original) +++ karaf/branches/karaf-2.2.x/assemblies/features/standard/src/main/resources/features.xml Wed Feb 8 15:55:06 2012 @@ -213,12 +213,11 @@ <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 start-level='30'>mvn:org.apache.karaf.management.mbeans/org.apache.karaf.management.mbeans.web/${project.version}</bundle> <bundle start-level="30">mvn:org.ops4j.pax.web/pax-web-jsp/${pax.web.version}</bundle> <bundle start-level="30">mvn:org.ops4j.pax.web/pax-web-extender-war/${pax.web.version}</bundle> - <bundle start-level="30">mvn:org.ops4j.pax.web/pax-web-extender-whiteboard/${pax.web.version}</bundle> <bundle start-level="30">mvn:org.ops4j.pax.web/pax-web-deployer/${pax.web.version}</bundle> <bundle start-level="30">mvn:org.ops4j.pax.url/pax-url-war/${pax.url.version}</bundle> </feature>