From 39f048910a37c27b1b69a4ff3d7214dde78a09e3 Mon Sep 17 00:00:00 2001
From: "selva.andre" <selva.andre@gmail.com>
Date: Sun, 26 Jan 2014 12:09:37 +0100
Subject: [PATCH 1/5] Added basic definition of osgi descriptor to the broker

---
 .gitignore                                    |   3 +-
 bundle/pom.xml                                | 116 ++++++++++++++++++
 .../dna/mqtt/moquette/bundle/Activator.java   |  30 +++++
 pom.xml                                       |   1 +
 4 files changed, 149 insertions(+), 1 deletion(-)
 create mode 100644 bundle/pom.xml
 create mode 100644 bundle/src/main/java/org/dna/mqtt/moquette/bundle/Activator.java

diff --git a/.gitignore b/.gitignore
index 6f63cb31..b998519d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,4 +8,5 @@ client/target/
 /parser_commons/target/netty_parser/target/
 netty_parser/target/
 parser_commons/target/
-/distribution/target/
\ No newline at end of file
+/distribution/target/
+/bundle/target/
\ No newline at end of file
diff --git a/bundle/pom.xml b/bundle/pom.xml
new file mode 100644
index 00000000..58469191
--- /dev/null
+++ b/bundle/pom.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" 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>
+        <!--<relativePath>../pom.xml</relativePath>-->
+        <artifactId>moquette-parent</artifactId>
+        <groupId>org.dna.mqtt</groupId>
+        <version>0.5-SNAPSHOT</version>
+    </parent>
+    <artifactId>moquette-bundle</artifactId>
+
+    <packaging>bundle</packaging>
+
+    <!--<version>${moquette-version}</version>-->
+
+    <name>Moquette - bundle</name>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>1.7.5</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.osgi.core</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.osgi.compendium</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.dna.mqtt</groupId>
+            <artifactId>moquette-broker</artifactId>
+            <version>0.5-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.5</source>
+                    <target>1.5</target>
+                </configuration>
+            </plugin>
+            <!--            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <includes>
+                        <include>**/*Test.java</include>
+                    </includes>
+                </configuration>
+            </plugin>-->
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <version>2.1.0</version>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Export-Package>org.dna.mqtt.commons</Export-Package>
+                        <Private-Package>org.dna.mqtt.moquette.bundle,
+                            ${project.groupId}.*
+<!--                            com.lmax.*,
+                            io.netty.*,
+                            org.fusesource.*,
+                            org.slf4j.*,
+                            org.apache.log4j,
+                            org.apache.log4j.*-->
+                        </Private-Package>
+                        <!--<Import-Package>java.*,javax.*,org.osgi.*</Import-Package>-->
+                        <Import-Package>*</Import-Package>
+                        <DynamicImport-Package>*</DynamicImport-Package>
+<!--                        <DynamicImport-Package>com.barchart.udt, com.barchart.udt.nio, 
+                            com.google.protobuf, com.jcraft.jzlib, com.sun.nio.sctp, gnu.io, javassist, 
+                            org.apache.commons.logging, org.jboss.marshalling,
+                            sun.misc, com.ibm.uvm.tools, com.sun.jdmk.comm, org.w3c.dom, org.xml.sax, org.xml.sax.helpers,
+                            javax.jmdns, javax.jms, javax.mail, javax.mail.internet</DynamicImport-Package>-->
+                        <Bundle-Activator>${project.groupId}.moquette.bundle.Activator</Bundle-Activator>
+                    </instructions>
+                </configuration>
+            </plugin>
+            <plugin>
+                <!-- Pax Runner Maven plugin -->
+                <groupId>org.ops4j</groupId>
+                <artifactId>maven-pax-plugin</artifactId>
+                <version>1.4</version>
+                <configuration>
+                    <!-- Pax Runner version -->
+                    <runner>1.4.0</runner>
+                    <!-- OSGi framework type (equinox, felix, knopflerfish) -->
+                    <framework>equinox</framework>
+                    <provision>
+                        <!--                        <param> - -log=debug</param>  
+                        <param> - -workingDirectory=target/runner</param>  -->
+                    </provision>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
\ No newline at end of file
diff --git a/bundle/src/main/java/org/dna/mqtt/moquette/bundle/Activator.java b/bundle/src/main/java/org/dna/mqtt/moquette/bundle/Activator.java
new file mode 100644
index 00000000..b44f9b2b
--- /dev/null
+++ b/bundle/src/main/java/org/dna/mqtt/moquette/bundle/Activator.java
@@ -0,0 +1,30 @@
+package org.dna.mqtt.moquette.bundle;
+
+import org.dna.mqtt.moquette.server.Server;
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Start and stop a configured version of the MQTT broker server.
+ *
+ * @author Didier Donsez
+ * @todo add config admin for port (in NettyAcceptor)
+ */
+public class Activator implements BundleActivator {
+
+    private static final Logger LOG = LoggerFactory.getLogger(Server.class);
+    private Server server = null;
+
+    public void start(BundleContext bundleContext) throws Exception {
+        server = new Server();
+        server.startServer();
+        LOG.info("Moquette MQTT broker started, version 0.5-SNAPSHOT");
+    }
+
+    public void stop(BundleContext bundleContext) throws Exception {
+        server.stopServer();
+        LOG.info("Moquette MQTT broker stopped, version 0.5-SNAPSHOT");
+    }
+}
diff --git a/pom.xml b/pom.xml
index 44c5b19b..cd1a1d1c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,6 +20,7 @@
         <module>netty_parser</module>
         <module>broker</module>
         <module>distribution</module>
+        <module>bundle</module>
     </modules>
     
     <reporting>

From b027e49f33f72b3611ee43350a74946cd30100b9 Mon Sep 17 00:00:00 2001
From: "selva.andre" <selva.andre@gmail.com>
Date: Sun, 26 Jan 2014 13:03:34 +0100
Subject: [PATCH 2/5] Redefined the broker OSGi dependencies

---
 bundle/pom.xml | 83 +++++++++++++++++++++++++++++++++++---------------
 1 file changed, 59 insertions(+), 24 deletions(-)

diff --git a/bundle/pom.xml b/bundle/pom.xml
index 58469191..12459bd6 100644
--- a/bundle/pom.xml
+++ b/bundle/pom.xml
@@ -27,6 +27,13 @@
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
             <version>1.7.5</version>
+            <scope>provided</scope>
+        </dependency>
+          <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+            <version>1.7.5</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.felix</groupId>
@@ -44,6 +51,54 @@
             <version>0.5-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
+        <!-- Included to embedded an HawtDB dependency, we host commons-logging -->
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+            <version>1.1.3</version>
+        </dependency>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-common</artifactId>
+            <version>4.0.8.Final</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-buffer</artifactId>
+            <version>4.0.8.Final</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-transport</artifactId>
+            <version>4.0.8.Final</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-handler</artifactId>
+            <version>4.0.8.Final</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-codec</artifactId>
+            <version>4.0.8.Final</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.fusesource.hawtbuf</groupId>
+            <artifactId>hawtbuf</artifactId>
+            <version>1.9</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.fusesource.hawtdb</groupId>
+            <artifactId>hawtdb</artifactId>
+            <version>1.6</version>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 
     <build>
@@ -56,15 +111,7 @@
                     <target>1.5</target>
                 </configuration>
             </plugin>
-            <!--            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <includes>
-                        <include>**/*Test.java</include>
-                    </includes>
-                </configuration>
-            </plugin>-->
+
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
@@ -72,24 +119,12 @@
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
-                        <Export-Package>org.dna.mqtt.commons</Export-Package>
+                        <Export-Package>org.dna.mqtt.commons, org.apache.commons.logging</Export-Package>
                         <Private-Package>org.dna.mqtt.moquette.bundle,
-                            ${project.groupId}.*
-<!--                            com.lmax.*,
-                            io.netty.*,
-                            org.fusesource.*,
-                            org.slf4j.*,
-                            org.apache.log4j,
-                            org.apache.log4j.*-->
+                            ${project.groupId}.*,
+                            com.lmax.*
                         </Private-Package>
-                        <!--<Import-Package>java.*,javax.*,org.osgi.*</Import-Package>-->
                         <Import-Package>*</Import-Package>
-                        <DynamicImport-Package>*</DynamicImport-Package>
-<!--                        <DynamicImport-Package>com.barchart.udt, com.barchart.udt.nio, 
-                            com.google.protobuf, com.jcraft.jzlib, com.sun.nio.sctp, gnu.io, javassist, 
-                            org.apache.commons.logging, org.jboss.marshalling,
-                            sun.misc, com.ibm.uvm.tools, com.sun.jdmk.comm, org.w3c.dom, org.xml.sax, org.xml.sax.helpers,
-                            javax.jmdns, javax.jms, javax.mail, javax.mail.internet</DynamicImport-Package>-->
                         <Bundle-Activator>${project.groupId}.moquette.bundle.Activator</Bundle-Activator>
                     </instructions>
                 </configuration>

From ccbfe049885b6c84c801df4609bdeb037a4191bf Mon Sep 17 00:00:00 2001
From: andrea <andrea@samarcanda>
Date: Tue, 28 Jan 2014 23:04:07 +0100
Subject: [PATCH 3/5] Added the OSGi exporting of packages used by HawDB module
 (serialized classes of subscription and PublishEvent)

---
 bundle/pom.xml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/bundle/pom.xml b/bundle/pom.xml
index 12459bd6..d46988ef 100644
--- a/bundle/pom.xml
+++ b/bundle/pom.xml
@@ -119,7 +119,13 @@
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
-                        <Export-Package>org.dna.mqtt.commons, org.apache.commons.logging</Export-Package>
+                        <Export-Package>org.dna.mqtt.commons, 
+                            org.apache.commons.logging,
+                            org.dna.mqtt.moquette.messaging.spi.impl.storage,
+                            org.dna.mqtt.moquette.messaging.spi.impl.subscriptions,
+                            org.dna.mqtt.moquette.proto.messages,
+                            org.dna.mqtt.moquette.server.netty.metrics
+                        </Export-Package>
                         <Private-Package>org.dna.mqtt.moquette.bundle,
                             ${project.groupId}.*,
                             com.lmax.*

From c69ff170485e75b702d424267b7b5fddae1cdd2e Mon Sep 17 00:00:00 2001
From: "selva.andre" <selva.andre@gmail.com>
Date: Tue, 28 Jan 2014 23:24:19 +0100
Subject: [PATCH 4/5] Moved the bundle creation of the broker from outside
 bundle module to inside broker module

---
 broker/pom.xml                                | 114 ++++++++++++-
 .../dna/mqtt/moquette/bundle/Activator.java   |   0
 bundle/pom.xml                                | 157 ------------------
 pom.xml                                       |   1 -
 4 files changed, 109 insertions(+), 163 deletions(-)
 rename {bundle => broker}/src/main/java/org/dna/mqtt/moquette/bundle/Activator.java (100%)
 delete mode 100644 bundle/pom.xml

diff --git a/broker/pom.xml b/broker/pom.xml
index dd547ca0..836769ca 100644
--- a/broker/pom.xml
+++ b/broker/pom.xml
@@ -11,7 +11,7 @@
     </parent>
 
     <artifactId>moquette-broker</artifactId>
-    <packaging>jar</packaging>
+    <packaging>bundle</packaging>
     <!--<version>${moquette-version}</version>-->
     <name>Moquette - broker</name>
 
@@ -41,20 +41,84 @@
         
         <dependency>
             <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
+            <artifactId>slf4j-api</artifactId>
             <version>1.7.5</version>
+            <scope>provided</scope>
         </dependency>
         
         <dependency>
-            <groupId>org.fusesource.hawtdb</groupId>
-            <artifactId>hawtdb</artifactId>
-            <version>1.6</version>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+            <version>1.7.5</version>
+            <scope>provided</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.osgi.core</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.osgi.compendium</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+        
+        <!-- Included to embedded an HawtDB dependency, we host commons-logging -->
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+            <version>1.1.3</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-common</artifactId>
+            <version>4.0.8.Final</version>
+            <scope>provided</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-buffer</artifactId>
+            <version>4.0.8.Final</version>
+            <scope>provided</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-transport</artifactId>
+            <version>4.0.8.Final</version>
+            <scope>provided</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-handler</artifactId>
+            <version>4.0.8.Final</version>
+            <scope>provided</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-codec</artifactId>
+            <version>4.0.8.Final</version>
+            <scope>provided</scope>
         </dependency>
         
         <dependency>
             <groupId>org.fusesource.hawtbuf</groupId>
             <artifactId>hawtbuf</artifactId>
             <version>1.9</version>
+            <scope>provided</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.fusesource.hawtdb</groupId>
+            <artifactId>hawtdb</artifactId>
+            <version>1.6</version>
+            <scope>provided</scope>
         </dependency>
                 
         <dependency>
@@ -107,6 +171,46 @@
                     </includes>
                 </configuration>
             </plugin>
+            
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <version>2.1.0</version>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Export-Package>org.dna.mqtt.commons, 
+                            org.apache.commons.logging,
+                            org.dna.mqtt.moquette.messaging.spi.impl.storage,
+                            org.dna.mqtt.moquette.messaging.spi.impl.subscriptions,
+                            org.dna.mqtt.moquette.proto.messages,
+                            org.dna.mqtt.moquette.server.netty.metrics
+                        </Export-Package>
+                        <Private-Package>org.dna.mqtt.moquette.bundle,
+                            ${project.groupId}.*,
+                            com.lmax.*
+                        </Private-Package>
+                        <Import-Package>*</Import-Package>
+                        <Bundle-Activator>${project.groupId}.moquette.bundle.Activator</Bundle-Activator>
+                    </instructions>
+                </configuration>
+            </plugin>
+            <plugin>
+                <!-- Pax Runner Maven plugin -->
+                <groupId>org.ops4j</groupId>
+                <artifactId>maven-pax-plugin</artifactId>
+                <version>1.4</version>
+                <configuration>
+                    <!-- Pax Runner version -->
+                    <runner>1.4.0</runner>
+                    <!-- OSGi framework type (equinox, felix, knopflerfish) -->
+                    <framework>equinox</framework>
+                    <provision>
+                        <!--                        <param> - -log=debug</param>  
+                        <param> - -workingDirectory=target/runner</param>  -->
+                    </provision>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
     
diff --git a/bundle/src/main/java/org/dna/mqtt/moquette/bundle/Activator.java b/broker/src/main/java/org/dna/mqtt/moquette/bundle/Activator.java
similarity index 100%
rename from bundle/src/main/java/org/dna/mqtt/moquette/bundle/Activator.java
rename to broker/src/main/java/org/dna/mqtt/moquette/bundle/Activator.java
diff --git a/bundle/pom.xml b/bundle/pom.xml
deleted file mode 100644
index d46988ef..00000000
--- a/bundle/pom.xml
+++ /dev/null
@@ -1,157 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" 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>
-        <!--<relativePath>../pom.xml</relativePath>-->
-        <artifactId>moquette-parent</artifactId>
-        <groupId>org.dna.mqtt</groupId>
-        <version>0.5-SNAPSHOT</version>
-    </parent>
-    <artifactId>moquette-bundle</artifactId>
-
-    <packaging>bundle</packaging>
-
-    <!--<version>${moquette-version}</version>-->
-
-    <name>Moquette - bundle</name>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-            <version>1.7.5</version>
-            <scope>provided</scope>
-        </dependency>
-          <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
-            <version>1.7.5</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.osgi.core</artifactId>
-            <version>1.0.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.osgi.compendium</artifactId>
-            <version>1.0.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.dna.mqtt</groupId>
-            <artifactId>moquette-broker</artifactId>
-            <version>0.5-SNAPSHOT</version>
-            <scope>provided</scope>
-        </dependency>
-        <!-- Included to embedded an HawtDB dependency, we host commons-logging -->
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-            <version>1.1.3</version>
-        </dependency>
-        <dependency>
-            <groupId>io.netty</groupId>
-            <artifactId>netty-common</artifactId>
-            <version>4.0.8.Final</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>io.netty</groupId>
-            <artifactId>netty-buffer</artifactId>
-            <version>4.0.8.Final</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>io.netty</groupId>
-            <artifactId>netty-transport</artifactId>
-            <version>4.0.8.Final</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>io.netty</groupId>
-            <artifactId>netty-handler</artifactId>
-            <version>4.0.8.Final</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>io.netty</groupId>
-            <artifactId>netty-codec</artifactId>
-            <version>4.0.8.Final</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.fusesource.hawtbuf</groupId>
-            <artifactId>hawtbuf</artifactId>
-            <version>1.9</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.fusesource.hawtdb</groupId>
-            <artifactId>hawtdb</artifactId>
-            <version>1.6</version>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.5</source>
-                    <target>1.5</target>
-                </configuration>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <version>2.1.0</version>
-                <extensions>true</extensions>
-                <configuration>
-                    <instructions>
-                        <Export-Package>org.dna.mqtt.commons, 
-                            org.apache.commons.logging,
-                            org.dna.mqtt.moquette.messaging.spi.impl.storage,
-                            org.dna.mqtt.moquette.messaging.spi.impl.subscriptions,
-                            org.dna.mqtt.moquette.proto.messages,
-                            org.dna.mqtt.moquette.server.netty.metrics
-                        </Export-Package>
-                        <Private-Package>org.dna.mqtt.moquette.bundle,
-                            ${project.groupId}.*,
-                            com.lmax.*
-                        </Private-Package>
-                        <Import-Package>*</Import-Package>
-                        <Bundle-Activator>${project.groupId}.moquette.bundle.Activator</Bundle-Activator>
-                    </instructions>
-                </configuration>
-            </plugin>
-            <plugin>
-                <!-- Pax Runner Maven plugin -->
-                <groupId>org.ops4j</groupId>
-                <artifactId>maven-pax-plugin</artifactId>
-                <version>1.4</version>
-                <configuration>
-                    <!-- Pax Runner version -->
-                    <runner>1.4.0</runner>
-                    <!-- OSGi framework type (equinox, felix, knopflerfish) -->
-                    <framework>equinox</framework>
-                    <provision>
-                        <!--                        <param> - -log=debug</param>  
-                        <param> - -workingDirectory=target/runner</param>  -->
-                    </provision>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index cd1a1d1c..44c5b19b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,6 @@
         <module>netty_parser</module>
         <module>broker</module>
         <module>distribution</module>
-        <module>bundle</module>
     </modules>
     
     <reporting>

From adf41722f55281e12dee5dd8bb353c7239296d62 Mon Sep 17 00:00:00 2001
From: "selva.andre" <selva.andre@gmail.com>
Date: Tue, 28 Jan 2014 23:31:21 +0100
Subject: [PATCH 5/5] Updated ChangeLog

---
 .gitignore    | 8 +++++---
 ChangeLog.txt | 4 +++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index b998519d..69b3cb48 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,8 +5,10 @@
 *.iml
 broker/target/
 client/target/
-/parser_commons/target/netty_parser/target/
+parser_commons/target/
+netty_parser/target/
 netty_parser/target/
 parser_commons/target/
-/distribution/target/
-/bundle/target/
\ No newline at end of file
+distribution/target/
+broker/moquette.log
+broker/runner
diff --git a/ChangeLog.txt b/ChangeLog.txt
index 9ac9441b..83f21709 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,7 +1,9 @@
 Version 0.5:
     Fix issue 20 (no flush of message on PINGREQ)
     Fix issue 21 (bad channel timeout handler)
-
+    Created a self contained distribution package (issue 22)
+    Fix issue 28, OSGi-fied the broker
+    
 Version 0.4:
     Dropped support for MINA
     Fix Issue 15 (bad re-activation of client's subscriptions after a recconection)