[KARAF-2911] Support for Aries OSGi subsystems Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/eb3fb656 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/eb3fb656 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/eb3fb656
Branch: refs/heads/master Commit: eb3fb656194f5f2fb2cadc70524463b5e2004de4 Parents: 67f7610 Author: Guillaume Nodet <gno...@gmail.com> Authored: Mon Apr 14 17:06:35 2014 +0200 Committer: Guillaume Nodet <gno...@gmail.com> Committed: Mon Apr 14 17:07:59 2014 +0200 ---------------------------------------------------------------------- .../enterprise/src/main/feature/feature.xml | 13 +++ .../itests/features/EnterpriseFeaturesTest.java | 5 ++ pom.xml | 14 +++ services/coordinator/pom.xml | 95 ++++++++++++++++++++ services/eventadmin/pom.xml | 2 +- services/pom.xml | 1 + 6 files changed, 129 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/eb3fb656/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 8964686..65ccf10 100644 --- a/assemblies/features/enterprise/src/main/feature/feature.xml +++ b/assemblies/features/enterprise/src/main/feature/feature.xml @@ -240,4 +240,17 @@ <bundle start-level="30">mvn:org.apache.aries.application/org.apache.aries.application.runtime/${aries.application.version}</bundle> </feature> + <feature name="subsystems" description="Support for OSGi subsystems" version="${aries.subsystem.version}"> + <details>Support for Aries OSGi subsystems</details> + <!-- blueprint is required for application.modeller --> + <feature>aries-blueprint</feature> + <bundle start-level="30">mvn:org.apache.felix/org.apache.felix.resolver/${felix.resolver.version}</bundle> + <bundle start-level="30">mvn:org.apache.karaf.services/org.apache.karaf.services.coordinator/${project.version}</bundle> + <bundle start-level="30">mvn:org.eclipse.equinox/org.eclipse.equinox.region/${equinox.region.version}</bundle> + <bundle start-level="30">mvn:org.apache.aries.application/org.apache.aries.application.api/${aries.application.api.version}</bundle> + <bundle start-level="30">mvn:org.apache.aries.application/org.apache.aries.application.utils/${aries.application.version}</bundle> + <bundle start-level="30">mvn:org.apache.aries.application/org.apache.aries.application.modeller/${aries.application.version}</bundle> + <bundle start-level="30">mvn:org.apache.aries.subsystem/org.apache.aries.subsystem/${aries.subsystem.version}</bundle> + </feature> + </features> http://git-wip-us.apache.org/repos/asf/karaf/blob/eb3fb656/itests/src/test/java/org/apache/karaf/itests/features/EnterpriseFeaturesTest.java ---------------------------------------------------------------------- diff --git a/itests/src/test/java/org/apache/karaf/itests/features/EnterpriseFeaturesTest.java b/itests/src/test/java/org/apache/karaf/itests/features/EnterpriseFeaturesTest.java index 5f27fb3..0ee5260 100644 --- a/itests/src/test/java/org/apache/karaf/itests/features/EnterpriseFeaturesTest.java +++ b/itests/src/test/java/org/apache/karaf/itests/features/EnterpriseFeaturesTest.java @@ -87,4 +87,9 @@ public class EnterpriseFeaturesTest extends KarafTestSupport { installAssertAndUninstallFeatures("application-without-isolation"); } + @Test + public void installSubsystems() throws Exception { + installAssertAndUninstallFeatures("subsystems"); + } + } http://git-wip-us.apache.org/repos/asf/karaf/blob/eb3fb656/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 01a6c43..fc446f0 100644 --- a/pom.xml +++ b/pom.xml @@ -155,6 +155,7 @@ <equinox.version>3.8.2.v20130124-134944</equinox.version> <bndlib.version>2.2.0</bndlib.version> <equinox.region.version>1.1.0.v20120522-1841</equinox.region.version> + <equinox.coordinator.version>1.1.0.v20120522-1841</equinox.coordinator.version> <felix.bundlerepository.version>1.6.6</felix.bundlerepository.version> <felix.configadmin.version>1.8.0</felix.configadmin.version> <felix.fileinstall.version>3.2.8</felix.fileinstall.version> @@ -200,6 +201,7 @@ <aries.jndi.api.version>1.0.0</aries.jndi.api.version> <aries.proxy.version>1.0.2</aries.proxy.version> <aries.proxy.api.version>1.0.0</aries.proxy.api.version> + <aries.subsystem.version>1.0.0</aries.subsystem.version> <aries.transaction.version>1.0.1</aries.transaction.version> <aries.transaction.manager.version>1.1.0</aries.transaction.manager.version> <aries.transaction.blueprint.version>1.0.1</aries.transaction.blueprint.version> @@ -1128,6 +1130,12 @@ <artifactId>org.eclipse.equinox.region</artifactId> <version>${equinox.region.version}</version> </dependency> + <dependency> + <groupId>org.eclipse.equinox</groupId> + <artifactId>org.eclipse.equinox.coordinator</artifactId> + <version>${equinox.coordinator.version}</version> + <scope>provided</scope> + </dependency> <dependency> <groupId>org.eclipse.gemini</groupId> @@ -1661,6 +1669,12 @@ </dependency> <dependency> + <groupId>org.apache.aries.subsystem</groupId> + <artifactId>org.apache.aries.subsystem</artifactId> + <version>${aries.subsystem.version}</version> + </dependency> + + <dependency> <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.gogo.runtime</artifactId> <version>${felix.gogo.version}</version> http://git-wip-us.apache.org/repos/asf/karaf/blob/eb3fb656/services/coordinator/pom.xml ---------------------------------------------------------------------- diff --git a/services/coordinator/pom.xml b/services/coordinator/pom.xml new file mode 100644 index 0000000..413587e --- /dev/null +++ b/services/coordinator/pom.xml @@ -0,0 +1,95 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + + <!-- + + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <artifactId>karaf</artifactId> + <groupId>org.apache.karaf</groupId> + <version>4.0.0-SNAPSHOT</version> + <relativePath>../../pom.xml</relativePath> + </parent> + + <groupId>org.apache.karaf.services</groupId> + <artifactId>org.apache.karaf.services.coordinator</artifactId> + <packaging>bundle</packaging> + <name>Apache Karaf :: OSGi Services :: Coordinator</name> + <description>Coordinator Service</description> + + <build> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <configuration> + <instructions> + <Bundle-SymbolicName> + ${project.artifactId} + </Bundle-SymbolicName> + <Bundle-Activator> + org.eclipse.equinox.coordinator.Activator + </Bundle-Activator> + <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor> + <Import-Package> + org.osgi.framework;version="[1.6,2.0)", + org.osgi.service.component;version="[1.1,2.0)";resolution:=optional, + org.osgi.service.coordinator;version="[1.0,1.1)", + org.osgi.service.log;version="[1.3,2.0)", + org.osgi.util.tracker;version="[1.5,2.0)" + </Import-Package> + <Export-Package> + org.osgi.service.coordinator;version="1.0.0" + </Export-Package> + <Private-Package> + org.eclipse.equinox.coordinator + </Private-Package> + <Export-Service> + org.osgi.service.coordinator.Coordinator + </Export-Service> + <Embed-Dependency> + org.eclipse.osgi;inline="org/eclipse/osgi/util/NLS*.class" + </Embed-Dependency> + </instructions> + </configuration> + </plugin> + </plugins> + </build> + + <dependencies> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.core</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.eclipse.equinox</groupId> + <artifactId>org.eclipse.equinox.coordinator</artifactId> + <version>1.1.0.v20120522-1841</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.eclipse</groupId> + <artifactId>org.eclipse.osgi</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> + +</project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/karaf/blob/eb3fb656/services/eventadmin/pom.xml ---------------------------------------------------------------------- diff --git a/services/eventadmin/pom.xml b/services/eventadmin/pom.xml index e02eabc..acea131 100644 --- a/services/eventadmin/pom.xml +++ b/services/eventadmin/pom.xml @@ -42,7 +42,7 @@ <configuration> <instructions> <Bundle-SymbolicName> - ${pom.artifactId} + ${project.artifactId} </Bundle-SymbolicName> <Bundle-Activator> org.apache.felix.eventadmin.impl.Activator http://git-wip-us.apache.org/repos/asf/karaf/blob/eb3fb656/services/pom.xml ---------------------------------------------------------------------- diff --git a/services/pom.xml b/services/pom.xml index 33eb89f..ddcb15a 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -34,6 +34,7 @@ <name>Apache Karaf :: OSGi Services</name> <modules> + <module>coordinator</module> <module>eventadmin</module> </modules>