From 7d041680e3fbb70cbc3b66129fe82723d6af0738 Mon Sep 17 00:00:00 2001
From: Anton Ramashkan <aramashkan@citc.ru>
Date: Wed, 27 Jun 2018 13:50:40 +0300
Subject: [PATCH] added activemq-client-osgi

---
 .../descriptors/uber-sources.xml              |  46 ++++
 activemq-client-osgi/pom.xml                  | 212 ++++++++++++++++++
 .../activemq/karaf/itest/ObrFeatureTest.java  |  10 +-
 activemq-karaf/pom.xml                        |  12 +
 .../src/main/resources/features-core.xml      |  38 ++--
 .../src/main/resources/features.xml           |   2 +-
 pom.xml                                       |   1 +
 7 files changed, 297 insertions(+), 24 deletions(-)
 create mode 100644 activemq-client-osgi/descriptors/uber-sources.xml
 create mode 100644 activemq-client-osgi/pom.xml

diff --git a/activemq-client-osgi/descriptors/uber-sources.xml b/activemq-client-osgi/descriptors/uber-sources.xml
new file mode 100644
index 00000000000..dff38c4ccb4
--- /dev/null
+++ b/activemq-client-osgi/descriptors/uber-sources.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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.
+-->
+<assembly>
+  <id>sources</id>
+  <formats>
+    <format>jar</format>
+  </formats>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  
+  <fileSets>
+    <fileSet>
+      <directory>src/main/java</directory>
+      <outputDirectory>/</outputDirectory>
+      <lineEnding>unix</lineEnding>
+    </fileSet>
+  </fileSets>
+
+  <dependencySets>
+    <dependencySet>
+      <outputDirectory>/</outputDirectory>
+      <unpack>true</unpack>
+      <useTransitiveDependencies>true</useTransitiveDependencies>
+      <includes>
+        <include>*:*:jar:sources</include>
+      </includes>
+      <excludes>
+        <!-- <exclude>org.apache.activemq:apollo-web:pom</exclude> -->
+      </excludes>
+    </dependencySet>
+  </dependencySets>
+</assembly>
diff --git a/activemq-client-osgi/pom.xml b/activemq-client-osgi/pom.xml
new file mode 100644
index 00000000000..878e391f009
--- /dev/null
+++ b/activemq-client-osgi/pom.xml
@@ -0,0 +1,212 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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.
+-->
+<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/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.activemq</groupId>
+        <artifactId>activemq-parent</artifactId>
+        <version>5.16.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>activemq-client-osgi</artifactId>
+    <packaging>bundle</packaging>
+    <name>ActiveMQ :: Client OSGi bundle</name>
+    <description>Puts together an ActiveMQ Client OSGi bundle</description>
+
+    <properties>
+        <activemq.osgi.import.pkg>
+            javax.jmdns*;resolution:=optional,
+            javax.jms*;version="[1.1,3)",
+            javax.management*,
+            javax.transaction*,
+            javax.naming*,
+            org.apache.commons.net*;resolution:=optional,
+            *
+        </activemq.osgi.import.pkg>
+        <activemq.osgi.export>
+            org.apache.activemq*;version=${project.version};-noimport:=true;-split-package:=merge-first
+        </activemq.osgi.export>
+        <activemq.osgi.private.pkg>
+            org.fusesource.hawtbuf*
+        </activemq.osgi.private.pkg>
+        <activemq.osgi.dynamic.import/>
+        <surefire.argLine>-Xmx512M</surefire.argLine>
+    </properties>
+
+    <dependencies>
+        <!-- The client dependency -->
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>activemq-client</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.core</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.compendium</artifactId>
+            <version>${org.osgi.core-version}</version>
+            <scope>provided</scope>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+            </resource>
+            <resource>
+                <directory>target/extra-resources</directory>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Embed-Dependency>
+                            *;groupId=org.apache.activemq;inline=META-INF/services/*
+                        </Embed-Dependency>
+                        <Embed-Transitive>true</Embed-Transitive>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+        <pluginManagement>
+            <plugins>
+                <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+                <plugin>
+                    <groupId>org.eclipse.m2e</groupId>
+                    <artifactId>lifecycle-mapping</artifactId>
+                    <version>1.0.0</version>
+                    <configuration>
+                        <lifecycleMappingMetadata>
+                            <pluginExecutions>
+                                <pluginExecution>
+                                    <pluginExecutionFilter>
+                                        <groupId>
+                                            org.apache.maven.plugins
+                                        </groupId>
+                                        <artifactId>
+                                            maven-dependency-plugin
+                                        </artifactId>
+                                        <versionRange>[2.8,)</versionRange>
+                                        <goals>
+                                            <goal>unpack</goal>
+                                        </goals>
+                                    </pluginExecutionFilter>
+                                    <action>
+                                        <ignore />
+                                    </action>
+                                </pluginExecution>
+                            </pluginExecutions>
+                        </lifecycleMappingMetadata>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>deploy</id>
+            <build>
+                <defaultGoal>deploy</defaultGoal>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-source-plugin</artifactId>
+                        <version>${maven-source-plugin-version}</version>
+                        <configuration>
+                            <attach>false</attach>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <id>attach-sources</id>
+                                <goals>
+                                    <goal>jar</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
+        <profile>
+            <id>apache-release</id>
+
+            <dependencies>
+
+                <dependency>
+                    <groupId>${project.groupId}</groupId>
+                    <artifactId>activemq-client</artifactId>
+                    <version>${project.version}</version>
+                    <classifier>sources</classifier>
+                    <optional>true</optional>
+                </dependency>
+                <dependency>
+                    <groupId>org.fusesource.hawtbuf</groupId>
+                    <artifactId>hawtbuf</artifactId>
+                    <version>${hawtbuf-version}</version>
+                    <classifier>sources</classifier>
+                    <optional>true</optional>
+                </dependency>
+            </dependencies>
+
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-source-plugin</artifactId>
+                        <configuration>
+                            <skipSource>true</skipSource>
+                        </configuration>
+                    </plugin>
+                    <plugin>
+                        <artifactId>maven-assembly-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>uber-sources-jar</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>single</goal>
+                                </goals>
+                                <configuration>
+                                    <descriptors>
+                                        <descriptor>${basedir}/src/main/descriptors/uber-sources.xml</descriptor>
+                                    </descriptors>
+                                    <appendAssemblyId>true</appendAssemblyId>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
+    </profiles>
+
+</project>
diff --git a/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ObrFeatureTest.java b/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ObrFeatureTest.java
index 2aa07591b7d..cdf18674a35 100644
--- a/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ObrFeatureTest.java
+++ b/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ObrFeatureTest.java
@@ -94,17 +94,11 @@ public void testClientWithSpring43() throws Throwable {
     private void testWithSpringVersion(String version) throws Exception, Throwable {
         featuresService.installFeature("spring", version);
         installAndAssertFeature("activemq-client");
-        verifyBundleInstalledAndRegisteredServices("activemq-osgi", 2);
+        verifyBundleInstalled("activemq-client-osgi");
     }
 
-    private void verifyBundleInstalledAndRegisteredServices(final String bundleName,
-                                                           final int numberOfServices)
-        throws Exception {
+    private void verifyBundleInstalled(final String bundleName) throws Exception {
         Bundle bundle = getBundle(bundleName);
         Assert.assertEquals(Bundle.ACTIVE, bundle.getState());
-        // Assert that the bundle has registered some services via blueprint
-        Assert.assertNotNull(bundle.getRegisteredServices());
-        // Assert that the bundle has registered the correct number of services
-        Assert.assertEquals(numberOfServices, bundle.getRegisteredServices().length);
     }
 }
diff --git a/activemq-karaf/pom.xml b/activemq-karaf/pom.xml
index 3859da9fa06..9db9374f6f2 100644
--- a/activemq-karaf/pom.xml
+++ b/activemq-karaf/pom.xml
@@ -134,6 +134,18 @@
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>build-helper-maven-plugin</artifactId>
         <executions>
+          <execution>
+            <id>generate-osgi-compatible-project-version</id>
+            <goals>
+              <goal>regex-property</goal>
+            </goals>
+            <configuration>
+              <name>osgi.project.version</name>
+              <value>${project.version}</value>
+              <regex>-</regex>
+              <replacement>.</replacement>
+            </configuration>
+          </execution>
           <execution>
             <id>attach-artifacts</id>
             <phase>package</phase>
diff --git a/activemq-karaf/src/main/resources/features-core.xml b/activemq-karaf/src/main/resources/features-core.xml
index 0e615abcddc..f344a04c00b 100644
--- a/activemq-karaf/src/main/resources/features-core.xml
+++ b/activemq-karaf/src/main/resources/features-core.xml
@@ -18,36 +18,44 @@
 
 -->
 
-<features name="activemq-core-${project.version}">
+<features name="activemq-core-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.3.0">
 
     <!-- Bundles needed if only client will be deployed in the container -->
-    <feature name="activemq-client" description="ActiveMQ client libraries" version="${project.version}" resolver="(obr)" start-level="50">
-        <feature version="[4,5)">spring</feature>
-        <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-annotation_1.0_spec/1.1.1</bundle>
+    <feature name="activemq-client" description="ActiveMQ client libraries" version="${project.version}" start-level="50">
         <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/1.1.1</bundle>
         <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/1.1.1</bundle>
         <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-j2ee-management_1.1_spec/1.0.1</bundle>
-        <bundle dependency="true">mvn:org.jvnet.jaxb2_commons/jaxb2-basics-runtime/${jaxb-basics-version}</bundle>
-        <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxb-impl/${jaxb-bundle-version}</bundle>
-        <bundle dependency="false">mvn:org.apache.commons/commons-pool2/${commons-pool2-version}</bundle>
-        <bundle dependency="false">mvn:commons-net/commons-net/${commons-net-version}</bundle>
-        <bundle dependency='true'>mvn:org.apache.zookeeper/zookeeper/${zookeeper-version}</bundle>
-        <!-- uber osgi bundle means client is not that lean, todo: introduce client osgi bundle -->
-        <bundle>mvn:org.apache.activemq/activemq-osgi/${project.version}</bundle>
+        <bundle dependency="true">mvn:commons-net/commons-net/${commons-net-version}</bundle>
+        <bundle dependency="true">mvn:org.apache.activemq/activemq-client-osgi/${project.version}</bundle>
+
+        <requirement>
+            osgi.wiring.package;filter:=&quot;(&amp;(osgi.wiring.package=org.apache.activemq)(version>=${osgi.project.version})(!(version>=6.0.0)))&quot;
+        </requirement>
     </feature>
-    
-    <feature name="activemq-cf" description="ActiveMQ ConnectionFactory from config" version="${project.version}" resolver="(obr)" start-level="50">
+
+    <feature name="activemq-cf" description="ActiveMQ ConnectionFactory from config" version="${project.version}" start-level="50">
         <feature>activemq-client</feature>
         <feature>scr</feature>
         <bundle>mvn:org.apache.activemq/activemq-cf/${project.version}</bundle>
     </feature>
 
     <!-- All bundles needed by the broker -->
-    <feature name="activemq" description="ActiveMQ broker libraries" version="${project.version}" resolver="(obr)" start-level="50">
+    <feature name="activemq" description="ActiveMQ broker libraries" version="${project.version}"  start-level="50">
       <feature>connector</feature>
       <feature>http</feature>
-      <feature version="${project.version}">activemq-client</feature>
+      <feature version="[4,5)">spring</feature>
+
+      <bundle>mvn:org.apache.activemq/activemq-osgi/${project.version}</bundle>
       <bundle>mvn:org.apache.activemq/activemq-karaf/${project.version}</bundle>
+      <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-annotation_1.0_spec/1.1.1</bundle>
+      <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/1.1.1</bundle>
+      <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/1.1.1</bundle>
+      <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-j2ee-management_1.1_spec/1.0.1</bundle>
+      <bundle dependency='true'>mvn:org.apache.zookeeper/zookeeper/${zookeeper-version}</bundle>
+      <bundle dependency="true">mvn:org.jvnet.jaxb2_commons/jaxb2-basics-runtime/${jaxb-basics-version}</bundle>
+      <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxb-impl/${jaxb-bundle-version}</bundle>
+      <bundle dependency="false">mvn:org.apache.commons/commons-pool2/${commons-pool2-version}</bundle>
+      <bundle dependency="false">mvn:commons-net/commons-net/${commons-net-version}</bundle>
       <bundle dependency="true">mvn:commons-collections/commons-collections/${commons-collections-version}</bundle>
       <bundle dependency='true'>mvn:commons-lang/commons-lang/${commons-lang-version}</bundle>
       <bundle dependency="true">mvn:commons-codec/commons-codec/1.9</bundle>
diff --git a/activemq-karaf/src/main/resources/features.xml b/activemq-karaf/src/main/resources/features.xml
index c989705dd89..478678c3d73 100644
--- a/activemq-karaf/src/main/resources/features.xml
+++ b/activemq-karaf/src/main/resources/features.xml
@@ -38,7 +38,7 @@
     </feature>
 
     <feature name="activemq-camel" version="${project.version}" resolver="(obr)" start-level="50">
-        <feature version="${project.version}">activemq-client</feature>
+        <feature version="${project.version}">activemq</feature>
         <bundle>mvn:org.apache.activemq/activemq-camel/${project.version}</bundle>
         <feature version="${camel-version-range}">camel-jms</feature>
         <feature version="${camel-version-range}">camel</feature>
diff --git a/pom.xml b/pom.xml
index 444c1427895..a2b1a80d0d3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -254,6 +254,7 @@
     <module>activemq-web</module>
     <module>activemq-partition</module>
     <module>activemq-osgi</module>
+    <module>activemq-client-osgi</module>
     <module>activemq-blueprint</module>
     <module>activemq-web-demo</module>
     <module>activemq-web-console</module>