Author: gnodet
Date: Mon Nov 29 10:05:50 2010
New Revision: 1040052
URL: http://svn.apache.org/viewvc?rev=1040052&view=rev
Log:
[KARAF-293] Make sure the OBR resolver is optional for the enterprise features
Modified:
karaf/trunk/features/enterprise/src/main/resources/features.xml
Modified: karaf/trunk/features/enterprise/src/main/resources/features.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/features/enterprise/src/main/resources/features.xml?rev=1040052&r1=1040051&r2=1040052&view=diff
==============================================================================
--- karaf/trunk/features/enterprise/src/main/resources/features.xml (original)
+++ karaf/trunk/features/enterprise/src/main/resources/features.xml Mon Nov 29
10:05:50 2010
@@ -19,14 +19,14 @@
-->
<features>
- <feature name='transaction' description='OSGi Transaction Manager'
version='${aries.blueprint.version}' resolver='obr'>
+ <feature name='transaction' description='OSGi Transaction Manager'
version='${aries.blueprint.version}' resolver='(obr)'>
<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.blueprint.version}</bundle>
<bundle>mvn:org.apache.aries.transaction/org.apache.aries.transaction.manager/${aries.blueprint.version}</bundle>
</feature>
- <feature name='persistence' description='OSGi Persistence Container'
version='${aries.blueprint.version}' resolver='obr'>
+ <feature name='persistence' description='OSGi Persistence Container'
version='${aries.blueprint.version}' resolver='(obr)'>
<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.jpa/org.apache.aries.jpa.blueprint.aries/${aries.blueprint.version}</bundle>
@@ -35,7 +35,7 @@
<bundle>mvn:org.apache.aries/org.apache.aries.util/${aries.blueprint.version}</bundle>
</feature>
- <feature name='jndi' description='OSGi Service Registry JNDI access'
version='${aries.blueprint.version}' resolver='obr'>
+ <feature name='jndi' description='OSGi Service Registry JNDI access'
version='${aries.blueprint.version}' resolver='(obr)'>
<bundle
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cglib/${cglib.bundle.version}</bundle>
<bundle>mvn:org.apache.aries/org.apache.aries.util/${aries.blueprint.version}</bundle>
<bundle>mvn:org.apache.aries.jndi/org.apache.aries.jndi.api/${aries.blueprint.version}</bundle>
