You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by dj...@apache.org on 2011/04/19 22:56:15 UTC
svn commit: r1095210 - in /karaf/trunk/assemblies/features:
enterprise/src/main/feature/feature.xml standard/src/main/feature/feature.xml
Author: djencks
Date: Tue Apr 19 20:56:15 2011
New Revision: 1095210
URL: http://svn.apache.org/viewvc?rev=1095210&view=rev
Log:
KARAF-576 give our features lower start levels
Modified:
karaf/trunk/assemblies/features/enterprise/src/main/feature/feature.xml
karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml
Modified: karaf/trunk/assemblies/features/enterprise/src/main/feature/feature.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/enterprise/src/main/feature/feature.xml?rev=1095210&r1=1095209&r2=1095210&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/enterprise/src/main/feature/feature.xml (original)
+++ karaf/trunk/assemblies/features/enterprise/src/main/feature/feature.xml Tue Apr 19 20:56:15 2011
@@ -20,7 +20,7 @@
<features name="karaf-enterprise-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.0.0">
<feature name='transaction' description='OSGi Transaction Manager' version='${aries.transaction.version}'
- resolver='(obr)'>
+ resolver='(obr)' start-level='30'>
<details>The Aries JTA</details>
<bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo.jta-spec.version}</bundle>
<bundle>mvn:org.apache.aries.transaction/org.apache.aries.transaction.blueprint/${aries.transaction.version}</bundle>
@@ -29,7 +29,7 @@
</feature>
<feature name='jpa' description='OSGi Persistence Container' version='${aries.jpa.version}'
- resolver='(obr)'>
+ resolver='(obr)' start-level='30'>
<bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo.jta-spec.version}</bundle>
<bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-jpa_2.0_spec/${geronimo.jpa-spec.version}</bundle>
<bundle>mvn:org.apache.aries/org.apache.aries.util/${aries.util.version}</bundle>
@@ -40,7 +40,7 @@
</feature>
<feature name='jndi' description='OSGi Service Registry JNDI access' version='${aries.jndi.version}'
- resolver='(obr)'>
+ resolver='(obr)' start-level='30'>
<bundle>mvn:org.apache.aries/org.apache.aries.util/${aries.util.version}</bundle>
<bundle>mvn:org.apache.aries.jndi/org.apache.aries.jndi.api/${aries.jndi.version}</bundle>
<bundle>mvn:org.apache.aries.jndi/org.apache.aries.jndi.core/${aries.jndi.version}</bundle>
@@ -49,7 +49,7 @@
<bundle>mvn:org.apache.aries.jndi/org.apache.aries.jndi.legacy.support/${aries.jndi.version}</bundle>
</feature>
- <feature name="application-without-isolation" version="${aries.application.version}">
+ <feature name="application-without-isolation" version="${aries.application.version}" start-level='30'>
<!-- pre-requisites-->
<bundle>mvn:org.apache.aries.blueprint/org.apache.aries.blueprint/${aries.blueprint.version}</bundle>
<bundle>mvn:org.apache.aries.proxy/org.apache.aries.proxy/${aries.proxy.version}</bundle>
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=1095210&r1=1095209&r2=1095210&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml (original)
+++ karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml Tue Apr 19 20:56:15 2011
@@ -17,7 +17,7 @@
limitations under the License.
-->
<features name="karaf-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.0.0">
- <feature name="spring" version="${spring2.version}" resolver="(obr)">
+ <feature name="spring" version="${spring2.version}" resolver="(obr)" start-level='30'>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aopalliance/${aopalliance.bundle.version}</bundle>
<bundle>mvn:org.springframework/spring-core/${spring2.version}</bundle>
<bundle>mvn:org.springframework/spring-beans/${spring2.version}</bundle>
@@ -25,13 +25,13 @@
<bundle>mvn:org.springframework/spring-context/${spring2.version}</bundle>
<bundle>mvn:org.springframework/spring-context-support/${spring2.version}</bundle>
</feature>
- <feature name="spring-web" version="${spring2.version}" resolver="(obr)">
+ <feature name="spring-web" version="${spring2.version}" resolver="(obr)" start-level='30'>
<feature version="${spring2.version}">spring</feature>
<feature version="${project.version}">http</feature>
<bundle>mvn:org.springframework/spring-web/${spring2.version}</bundle>
<bundle>mvn:org.springframework/spring-webmvc/${spring2.version}</bundle>
</feature>
- <feature name="spring" version="${spring.version}" resolver="(obr)">
+ <feature name="spring" version="${spring.version}" resolver="(obr)" start-level='30'>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aopalliance/${aopalliance.bundle.version}</bundle>
<bundle>mvn:org.springframework/spring-core/${spring.version}</bundle>
<bundle>mvn:org.springframework/spring-asm/${spring.version}</bundle>
@@ -41,13 +41,13 @@
<bundle>mvn:org.springframework/spring-context/${spring.version}</bundle>
<bundle>mvn:org.springframework/spring-context-support/${spring.version}</bundle>
</feature>
- <feature name="spring-web" version="${spring.version}" resolver="(obr)">
+ <feature name="spring-web" version="${spring.version}" resolver="(obr)" start-level='30'>
<feature version="${spring.version}">spring</feature>
<feature version="${project.version}">http</feature>
<bundle>mvn:org.springframework/spring-web/${spring.version}</bundle>
<bundle>mvn:org.springframework/spring-webmvc/${spring.version}</bundle>
</feature>
- <feature name="spring-dm" version="${spring.osgi.version}" resolver="(obr)">
+ <feature name="spring-dm" version="${spring.osgi.version}" resolver="(obr)" start-level='30'>
<feature version="[2.5.6,4)">spring</feature>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cglib/${cglib.bundle.version}</bundle>
<bundle>mvn:org.springframework.osgi/spring-osgi-io/${spring.osgi.version}</bundle>
@@ -56,24 +56,24 @@
<bundle>mvn:org.springframework.osgi/spring-osgi-annotation/${spring.osgi.version}</bundle>
<bundle>mvn:org.apache.karaf.deployer/org.apache.karaf.deployer.spring/${project.version}</bundle>
</feature>
- <feature name="spring-dm-web" version="${spring.osgi.version}" resolver="(obr)">
+ <feature name="spring-dm-web" version="${spring.osgi.version}" resolver="(obr)" start-level='30'>
<feature version="${spring.osgi.version}">spring-dm</feature>
<feature version="[2.5.6,4)">spring-web</feature>
<feature version="${project.version}">http</feature>
<bundle>mvn:org.springframework.osgi/spring-osgi-web/${spring.osgi.version}</bundle>
</feature>
- <feature name="wrapper" version="${project.version}">
+ <feature name="wrapper" version="${project.version}" start-level='30'>
<bundle>mvn:org.apache.karaf.shell/org.apache.karaf.shell.wrapper/${project.version}</bundle>
</feature>
- <feature name="obr" version="${project.version}">
+ <feature name="obr" version="${project.version}" start-level='30'>
<bundle>mvn:org.apache.felix/org.apache.felix.bundlerepository/${felix.bundlerepository.version}</bundle>
<bundle>mvn:org.apache.karaf.shell/org.apache.karaf.shell.obr/${project.version}</bundle>
<bundle>mvn:org.apache.karaf.features/org.apache.karaf.features.obr/${project.version}</bundle>
</feature>
- <feature name="config" version="${project.version}">
+ <feature name="config" version="${project.version}" start-level='30'>
<bundle start-level='30' start='true'>mvn:org.apache.karaf.shell/org.apache.karaf.shell.config/${project.version}</bundle>
</feature>
- <feature name="jetty" version="${jetty.version}" resolver="(obr)">
+ <feature name="jetty" version="${jetty.version}" resolver="(obr)" start-level='30'>
<bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${geronimo.servlet.version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.asm/${asm.bundle.version}</bundle>
<bundle>mvn:org.eclipse.jetty/jetty-util/${jetty.version}</bundle>
@@ -88,7 +88,7 @@
<bundle>mvn:org.eclipse.jetty/jetty-servlets/${jetty.version}</bundle>
<bundle>mvn:org.eclipse.jetty/jetty-xml/${jetty.version}</bundle>
</feature>
- <feature name="jetty-jaas" version="${jetty.version}" resolver="(obr)">
+ <feature name="jetty-jaas" version="${jetty.version}" resolver="(obr)" start-level='30'>
<feature version="[7.0,8.0)">jetty</feature>
<bundle dependency='true'>mvn:javax.mail/mail/${javax.mail.version}</bundle>
<bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo.jta-spec.version}</bundle>
@@ -96,7 +96,7 @@
<bundle>mvn:org.eclipse.jetty/jetty-jndi/${jetty.version}</bundle>
<bundle>mvn:org.eclipse.jetty/jetty-plus/${jetty.version}</bundle>
</feature>
- <feature name="http" version="${project.version}" resolver="(obr)">
+ <feature name="http" version="${project.version}" resolver="(obr)" start-level='30'>
<configfile finalname="/etc/jetty.xml">mvn:org.apache.karaf.assemblies/apache-karaf/${project.version}/xml/jettyconfig</configfile>
<config name="org.ops4j.pax.web">
org.osgi.service.http.port=8181
@@ -109,12 +109,12 @@
<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 name="http-whiteboard" version="${project.version}" resolver="(obr)" start-level='30'>
<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)">
+ <feature name="war" version="${project.version}" resolver="(obr)" start-level='30'>
<config name="org.ops4j.pax.url.war">
org.ops4j.pax.url.war.importPaxLoggingPackages=true
</config>
@@ -125,10 +125,10 @@
<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>
- <feature name="kar" version="${project.version}">
+ <feature name="kar" version="${project.version}" start-level='30'>
<bundle>mvn:org.apache.karaf.deployer/org.apache.karaf.deployer.kar/${project.version}</bundle>
</feature>
- <feature name="webconsole-base" version="${project.version}">
+ <feature name="webconsole-base" version="${project.version}" start-level='30'>
<config name="org.apache.karaf.webconsole">
realm=karaf
</config>
@@ -138,7 +138,7 @@
<bundle>mvn:org.apache.karaf.webconsole/org.apache.karaf.webconsole.branding/${project.version}</bundle>
<bundle>mvn:org.apache.karaf.webconsole/org.apache.karaf.webconsole.console/${project.version}</bundle>
</feature>
- <feature name="webconsole" version="${project.version}">
+ <feature name="webconsole" version="${project.version}" start-level='30'>
<feature version="${project.version}">webconsole-base</feature>
<bundle>mvn:org.apache.karaf.webconsole/org.apache.karaf.webconsole.admin/${project.version}</bundle>
<bundle>mvn:org.apache.karaf.webconsole/org.apache.karaf.webconsole.features/${project.version}</bundle>
@@ -161,10 +161,10 @@
<bundle>mvn:org.apache.aries.jmx/org.apache.aries.jmx/${aries.jmx.version}</bundle>
<bundle>mvn:org.apache.aries.jmx/org.apache.aries.jmx.blueprint/${aries.jmx.version}</bundle>
</feature>
- <feature name="eventadmin" version="${project.version}">
+ <feature name="eventadmin" version="${project.version}" start-level='30'>
<bundle start-level='30'>mvn:org.apache.felix/org.apache.felix.eventadmin/${felix.eventadmin.version}</bundle>
</feature>
- <feature name="jasypt-encryption" version="${project.version}" resolver="(obr)">
+ <feature name="jasypt-encryption" version="${project.version}" resolver="(obr)" start-level='30'>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-codec/${commons-codec.bundle.version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-lang/${commons-lang.bundle.version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jasypt/${jasypt.bundle.version}</bundle>