[KARAF-2904] Use the osgi extender namespace for blueprint Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/8b59f976 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/8b59f976 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/8b59f976
Branch: refs/heads/master Commit: 8b59f9767c2ec2b36dfe7cee9787ff44e72396bc Parents: 3fe6898 Author: Guillaume Nodet <gno...@gmail.com> Authored: Mon Apr 14 11:08:39 2014 +0200 Committer: Guillaume Nodet <gno...@gmail.com> Committed: Mon Apr 14 11:08:39 2014 +0200 ---------------------------------------------------------------------- .../features/enterprise/src/main/feature/feature.xml | 11 +++++++++-- assemblies/features/spring/src/main/feature/feature.xml | 5 ++++- .../features/standard/src/main/feature/feature.xml | 5 +++-- 3 files changed, 16 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/8b59f976/assemblies/features/enterprise/src/main/feature/feature.xml ---------------------------------------------------------------------- diff --git a/assemblies/features/enterprise/src/main/feature/feature.xml b/assemblies/features/enterprise/src/main/feature/feature.xml index 24c4136..da68fe1 100644 --- a/assemblies/features/enterprise/src/main/feature/feature.xml +++ b/assemblies/features/enterprise/src/main/feature/feature.xml @@ -16,7 +16,7 @@ See the License for the specific language governing permissions and limitations under the License. --> -<features name="enterprise-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0";> +<features name="enterprise-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.3.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.3.0 http://karaf.apache.org/xmlns/features/v1.3.0";> <!-- NB: this file is not the one really used. This file is used by the karaf-maven-plugin to define the start-level of bundles in the generated feature.xml --> @@ -186,10 +186,17 @@ <feature name="jdbc" description="JDBC service and commands" version="${project.version}" resolver="(obr)"> <details>JDBC support providing service, commands, and MBean.</details> <feature>transaction</feature> - <feature>aries-blueprint</feature> <bundle>mvn:commons-pool/commons-pool/${commons-pool.version}</bundle> <bundle>mvn:commons-dbcp/commons-dbcp/${commons-dbcp.version}</bundle> <bundle>mvn:org.apache.karaf.jdbc/org.apache.karaf.jdbc.core/${project.version}</bundle> + <!-- + Requirement on Blueprint. + We don't use a feature dependency to allow the choice between aries-blueprint and gemini-blueprint. + This means that you need to install one of the above to be able to install the jdbc feature. + --> + <requirement> + osgi.extender;filter:="(&(osgi.extender=osgi.blueprint)(version>=1.0))" + </requirement> </feature> <feature name="jms" description="JMS service and commands" version="${project.version}" resolver="(obr)"> http://git-wip-us.apache.org/repos/asf/karaf/blob/8b59f976/assemblies/features/spring/src/main/feature/feature.xml ---------------------------------------------------------------------- diff --git a/assemblies/features/spring/src/main/feature/feature.xml b/assemblies/features/spring/src/main/feature/feature.xml index 5917225..b8f0066 100644 --- a/assemblies/features/spring/src/main/feature/feature.xml +++ b/assemblies/features/spring/src/main/feature/feature.xml @@ -16,7 +16,7 @@ See the License for the specific language governing permissions and limitations under the License. --> -<features name="spring-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0";> +<features name="spring-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.3.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.3.0 http://karaf.apache.org/xmlns/features/v1.3.0";> <!-- NB: this file is not the one really used. This file is used by the karaf-maven-plugin to define the start-level of bundles in the generated feature.xml --> @@ -287,6 +287,9 @@ <bundle start-level="30">mvn:org.eclipse.gemini/org.eclipse.gemini.blueprint.io/${gemini.blueprint.version}</bundle> <bundle start-level="30">mvn:org.eclipse.gemini/org.eclipse.gemini.blueprint.core/${gemini.blueprint.version}</bundle> <bundle start-level="30">mvn:org.eclipse.gemini/org.eclipse.gemini.blueprint.extender/${gemini.blueprint.version}</bundle> + <capability> + osgi.extender; osgi.extender="osgi.blueprint";uses:="org.osgi.service.blueprint.container,org.osgi.service.blueprint.reflect";version:Version="1.0" + </capability> </feature> </features> http://git-wip-us.apache.org/repos/asf/karaf/blob/8b59f976/assemblies/features/standard/src/main/feature/feature.xml ---------------------------------------------------------------------- diff --git a/assemblies/features/standard/src/main/feature/feature.xml b/assemblies/features/standard/src/main/feature/feature.xml index 5e3fd11..6612af4 100644 --- a/assemblies/features/standard/src/main/feature/feature.xml +++ b/assemblies/features/standard/src/main/feature/feature.xml @@ -51,7 +51,8 @@ <bundle start-level="30">mvn:org.apache.karaf.bundle/org.apache.karaf.bundle.blueprintstate/${project.version}</bundle> </conditional> <capability> - service-reference;effective:=active;objectClass=org.apache.aries.blueprint.services.ParserService + service-reference;effective:=active;objectClass=org.apache.aries.blueprint.services.ParserService, + osgi.extender; osgi.extender="osgi.blueprint";uses:="org.osgi.service.blueprint.container,org.osgi.service.blueprint.reflect";version:Version="1.0" </capability> </feature> @@ -87,7 +88,7 @@ <bundle start="true" start-level="24">mvn:org.apache.karaf.deployer/org.apache.karaf.deployer.wrap/${project.version}</bundle> <bundle start="true" start-level="26">mvn:org.apache.karaf.deployer/org.apache.karaf.deployer.features/${project.version}</bundle> <conditional> - <condition>aries-blueprint</condition> + <condition>req:osgi.extender;filter:="(&(osgi.extender=osgi.blueprint)(version>=1.0))"</condition> <bundle start="true" start-level="24">mvn:org.apache.karaf.deployer/org.apache.karaf.deployer.blueprint/${project.version}</bundle> </conditional> <conditional>
