You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2013/01/29 14:41:27 UTC
svn commit: r1439891 - in /karaf/trunk/assemblies/features:
framework/src/main/filtered-resources/resources/etc/org.apache.karaf.features.cfg
standard/src/main/feature/feature.xml
Author: jbonofre
Date: Tue Jan 29 13:41:27 2013
New Revision: 1439891
URL: http://svn.apache.org/viewvc?rev=1439891&view=rev
Log:
[KARAF-1712] Use Pax Web features
Modified:
karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/etc/org.apache.karaf.features.cfg
karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml
Modified: karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/etc/org.apache.karaf.features.cfg
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/etc/org.apache.karaf.features.cfg?rev=1439891&r1=1439890&r2=1439891&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/etc/org.apache.karaf.features.cfg (original)
+++ karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/etc/org.apache.karaf.features.cfg Tue Jan 29 13:41:27 2013
@@ -29,7 +29,7 @@
#
# Comma separated list of features repositories to register by default
#
-featuresRepositories=mvn:org.apache.karaf.features/standard/${project.version}/xml/features,mvn:org.apache.karaf.features/enterprise/${project.version}/xml/features
+featuresRepositories=mvn:org.apache.karaf.features/standard/${project.version}/xml/features,mvn:org.apache.karaf.features/enterprise/${project.version}/xml/features,mvn:org.ops4j.pax.web/pax-web-features/${pax.web.version}/xml/features
#
# Comma separated list of features to install at startup
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=1439891&r1=1439890&r2=1439891&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml (original)
+++ karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml Tue Jan 29 13:41:27 2013
@@ -84,13 +84,7 @@
</feature>
<feature name="jetty" description="Provide Jetty engine support" version="${jetty.version}" resolver="(obr)">
- <bundle dependency="true" start-level="30">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/${servicemix.specs.version}</bundle>
- <bundle dependency="true" start-level="30">mvn:${servlet.spec.groupId}/${servlet.spec.artifactId}/${servlet.spec.version}</bundle>
- <bundle dependency="true" start-level="30">mvn:javax.mail/mail/${javax.mail.version}</bundle>
- <bundle dependency="true" start-level="30">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo.jta-spec.version}</bundle>
- <bundle dependency="true" start-level="30">mvn:org.apache.geronimo.specs/geronimo-annotation_1.1_spec/${geronimo.annotation-spec.version}</bundle>
- <bundle dependency="true" start-level="30">mvn:org.apache.geronimo.specs/geronimo-jaspic_1.0_spec/${geronimo.jaspic-spec.version}</bundle>
- <bundle start-level="30">mvn:org.eclipse.jetty.aggregate/jetty-all-server/${jetty.version}</bundle>
+ <feature version="${jetty.version}">pax-web-jetty</feature>
</feature>
<feature name="package" version="${project.version}" resolver="(obr)" description="Package commands and mbeans">
@@ -99,42 +93,15 @@
</feature>
<feature name="http" version="${project.version}" resolver="(obr)" description="Implementation of the OSGI HTTP Service">
- <details>Allows to publish servlets using pax web and jetty</details>
- <configfile finalname="/etc/jetty.xml">mvn:org.apache.karaf/apache-karaf/${project.version}/xml/jettyconfig</configfile>
- <config name="org.ops4j.pax.web">
- org.osgi.service.http.port=8181
- javax.servlet.context.tempdir=${karaf.data}/pax-web-jsp
- org.ops4j.pax.web.config.file=${karaf.base}/etc/jetty.xml
- </config>
- <feature version="[7.0,9.0)">jetty</feature>
- <bundle start-level="30">mvn:org.ops4j.pax.web/pax-web-api/${pax.web.version}</bundle>
- <bundle start-level="30">mvn:org.ops4j.pax.web/pax-web-spi/${pax.web.version}</bundle>
- <bundle start-level="30">mvn:org.ops4j.pax.web/pax-web-runtime/${pax.web.version}</bundle>
- <bundle start-level="30">mvn:org.ops4j.pax.web/pax-web-jetty/${pax.web.version}</bundle>
- <bundle start-level="30">mvn:org.apache.karaf.http/org.apache.karaf.http.core/${project.version}</bundle>
- <bundle start-level="30">mvn:org.apache.karaf.http/org.apache.karaf.http.command/${project.version}</bundle>
+ <feature version="${pax.web.version}">pax-http</feature>
</feature>
<feature name="http-whiteboard" description="Provide HTTP Whiteboard pattern support" version="${project.version}" resolver="(obr)">
- <feature version="${http.feature.version}">http</feature>
- <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-whiteboard/${pax.web.version}</bundle>
+ <feature version="${pax.web.version}">pax-http-whiteboard</feature>
</feature>
<feature name="war" description="Turn Karaf as a full WebContainer" version="${project.version}" resolver="(obr)">
- <config name="org.ops4j.pax.url.war">
- org.ops4j.pax.url.war.importPaxLoggingPackages=true
- </config>
- <feature>http-whiteboard</feature>
- <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-deployer/${pax.web.version}</bundle>
- <bundle start-level="30">mvn:org.ops4j.pax.url/pax-url-war/${pax.url.version}</bundle>
- <bundle start-level="30">mvn:org.ops4j.pax.url/pax-url-commons/${pax.url.version}</bundle>
- <bundle start-level="30">mvn:org.ops4j.pax.swissbox/pax-swissbox-bnd/${pax.swissbox.version}</bundle>
- <bundle start-level="30">mvn:org.ops4j.pax.swissbox/pax-swissbox-property/${pax.swissbox.version}</bundle>
- <bundle start-level="30">mvn:biz.aQute/bndlib/${bndlib.version}</bundle>
- <bundle start-level="30">mvn:org.apache.karaf.web/org.apache.karaf.web.core/${project.version}</bundle>
- <bundle start-level="30">mvn:org.apache.karaf.web/org.apache.karaf.web.command/${project.version}</bundle>
+ <feature version="${pax.web.version}">pax-war</feature>
</feature>
<feature name="kar" description="Provide KAR (KARaf archive) support" version="${project.version}" resolver="(obr)">