From 8df43991a6effe3a44e91509aeb4babe10681eec Mon Sep 17 00:00:00 2001
From: Keith Hughes <foo@bar.com>
Date: Sun, 11 Dec 2016 18:45:24 -0700
Subject: [PATCH] Make Moquette into OSGi bundles. Add integration test to
 confirm that Moquette has become a bundle.

---
 broker/pom.xml                                |  23 +++
 netty_parser/pom.xml                          |  22 +++
 osgi_test/pom.xml                             | 167 ++++++++++++++++++
 .../moquette/test/osgi/MoquetteOsgiTest.java  |  69 ++++++++
 pom.xml                                       |   1 +
 5 files changed, 282 insertions(+)
 create mode 100644 osgi_test/pom.xml
 create mode 100644 osgi_test/src/test/java/io/moquette/test/osgi/MoquetteOsgiTest.java

diff --git a/broker/pom.xml b/broker/pom.xml
index d675c1c0..b78af667 100644
--- a/broker/pom.xml
+++ b/broker/pom.xml
@@ -162,6 +162,29 @@
                     </includes>
                 </configuration>
             </plugin>
+
+	    <!-- Includes to generate OSGi headers -->
+  	    <plugin>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>  
+                        <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+                    </archive> 
+                </configuration>
+            </plugin>  
+            <plugin>   
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>bundle-manifest</id>
+                        <phase>process-classes</phase>
+                        <goals>    
+                            <goal>manifest</goal>
+                        </goals>   
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 
diff --git a/netty_parser/pom.xml b/netty_parser/pom.xml
index 58e3cd20..fe2e7036 100644
--- a/netty_parser/pom.xml
+++ b/netty_parser/pom.xml
@@ -79,6 +79,28 @@
                 </configuration>
             </plugin>
 
+	    <!-- Includes to generate OSGi headers -->
+            <plugin>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>  
+                        <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+                    </archive> 
+                </configuration>
+            </plugin>  
+            <plugin>   
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>bundle-manifest</id>
+                        <phase>process-classes</phase>
+                        <goals>    
+                            <goal>manifest</goal>
+                        </goals>   
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
     
diff --git a/osgi_test/pom.xml b/osgi_test/pom.xml
new file mode 100644
index 00000000..d71213b7
--- /dev/null
+++ b/osgi_test/pom.xml
@@ -0,0 +1,167 @@
+<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">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <relativePath>../</relativePath>
+        <artifactId>moquette-parent</artifactId>
+        <groupId>io.moquette</groupId>
+        <version>0.9-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>moquette-osgi-test</artifactId>
+    <packaging>jar</packaging>
+    <name>Moquette - OSGi test</name>
+
+    <properties>
+        <pax.exam.version>4.6.0</pax.exam.version>
+        <url.version>1.4.0</url.version>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.moquette</groupId>
+            <artifactId>moquette-broker</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.ops4j.pax.exam</groupId>
+            <artifactId>pax-exam-container-native</artifactId>
+            <version>${pax.exam.version}</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.ops4j.pax.exam</groupId>
+            <artifactId>pax-exam-junit4</artifactId>
+            <version>${pax.exam.version}</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.ops4j.pax.exam</groupId>
+            <artifactId>pax-exam-link-mvn</artifactId>
+            <version>${pax.exam.version}</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.ops4j.pax.url</groupId>
+            <artifactId>pax-url-aether</artifactId>
+            <version>${url.version}</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.apache.felix.framework</artifactId>
+            <version>5.0.0</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-core</artifactId>
+            <version>0.9.20</version>
+            <scope>test</scope>
+        </dependency>
+
+       <dependency>
+           <groupId>javax.inject</groupId>
+           <artifactId>javax.inject</artifactId>
+           <version>1</version>
+           <scope>test</scope>
+       </dependency>
+              
+       <dependency>
+           <groupId>ch.qos.logback</groupId>
+           <artifactId>logback-classic</artifactId>
+           <version>0.9.20</version>
+           <scope>test</scope>
+       </dependency>
+
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <version>1.7</version>
+                <executions>
+                    <execution>
+                        <id>compile</id>
+                        <phase>compile</phase>
+                        <configuration>
+                            <target>
+                                <property name="compile_classpath" refid="maven.compile.classpath"/>
+                                <property name="runtime_classpath" refid="maven.runtime.classpath"/>
+                                <property name="test_classpath" refid="maven.test.classpath"/>
+                                <property name="plugin_classpath" refid="maven.plugin.classpath"/>
+
+                                <echo message="compile classpath: ${compile_classpath}"/>
+                                <echo message="runtime classpath: ${runtime_classpath}"/>
+                                <echo message="test classpath:    ${test_classpath}"/>
+                                <echo message="plugin classpath:  ${plugin_classpath}"/>
+                            </target>
+                        </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.ops4j.pax.exam</groupId>
+                <artifactId>exam-maven-plugin</artifactId>
+                <version>${pax.exam.version}</version>
+                <configuration>
+                    <configClass>io.moquette.test.osgi.MoquetteOsgiTest</configClass>
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>start-container</goal>
+                            <goal>stop-container</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.servicemix.tooling</groupId>
+                <artifactId>depends-maven-plugin</artifactId>
+                <version>1.2</version>
+                <executions>
+                    <execution>
+                        <id>generate-depends-file</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>generate-depends-file</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-failsafe-plugin</artifactId>
+                <version>2.12</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>integration-test</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <forkMode>always</forkMode>
+                    <parallel>none</parallel>
+                    <threadCount>1</threadCount>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/osgi_test/src/test/java/io/moquette/test/osgi/MoquetteOsgiTest.java b/osgi_test/src/test/java/io/moquette/test/osgi/MoquetteOsgiTest.java
new file mode 100644
index 00000000..5616e8b1
--- /dev/null
+++ b/osgi_test/src/test/java/io/moquette/test/osgi/MoquetteOsgiTest.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright (c) 2016 The original author or authors
+ * ------------------------------------------------------
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Apache License v2.0 which accompanies this distribution.
+ *
+ * The Eclipse Public License is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * The Apache License v2.0 is available at
+ * http://www.opensource.org/licenses/apache2.0.php
+ *
+ * You may elect to redistribute this code under either of these licenses.
+ */
+
+package io.moquette.test.osgi;
+
+import static org.junit.Assert.*;
+import static org.ops4j.pax.exam.CoreOptions.*;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.Option;
+import org.ops4j.pax.exam.junit.PaxExam;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceReference;
+
+import javax.inject.Inject;
+
+/**
+ * Run a set of unit tests inside of an OSGi container to make sure
+ * Moquette works in the OSGi container,
+ */
+@RunWith(PaxExam.class)
+public class MoquetteOsgiTest {
+    @Inject
+    private BundleContext bundleContext;
+ 
+    @Configuration
+    public Option[] config() {
+
+        return options(
+            junitBundles(),
+            mavenBundle("io.moquette", "moquette-broker")
+        );
+    }
+
+    /**
+     * Look for a bundle with moquette in the name.
+     *
+     * <p>
+     * If the OSGi headers are not in the moquette jar, this will fail.
+     */
+    @Test
+    public void testCanFindOsgiBundle() throws Exception {
+        for (Bundle b : bundleContext.getBundles()) {
+	System.out.format("%s %d\n", b.getSymbolicName(), b.getState());
+            if (b.getSymbolicName().indexOf("moquette") != -1) {
+                return;
+            }
+        }
+
+        // If found no bundles with moquette in the name, fail the test.
+	fail();
+    }
+}
diff --git a/pom.xml b/pom.xml
index e38c6817..ec8a1550 100644
--- a/pom.xml
+++ b/pom.xml
@@ -74,6 +74,7 @@
         <module>broker</module>
         <module>distribution</module>
         <module>embedding_moquette</module>
+        <module>osgi_test</module>
     </modules>
 
     <reporting>