Changed package from org.dna.mqtt to orga.eclipse.moquette

broker/pom.xml

@@ -6,7 +6,7 @@
         <relativePath>../</relativePath>
         <!--<relativePath>../pom.xml</relativePath>-->
         <artifactId>moquette-parent</artifactId>
-        <groupId>org.dna.mqtt</groupId>
+        <groupId>org.eclipse.moquette</groupId>
         <version>0.7-SNAPSHOT</version>
     </parent>
 
@@ -21,13 +21,13 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.dna.mqtt</groupId>
+            <groupId>${project.groupId}</groupId>
             <artifactId>moquette-parser-commons</artifactId>
             <version>${project.version}</version>
         </dependency>
         
         <dependency>
-            <groupId>org.dna.mqtt</groupId>
+            <groupId>${project.groupId}</groupId>
             <artifactId>moquette-netty-parser</artifactId>
             <version>${project.version}</version>
         </dependency>
@@ -214,11 +214,11 @@
         </plugins>
     </build>
     
-    <repositories>
+    <!--repositories>
         <repository>
             <id>Paho Releases</id>
             <url>https://repo.eclipse.org/content/repositories/paho-releases/</url>
         </repository>
 
-    </repositories>
+    </repositories-->
 </project>

broker/src/main/java/org/eclipse/moquette/server/ConfigurationParser.java

@@ -13,7 +13,7 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.dna.mqtt.moquette.server;
+package org.eclipse.moquette.server;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -23,7 +23,7 @@ import java.io.IOException;
 import java.io.Reader;
 import java.text.ParseException;
 import java.util.Properties;
-import org.dna.mqtt.commons.Constants;
+import org.eclipse.moquette.commons.Constants;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

broker/src/main/java/org/eclipse/moquette/server/ConnectionDescriptor.java

@@ -13,7 +13,7 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.dna.mqtt.moquette.server;
+package org.eclipse.moquette.server;
 
 /**
  * Maintains the information of single connection, like ClientID, IoSession,

broker/src/main/java/org/eclipse/moquette/server/Constants.java

@@ -13,7 +13,7 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.dna.mqtt.moquette.server;
+package org.eclipse.moquette.server;
 
 /**
  * Server constants keeper

broker/src/main/java/org/eclipse/moquette/server/IAuthenticator.java

@@ -13,7 +13,7 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.dna.mqtt.moquette.server;
+package org.eclipse.moquette.server;
 
 /**
  * username and password checker

broker/src/main/java/org/eclipse/moquette/server/Server.java

@@ -13,14 +13,14 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.dna.mqtt.moquette.server;
+package org.eclipse.moquette.server;
 
 import java.io.File;
 import java.io.IOException;
 import java.text.ParseException;
 import java.util.Properties;
-import org.dna.mqtt.moquette.messaging.spi.impl.SimpleMessaging;
-import org.dna.mqtt.moquette.server.netty.NettyAcceptor;
+import org.eclipse.moquette.spi.impl.SimpleMessaging;
+import org.eclipse.moquette.server.netty.NettyAcceptor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 /**

broker/src/main/java/org/eclipse/moquette/server/ServerAcceptor.java

@@ -13,11 +13,11 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.dna.mqtt.moquette.server;
+package org.eclipse.moquette.server;
 
 import java.io.IOException;
 import java.util.Properties;
-import org.dna.mqtt.moquette.messaging.spi.IMessaging;
+import org.eclipse.moquette.spi.IMessaging;
 
 /**
  *

broker/src/main/java/org/eclipse/moquette/server/ServerChannel.java

@@ -13,7 +13,7 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.dna.mqtt.moquette.server;
+package org.eclipse.moquette.server;
 
 /**
  *

broker/src/main/java/org/eclipse/moquette/server/netty/MoquetteIdleTimoutHandler.java

@@ -13,7 +13,7 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.dna.mqtt.moquette.server.netty;
+package org.eclipse.moquette.server.netty;
 
 import io.netty.channel.ChannelDuplexHandler;
 import io.netty.channel.ChannelHandlerContext;

broker/src/main/java/org/eclipse/moquette/server/netty/NettyAcceptor.java

@@ -13,7 +13,7 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.dna.mqtt.moquette.server.netty;
+package org.eclipse.moquette.server.netty;
 
 import io.netty.bootstrap.ServerBootstrap;
 import io.netty.buffer.ByteBuf;
@@ -45,12 +45,12 @@ import java.util.Properties;
 import javax.net.ssl.KeyManagerFactory;
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLEngine;
-import org.dna.mqtt.commons.Constants;
-import org.dna.mqtt.moquette.messaging.spi.IMessaging;
-import org.dna.mqtt.moquette.parser.netty.MQTTDecoder;
-import org.dna.mqtt.moquette.parser.netty.MQTTEncoder;
-import org.dna.mqtt.moquette.server.ServerAcceptor;
-import org.dna.mqtt.moquette.server.netty.metrics.*;
+import org.eclipse.moquette.commons.Constants;
+import org.eclipse.moquette.spi.IMessaging;
+import org.eclipse.moquette.parser.netty.MQTTDecoder;
+import org.eclipse.moquette.parser.netty.MQTTEncoder;
+import org.eclipse.moquette.server.ServerAcceptor;
+import org.eclipse.moquette.server.netty.metrics.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

broker/src/main/java/org/eclipse/moquette/server/netty/NettyChannel.java

@@ -13,7 +13,7 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.dna.mqtt.moquette.server.netty;
+package org.eclipse.moquette.server.netty;
 
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.timeout.IdleStateHandler;
@@ -21,8 +21,8 @@ import io.netty.util.Attribute;
 import io.netty.util.AttributeKey;
 import java.util.HashMap;
 import java.util.Map;
-import org.dna.mqtt.moquette.server.Constants;
-import org.dna.mqtt.moquette.server.ServerChannel;
+import org.eclipse.moquette.server.Constants;
+import org.eclipse.moquette.server.ServerChannel;
 
 /**
  *

broker/src/main/java/org/eclipse/moquette/server/netty/NettyMQTTHandler.java

@@ -13,19 +13,19 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.dna.mqtt.moquette.server.netty;
+package org.eclipse.moquette.server.netty;
 
 import io.netty.channel.ChannelHandler.Sharable;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelInboundHandlerAdapter;
 import java.util.HashMap;
 import java.util.Map;
-import org.dna.mqtt.moquette.messaging.spi.IMessaging;
-import org.dna.mqtt.proto.Utils;
-import org.dna.mqtt.proto.messages.AbstractMessage;
-import static org.dna.mqtt.proto.messages.AbstractMessage.*;
-import org.dna.mqtt.proto.messages.PingRespMessage;
-import org.dna.mqtt.moquette.server.Constants;
+import org.eclipse.moquette.spi.IMessaging;
+import org.eclipse.moquette.proto.Utils;
+import org.eclipse.moquette.proto.messages.AbstractMessage;
+import static org.eclipse.moquette.proto.messages.AbstractMessage.*;
+import org.eclipse.moquette.proto.messages.PingRespMessage;
+import org.eclipse.moquette.server.Constants;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

broker/src/main/java/org/eclipse/moquette/server/netty/metrics/BytesMetrics.java

@@ -13,7 +13,7 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.dna.mqtt.moquette.server.netty.metrics;
+package org.eclipse.moquette.server.netty.metrics;
 
 public class BytesMetrics {
     private long m_readBytes = 0;

broker/src/main/java/org/eclipse/moquette/server/netty/metrics/BytesMetricsCollector.java

@@ -13,7 +13,7 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.dna.mqtt.moquette.server.netty.metrics;
+package org.eclipse.moquette.server.netty.metrics;
 
 import java.util.Queue;
 import java.util.concurrent.ConcurrentLinkedQueue;

broker/src/main/java/org/eclipse/moquette/server/netty/metrics/BytesMetricsHandler.java

@@ -13,7 +13,7 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.dna.mqtt.moquette.server.netty.metrics;
+package org.eclipse.moquette.server.netty.metrics;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelDuplexHandler;

broker/src/main/java/org/eclipse/moquette/server/netty/metrics/MessageMetrics.java

@@ -13,7 +13,7 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.dna.mqtt.moquette.server.netty.metrics;
+package org.eclipse.moquette.server.netty.metrics;
 
 public class MessageMetrics {
     private long m_messagesRead = 0;

broker/src/main/java/org/eclipse/moquette/server/netty/metrics/MessageMetricsCollector.java

@@ -13,7 +13,7 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.dna.mqtt.moquette.server.netty.metrics;
+package org.eclipse.moquette.server.netty.metrics;
 
 import java.util.Queue;
 import java.util.concurrent.ConcurrentLinkedQueue;

broker/src/main/java/org/eclipse/moquette/server/netty/metrics/MessageMetricsHandler.java

@@ -13,7 +13,7 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.dna.mqtt.moquette.server.netty.metrics;
+package org.eclipse.moquette.server.netty.metrics;
 
 import io.netty.channel.ChannelDuplexHandler;
 import io.netty.channel.ChannelHandlerContext;

broker/src/main/java/org/eclipse/moquette/spi/IMatchingCondition.java

@@ -13,7 +13,7 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.dna.mqtt.moquette.messaging.spi;
+package org.eclipse.moquette.spi;
 
 /**
  */

broker/src/main/java/org/eclipse/moquette/spi/IMessagesStore.java

@@ -13,12 +13,12 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.dna.mqtt.moquette.messaging.spi;
+package org.eclipse.moquette.spi;
 
 import java.io.Serializable;
 import java.nio.ByteBuffer;
-import org.dna.mqtt.moquette.messaging.spi.impl.events.PublishEvent;
-import org.dna.mqtt.proto.messages.AbstractMessage;
+import org.eclipse.moquette.spi.impl.events.PublishEvent;
+import org.eclipse.moquette.proto.messages.AbstractMessage;
 
 import java.util.Collection;
 import java.util.List;

broker/src/main/java/org/eclipse/moquette/spi/IMessaging.java

@@ -13,10 +13,10 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.dna.mqtt.moquette.messaging.spi;
+package org.eclipse.moquette.spi;
 
-import org.dna.mqtt.proto.messages.AbstractMessage;
-import org.dna.mqtt.moquette.server.ServerChannel;
+import org.eclipse.moquette.proto.messages.AbstractMessage;
+import org.eclipse.moquette.server.ServerChannel;
 
 /**
  * Callback interface used to be notified of some events from the input event queue.

broker/src/main/java/org/eclipse/moquette/spi/ISessionsStore.java

@@ -13,12 +13,12 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.dna.mqtt.moquette.messaging.spi;
+package org.eclipse.moquette.spi;
 
 import java.util.List;
 import java.util.Set;
 
-import org.dna.mqtt.moquette.messaging.spi.impl.subscriptions.Subscription;
+import org.eclipse.moquette.spi.impl.subscriptions.Subscription;
 
 /**
  * Store used to handle the persistence of the subscriptions tree.

broker/src/main/java/org/eclipse/moquette/spi/impl/AcceptAllAuthenticator.java

@@ -1,6 +1,6 @@
-package org.dna.mqtt.moquette.messaging.spi.impl;
+package org.eclipse.moquette.spi.impl;
 
-import org.dna.mqtt.moquette.server.IAuthenticator;
+import org.eclipse.moquette.server.IAuthenticator;
 
 /**
  * Created by andrea on 8/23/14.

broker/src/main/java/org/eclipse/moquette/spi/impl/AnnotationSupport.java

@@ -13,13 +13,13 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.dna.mqtt.moquette.messaging.spi.impl;
+package org.eclipse.moquette.spi.impl;
 
 import java.lang.reflect.Method;
 import java.util.HashMap;
 import java.util.Map;
-import org.dna.mqtt.proto.messages.AbstractMessage;
-import org.dna.mqtt.moquette.server.ServerChannel;
+import org.eclipse.moquette.proto.messages.AbstractMessage;
+import org.eclipse.moquette.server.ServerChannel;
 
 /**
  * Annotation @MQTTMessage helper class.

broker/src/main/java/org/eclipse/moquette/spi/impl/DebugUtils.java

@@ -13,7 +13,7 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.dna.mqtt.moquette.messaging.spi.impl;
+package org.eclipse.moquette.spi.impl;
 
 import java.nio.ByteBuffer;
 

broker/src/main/java/org/eclipse/moquette/spi/impl/FileAuthenticator.java

@@ -13,7 +13,7 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.dna.mqtt.moquette.messaging.spi.impl;
+package org.eclipse.moquette.spi.impl;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -24,7 +24,7 @@ import java.io.Reader;
 import java.text.ParseException;
 import java.util.HashMap;
 import java.util.Map;
-import org.dna.mqtt.moquette.server.IAuthenticator;
+import org.eclipse.moquette.server.IAuthenticator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

broker/src/main/java/org/eclipse/moquette/spi/impl/MQTTMessage.java

@@ -13,7 +13,7 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.dna.mqtt.moquette.messaging.spi.impl;
+package org.eclipse.moquette.spi.impl;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;

broker/src/main/java/org/eclipse/moquette/spi/impl/MemoryStorageService.java

@@ -13,18 +13,18 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.dna.mqtt.moquette.messaging.spi.impl;
+package org.eclipse.moquette.spi.impl;
 
 import java.nio.ByteBuffer;
 import java.util.*;
 
-import org.dna.mqtt.moquette.messaging.spi.IMatchingCondition;
-import org.dna.mqtt.moquette.messaging.spi.IMessagesStore;
-import org.dna.mqtt.moquette.messaging.spi.impl.events.PublishEvent;
-import org.dna.mqtt.moquette.messaging.spi.impl.subscriptions.Subscription;
-import org.dna.mqtt.proto.messages.AbstractMessage;
+import org.eclipse.moquette.spi.IMatchingCondition;
+import org.eclipse.moquette.spi.IMessagesStore;
+import org.eclipse.moquette.spi.impl.events.PublishEvent;
+import org.eclipse.moquette.spi.impl.subscriptions.Subscription;
+import org.eclipse.moquette.proto.messages.AbstractMessage;
 
-import org.dna.mqtt.moquette.messaging.spi.ISessionsStore;
+import org.eclipse.moquette.spi.ISessionsStore;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

broker/src/main/java/org/eclipse/moquette/spi/impl/ProtocolProcessor.java

@@ -13,7 +13,7 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.dna.mqtt.moquette.messaging.spi.impl;
+package org.eclipse.moquette.spi.impl;
 
 import com.lmax.disruptor.EventHandler;
 import com.lmax.disruptor.RingBuffer;
@@ -25,35 +25,35 @@ import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
-import org.dna.mqtt.moquette.messaging.spi.IMatchingCondition;
-import org.dna.mqtt.moquette.messaging.spi.IMessagesStore;
-import org.dna.mqtt.moquette.messaging.spi.ISessionsStore;
-import org.dna.mqtt.moquette.messaging.spi.impl.events.MessagingEvent;
-import org.dna.mqtt.moquette.messaging.spi.impl.events.OutputMessagingEvent;
-import org.dna.mqtt.moquette.messaging.spi.impl.events.PubAckEvent;
-import org.dna.mqtt.moquette.messaging.spi.impl.events.PublishEvent;
-import org.dna.mqtt.moquette.messaging.spi.impl.subscriptions.Subscription;
-import org.dna.mqtt.moquette.messaging.spi.impl.subscriptions.SubscriptionsStore;
-import static org.dna.mqtt.moquette.parser.netty.Utils.VERSION_3_1;
-import static org.dna.mqtt.moquette.parser.netty.Utils.VERSION_3_1_1;
-import org.dna.mqtt.proto.messages.AbstractMessage;
-import org.dna.mqtt.proto.messages.AbstractMessage.QOSType;
-import org.dna.mqtt.proto.messages.ConnAckMessage;
-import org.dna.mqtt.proto.messages.ConnectMessage;
-import org.dna.mqtt.proto.messages.DisconnectMessage;
-import org.dna.mqtt.proto.messages.PubAckMessage;
-import org.dna.mqtt.proto.messages.PubCompMessage;
-import org.dna.mqtt.proto.messages.PubRecMessage;
-import org.dna.mqtt.proto.messages.PubRelMessage;
-import org.dna.mqtt.proto.messages.PublishMessage;
-import org.dna.mqtt.proto.messages.SubAckMessage;
-import org.dna.mqtt.proto.messages.SubscribeMessage;
-import org.dna.mqtt.proto.messages.UnsubAckMessage;
-import org.dna.mqtt.proto.messages.UnsubscribeMessage;
-import org.dna.mqtt.moquette.server.ConnectionDescriptor;
-import org.dna.mqtt.moquette.server.Constants;
-import org.dna.mqtt.moquette.server.IAuthenticator;
-import org.dna.mqtt.moquette.server.ServerChannel;
+import org.eclipse.moquette.spi.IMatchingCondition;
+import org.eclipse.moquette.spi.IMessagesStore;
+import org.eclipse.moquette.spi.ISessionsStore;
+import org.eclipse.moquette.spi.impl.events.MessagingEvent;
+import org.eclipse.moquette.spi.impl.events.OutputMessagingEvent;
+import org.eclipse.moquette.spi.impl.events.PubAckEvent;
+import org.eclipse.moquette.spi.impl.events.PublishEvent;
+import org.eclipse.moquette.spi.impl.subscriptions.Subscription;
+import org.eclipse.moquette.spi.impl.subscriptions.SubscriptionsStore;
+import static org.eclipse.moquette.parser.netty.Utils.VERSION_3_1;
+import static org.eclipse.moquette.parser.netty.Utils.VERSION_3_1_1;
+import org.eclipse.moquette.proto.messages.AbstractMessage;
+import org.eclipse.moquette.proto.messages.AbstractMessage.QOSType;
+import org.eclipse.moquette.proto.messages.ConnAckMessage;
+import org.eclipse.moquette.proto.messages.ConnectMessage;
+import org.eclipse.moquette.proto.messages.DisconnectMessage;
+import org.eclipse.moquette.proto.messages.PubAckMessage;
+import org.eclipse.moquette.proto.messages.PubCompMessage;
+import org.eclipse.moquette.proto.messages.PubRecMessage;
+import org.eclipse.moquette.proto.messages.PubRelMessage;
+import org.eclipse.moquette.proto.messages.PublishMessage;
+import org.eclipse.moquette.proto.messages.SubAckMessage;
+import org.eclipse.moquette.proto.messages.SubscribeMessage;
+import org.eclipse.moquette.proto.messages.UnsubAckMessage;
+import org.eclipse.moquette.proto.messages.UnsubscribeMessage;
+import org.eclipse.moquette.server.ConnectionDescriptor;
+import org.eclipse.moquette.server.Constants;
+import org.eclipse.moquette.server.IAuthenticator;
+import org.eclipse.moquette.server.ServerChannel;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

broker/src/main/java/org/eclipse/moquette/spi/impl/SimpleMessaging.java

@@ -13,7 +13,7 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.dna.mqtt.moquette.messaging.spi.impl;
+package org.eclipse.moquette.spi.impl;
 
 import com.lmax.disruptor.EventHandler;
 import com.lmax.disruptor.RingBuffer;
@@ -25,15 +25,15 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 
-import org.dna.mqtt.moquette.messaging.spi.IMessaging;
-import org.dna.mqtt.moquette.messaging.spi.ISessionsStore;
-import org.dna.mqtt.moquette.messaging.spi.IMessagesStore;
-import org.dna.mqtt.moquette.messaging.spi.impl.events.*;
-import org.dna.mqtt.moquette.messaging.spi.impl.subscriptions.SubscriptionsStore;
-import org.dna.mqtt.moquette.messaging.spi.persistence.MapDBPersistentStore;
-import org.dna.mqtt.proto.messages.*;
-import org.dna.mqtt.moquette.server.IAuthenticator;
-import org.dna.mqtt.moquette.server.ServerChannel;
+import org.eclipse.moquette.spi.IMessaging;
+import org.eclipse.moquette.spi.ISessionsStore;
+import org.eclipse.moquette.spi.IMessagesStore;
+import org.eclipse.moquette.spi.impl.events.*;
+import org.eclipse.moquette.spi.impl.subscriptions.SubscriptionsStore;
+import org.eclipse.moquette.spi.persistence.MapDBPersistentStore;
+import org.eclipse.moquette.proto.messages.*;
+import org.eclipse.moquette.server.IAuthenticator;
+import org.eclipse.moquette.server.ServerChannel;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

broker/src/main/java/org/eclipse/moquette/spi/impl/ValueEvent.java

@@ -13,10 +13,10 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.dna.mqtt.moquette.messaging.spi.impl;
+package org.eclipse.moquette.spi.impl;
 
 import com.lmax.disruptor.EventFactory;
-import org.dna.mqtt.moquette.messaging.spi.impl.events.MessagingEvent;
+import org.eclipse.moquette.spi.impl.events.MessagingEvent;
 
 /**
  * Carrier value object for the RingBuffer.

broker/src/main/java/org/eclipse/moquette/spi/impl/events/LostConnectionEvent.java

@@ -13,7 +13,7 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.dna.mqtt.moquette.messaging.spi.impl.events;
+package org.eclipse.moquette.spi.impl.events;
 
 /**
  * Used to model the connection lost event

broker/src/main/java/org/eclipse/moquette/spi/impl/events/MessagingEvent.java

@@ -13,7 +13,7 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.dna.mqtt.moquette.messaging.spi.impl.events;
+package org.eclipse.moquette.spi.impl.events;
 
 /**
  *Event used to push work request on the SimpleMessaging.

broker/src/main/java/org/eclipse/moquette/spi/impl/events/OutputMessagingEvent.java

@@ -13,10 +13,10 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.dna.mqtt.moquette.messaging.spi.impl.events;
+package org.eclipse.moquette.spi.impl.events;
 
-import org.dna.mqtt.proto.messages.AbstractMessage;
-import org.dna.mqtt.moquette.server.ServerChannel;
+import org.eclipse.moquette.proto.messages.AbstractMessage;
+import org.eclipse.moquette.server.ServerChannel;
 
 /**
  *

broker/src/main/java/org/eclipse/moquette/spi/impl/events/ProtocolEvent.java

@@ -13,11 +13,11 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.dna.mqtt.moquette.messaging.spi.impl.events;
+package org.eclipse.moquette.spi.impl.events;
 
-import org.dna.mqtt.proto.Utils;
-import org.dna.mqtt.proto.messages.AbstractMessage;
-import org.dna.mqtt.moquette.server.ServerChannel;
+import org.eclipse.moquette.proto.Utils;
+import org.eclipse.moquette.proto.messages.AbstractMessage;
+import org.eclipse.moquette.server.ServerChannel;
 
 /**
  * Event used to carry ProtocolMessages from front handler to event processor

broker/src/main/java/org/eclipse/moquette/spi/impl/events/PubAckEvent.java

@@ -13,7 +13,7 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.dna.mqtt.moquette.messaging.spi.impl.events;
+package org.eclipse.moquette.spi.impl.events;
 
 /**
  * Used to send the ack message back to the client after a publish

broker/src/main/java/org/eclipse/moquette/spi/impl/events/PublishEvent.java

@@ -13,9 +13,9 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.dna.mqtt.moquette.messaging.spi.impl.events;
+package org.eclipse.moquette.spi.impl.events;
 
-import org.dna.mqtt.proto.messages.AbstractMessage.QOSType;
+import org.eclipse.moquette.proto.messages.AbstractMessage.QOSType;
 
 import java.nio.ByteBuffer;
 

broker/src/main/java/org/eclipse/moquette/spi/impl/events/RepublishEvent.java

@@ -13,7 +13,7 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.dna.mqtt.moquette.messaging.spi.impl.events;
+package org.eclipse.moquette.spi.impl.events;
 
 /**
  * Used to re-fire stored QoS1 QoS2 events once a client reconnects.

broker/src/main/java/org/eclipse/moquette/spi/impl/events/StopEvent.java

@@ -13,7 +13,7 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.dna.mqtt.moquette.messaging.spi.impl.events;
+package org.eclipse.moquette.spi.impl.events;
 
 /**
  * Poison pill to shutdown the event loop

broker/src/main/java/org/eclipse/moquette/spi/impl/events/SubscribeEvent.java

@@ -13,9 +13,9 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.dna.mqtt.moquette.messaging.spi.impl.events;
+package org.eclipse.moquette.spi.impl.events;
 
-import org.dna.mqtt.moquette.messaging.spi.impl.subscriptions.Subscription;
+import org.eclipse.moquette.spi.impl.subscriptions.Subscription;
 
 /**
  *

broker/src/main/java/org/eclipse/moquette/spi/impl/storage/StoredPublishEvent.java

@@ -13,12 +13,12 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.dna.mqtt.moquette.messaging.spi.impl.storage;
+package org.eclipse.moquette.spi.impl.storage;
 
 import java.io.Serializable;
 import java.nio.ByteBuffer;
-import org.dna.mqtt.moquette.messaging.spi.impl.events.PublishEvent;
-import org.dna.mqtt.proto.messages.AbstractMessage.QOSType;
+import org.eclipse.moquette.spi.impl.events.PublishEvent;
+import org.eclipse.moquette.proto.messages.AbstractMessage.QOSType;
 
 /**
  * Publish event serialized to the DB.

broker/src/main/java/org/eclipse/moquette/spi/impl/subscriptions/Subscription.java

@@ -13,10 +13,10 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.dna.mqtt.moquette.messaging.spi.impl.subscriptions;
+package org.eclipse.moquette.spi.impl.subscriptions;
 
 import java.io.Serializable;
-import org.dna.mqtt.proto.messages.AbstractMessage.QOSType;
+import org.eclipse.moquette.proto.messages.AbstractMessage.QOSType;
 
 /**
  * Maintain the information about which Topic a certain ClientID is subscribed 

broker/src/main/java/org/eclipse/moquette/spi/impl/subscriptions/SubscriptionsStore.java

@@ -13,13 +13,13 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.dna.mqtt.moquette.messaging.spi.impl.subscriptions;
+package org.eclipse.moquette.spi.impl.subscriptions;
 
 import java.text.ParseException;
 import java.util.*;
 import java.util.concurrent.LinkedBlockingDeque;
 
-import org.dna.mqtt.moquette.messaging.spi.ISessionsStore;
+import org.eclipse.moquette.spi.ISessionsStore;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

broker/src/main/java/org/eclipse/moquette/spi/impl/subscriptions/Token.java

@@ -13,7 +13,7 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.dna.mqtt.moquette.messaging.spi.impl.subscriptions;
+package org.eclipse.moquette.spi.impl.subscriptions;
 
 class Token {
 

broker/src/main/java/org/eclipse/moquette/spi/impl/subscriptions/TreeNode.java

@@ -13,7 +13,7 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.dna.mqtt.moquette.messaging.spi.impl.subscriptions;
+package org.eclipse.moquette.spi.impl.subscriptions;
 
 import java.util.*;
 import java.util.concurrent.LinkedBlockingQueue;

broker/src/main/java/org/eclipse/moquette/spi/persistence/MapDBPersistentStore.java

@@ -14,17 +14,17 @@
  * You may elect to redistribute this code under either of these licenses.
  */
 
-package org.dna.mqtt.moquette.messaging.spi.persistence;
+package org.eclipse.moquette.spi.persistence;
 
-import org.dna.mqtt.proto.MQTTException;
-import org.dna.mqtt.moquette.messaging.spi.IMatchingCondition;
-import org.dna.mqtt.moquette.messaging.spi.IMessagesStore;
-import org.dna.mqtt.moquette.messaging.spi.ISessionsStore;
-import org.dna.mqtt.moquette.messaging.spi.impl.events.PublishEvent;
-import org.dna.mqtt.moquette.messaging.spi.impl.storage.StoredPublishEvent;
-import org.dna.mqtt.moquette.messaging.spi.impl.subscriptions.Subscription;
-import org.dna.mqtt.proto.messages.AbstractMessage;
-import static org.dna.mqtt.moquette.server.Server.STORAGE_FILE_PATH;
+import org.eclipse.moquette.proto.MQTTException;
+import org.eclipse.moquette.spi.IMatchingCondition;
+import org.eclipse.moquette.spi.IMessagesStore;
+import org.eclipse.moquette.spi.ISessionsStore;
+import org.eclipse.moquette.spi.impl.events.PublishEvent;
+import org.eclipse.moquette.spi.impl.storage.StoredPublishEvent;
+import org.eclipse.moquette.spi.impl.subscriptions.Subscription;
+import org.eclipse.moquette.proto.messages.AbstractMessage;
+import static org.eclipse.moquette.server.Server.STORAGE_FILE_PATH;
 import org.mapdb.DB;
 import org.mapdb.DBMaker;
 import org.slf4j.Logger;

broker/src/test/java/org/eclipse/moquette/connection/ConnectionIT.java

@@ -13,11 +13,11 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.dna.mqtt.moquette.spec.v3_1_1.connection;
+package org.eclipse.moquette.connection;
 
 import java.io.IOException;
 
-import org.dna.mqtt.moquette.server.Server;
+import org.eclipse.moquette.server.Server;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;

broker/src/test/java/org/eclipse/moquette/server/ConfigurationParserTest.java

@@ -13,13 +13,13 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.dna.mqtt.moquette.server;
+package org.eclipse.moquette.server;
 
 import java.io.Reader;
 import java.io.StringReader;
 import java.text.ParseException;
 import java.util.Properties;
-import org.dna.mqtt.commons.Constants;
+import org.eclipse.moquette.commons.Constants;
 import org.junit.Test;
 import static org.junit.Assert.*;
 import org.junit.Before;

broker/src/test/java/org/eclipse/moquette/server/MQTTWebSocket.java

@@ -13,7 +13,7 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.dna.mqtt.moquette.server;
+package org.eclipse.moquette.server;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;

broker/src/test/java/org/eclipse/moquette/server/ServerIntegrationFuseTest.java

@@ -13,7 +13,7 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.dna.mqtt.moquette.server;
+package org.eclipse.moquette.server;
 
 import java.io.File;
 import java.io.IOException;

broker/src/test/java/org/eclipse/moquette/server/ServerIntegrationPahoTest.java

@@ -13,7 +13,7 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.dna.mqtt.moquette.server;
+package org.eclipse.moquette.server;
 
 import org.eclipse.paho.client.mqttv3.*;
 import org.eclipse.paho.client.mqttv3.persist.MqttDefaultFilePersistence;

broker/src/test/java/org/eclipse/moquette/server/ServerIntegrationQoSValidationTest.java

@@ -13,7 +13,7 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.dna.mqtt.moquette.server;
+package org.eclipse.moquette.server;
 
 
 import java.io.File;

broker/src/test/java/org/eclipse/moquette/server/ServerIntegrationSSLTest.java

@@ -13,7 +13,7 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.dna.mqtt.moquette.server;
+package org.eclipse.moquette.server;
 
 import java.io.File;
 import java.io.IOException;

broker/src/test/java/org/eclipse/moquette/server/ServerIntegrationWebSocketTest.java

@@ -13,7 +13,7 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.dna.mqtt.moquette.server;
+package org.eclipse.moquette.server;
 
 import java.io.File;
 import java.io.IOException;
@@ -21,7 +21,7 @@ import java.net.URI;
 import java.util.concurrent.TimeUnit;
 import org.eclipse.jetty.websocket.client.WebSocketClient;
 import org.eclipse.jetty.websocket.client.ClientUpgradeRequest;
-import org.dna.mqtt.commons.Constants;
+import org.eclipse.moquette.commons.Constants;
 import org.junit.After;
 import static org.junit.Assert.assertTrue;
 import org.junit.Before;

broker/src/test/java/org/eclipse/moquette/server/ServerLowlevelMessagesIntegrationTests.java

@@ -13,17 +13,17 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.dna.mqtt.moquette.server;
+package org.eclipse.moquette.server;
 
 import java.io.File;
 import java.io.IOException;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
-import org.dna.mqtt.proto.messages.AbstractMessage;
-import org.dna.mqtt.proto.messages.AbstractMessage.QOSType;
-import org.dna.mqtt.proto.messages.ConnAckMessage;
-import org.dna.mqtt.proto.messages.ConnectMessage;
-import org.dna.mqtt.moquette.testclient.Client;
+import org.eclipse.moquette.proto.messages.AbstractMessage;
+import org.eclipse.moquette.proto.messages.AbstractMessage.QOSType;
+import org.eclipse.moquette.proto.messages.ConnAckMessage;
+import org.eclipse.moquette.proto.messages.ConnectMessage;
+import org.eclipse.moquette.testclient.Client;
 import org.fusesource.mqtt.client.BlockingConnection;
 import org.fusesource.mqtt.client.MQTT;
 import org.fusesource.mqtt.client.Message;

broker/src/test/java/org/eclipse/moquette/server/ServerRestartIntegrationTest.java

@@ -13,7 +13,7 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.dna.mqtt.moquette.server;
+package org.eclipse.moquette.server;
 
 import java.io.File;
 import java.io.IOException;

broker/src/test/java/org/eclipse/moquette/server/TestCallback.java

@@ -13,7 +13,7 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.dna.mqtt.moquette.server;
+package org.eclipse.moquette.server;
 
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;

broker/src/test/java/org/eclipse/moquette/spi/impl/AnnotationSupportTest.java

@@ -13,11 +13,11 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.dna.mqtt.moquette.messaging.spi.impl;
+package org.eclipse.moquette.spi.impl;
 
-import org.dna.mqtt.proto.messages.ConnAckMessage;
-import org.dna.mqtt.proto.messages.ConnectMessage;
-import org.dna.mqtt.moquette.server.ServerChannel;
+import org.eclipse.moquette.proto.messages.ConnAckMessage;
+import org.eclipse.moquette.proto.messages.ConnectMessage;
+import org.eclipse.moquette.server.ServerChannel;
 import static org.junit.Assert.*;
 import org.junit.Before;
 import org.junit.Test;

broker/src/test/java/org/eclipse/moquette/spi/impl/FileAuthenticatorTest.java

@@ -13,9 +13,9 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.dna.mqtt.moquette.messaging.spi.impl;
+package org.eclipse.moquette.spi.impl;
 
-import org.dna.mqtt.moquette.server.IAuthenticator;
+import org.eclipse.moquette.server.IAuthenticator;
 import org.junit.Test;
 import static org.junit.Assert.*;
 

broker/src/test/java/org/eclipse/moquette/spi/impl/MapDBPersistentStoreTest.java

@@ -13,14 +13,14 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.dna.mqtt.moquette.messaging.spi.impl;
+package org.eclipse.moquette.spi.impl;
 
 import java.io.File;
 import java.util.List;
-import org.dna.mqtt.moquette.messaging.spi.impl.subscriptions.Subscription;
-import org.dna.mqtt.moquette.messaging.spi.persistence.MapDBPersistentStore;
-import org.dna.mqtt.proto.messages.AbstractMessage;
-import org.dna.mqtt.moquette.server.Server;
+import org.eclipse.moquette.spi.impl.subscriptions.Subscription;
+import org.eclipse.moquette.spi.persistence.MapDBPersistentStore;
+import org.eclipse.moquette.proto.messages.AbstractMessage;
+import org.eclipse.moquette.server.Server;
 import org.junit.After;
 import org.junit.Test;
 import static org.junit.Assert.*;

broker/src/test/java/org/eclipse/moquette/spi/impl/MockAuthenticator.java

@@ -13,10 +13,10 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.dna.mqtt.moquette.messaging.spi.impl;
+package org.eclipse.moquette.spi.impl;
 
 import java.util.Map;
-import org.dna.mqtt.moquette.server.IAuthenticator;
+import org.eclipse.moquette.server.IAuthenticator;
 
 /**
  * Test utility to implements authenticator instance.

broker/src/test/java/org/eclipse/moquette/spi/impl/ProtocolProcessorTest.java

@@ -13,7 +13,7 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.dna.mqtt.moquette.messaging.spi.impl;
+package org.eclipse.moquette.spi.impl;
 
 import java.nio.ByteBuffer;
 import java.util.Arrays;
@@ -23,22 +23,22 @@ import java.util.List;
 import java.util.Map;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
-import org.dna.mqtt.moquette.messaging.spi.IMatchingCondition;
-import org.dna.mqtt.moquette.messaging.spi.IMessagesStore;
-import org.dna.mqtt.moquette.messaging.spi.ISessionsStore;
-import org.dna.mqtt.moquette.messaging.spi.impl.subscriptions.Subscription;
-import org.dna.mqtt.moquette.messaging.spi.impl.subscriptions.SubscriptionsStore;
-import static org.dna.mqtt.moquette.parser.netty.Utils.VERSION_3_1_1;
-import org.dna.mqtt.proto.messages.AbstractMessage;
-import org.dna.mqtt.proto.messages.AbstractMessage.QOSType;
-import org.dna.mqtt.proto.messages.ConnAckMessage;
-import org.dna.mqtt.proto.messages.ConnectMessage;
-import org.dna.mqtt.proto.messages.DisconnectMessage;
-import org.dna.mqtt.proto.messages.PublishMessage;
-import org.dna.mqtt.proto.messages.SubAckMessage;
-import org.dna.mqtt.proto.messages.SubscribeMessage;
-import org.dna.mqtt.moquette.server.Constants;
-import org.dna.mqtt.moquette.server.ServerChannel;
+import org.eclipse.moquette.spi.IMatchingCondition;
+import org.eclipse.moquette.spi.IMessagesStore;
+import org.eclipse.moquette.spi.ISessionsStore;
+import org.eclipse.moquette.spi.impl.subscriptions.Subscription;
+import org.eclipse.moquette.spi.impl.subscriptions.SubscriptionsStore;
+import static org.eclipse.moquette.parser.netty.Utils.VERSION_3_1_1;
+import org.eclipse.moquette.proto.messages.AbstractMessage;
+import org.eclipse.moquette.proto.messages.AbstractMessage.QOSType;
+import org.eclipse.moquette.proto.messages.ConnAckMessage;
+import org.eclipse.moquette.proto.messages.ConnectMessage;
+import org.eclipse.moquette.proto.messages.DisconnectMessage;
+import org.eclipse.moquette.proto.messages.PublishMessage;
+import org.eclipse.moquette.proto.messages.SubAckMessage;
+import org.eclipse.moquette.proto.messages.SubscribeMessage;
+import org.eclipse.moquette.server.Constants;
+import org.eclipse.moquette.server.ServerChannel;
 import static org.junit.Assert.*;
 import org.junit.Before;
 import org.junit.Test;

broker/src/test/java/org/eclipse/moquette/spi/impl/subscriptions/SubscriptionsStoreTest.java

@@ -13,15 +13,15 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.dna.mqtt.moquette.messaging.spi.impl.subscriptions;
+package org.eclipse.moquette.spi.impl.subscriptions;
 
 import java.io.IOException;
 import java.text.ParseException;
 import java.util.Arrays;
 import java.util.List;
 
-import org.dna.mqtt.moquette.messaging.spi.impl.MemoryStorageService;
-import org.dna.mqtt.proto.messages.AbstractMessage;
+import org.eclipse.moquette.spi.impl.MemoryStorageService;
+import org.eclipse.moquette.proto.messages.AbstractMessage;
 
 import static org.junit.Assert.*;
 import org.junit.Before;

broker/src/test/java/org/eclipse/moquette/testclient/Client.java

@@ -13,7 +13,7 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.dna.mqtt.moquette.testclient;
+package org.eclipse.moquette.testclient;
 
 import io.netty.bootstrap.Bootstrap;
 import io.netty.channel.Channel;
@@ -24,10 +24,10 @@ import io.netty.channel.EventLoopGroup;
 import io.netty.channel.nio.NioEventLoopGroup;
 import io.netty.channel.socket.SocketChannel;
 import io.netty.channel.socket.nio.NioSocketChannel;
-import org.dna.mqtt.commons.Constants;
-import org.dna.mqtt.moquette.parser.netty.MQTTDecoder;
-import org.dna.mqtt.moquette.parser.netty.MQTTEncoder;
-import org.dna.mqtt.proto.messages.AbstractMessage;
+import org.eclipse.moquette.commons.Constants;
+import org.eclipse.moquette.parser.netty.MQTTDecoder;
+import org.eclipse.moquette.parser.netty.MQTTEncoder;
+import org.eclipse.moquette.proto.messages.AbstractMessage;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

broker/src/test/java/org/eclipse/moquette/testclient/ClientNettyMQTTHandler.java

@@ -13,14 +13,14 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.dna.mqtt.moquette.testclient;
+package org.eclipse.moquette.testclient;
 
 import io.netty.channel.ChannelHandler;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelInboundHandlerAdapter;
-import org.dna.mqtt.proto.Utils;
-import org.dna.mqtt.proto.messages.AbstractMessage;
-import org.dna.mqtt.moquette.server.netty.NettyMQTTHandler;
+import org.eclipse.moquette.proto.Utils;
+import org.eclipse.moquette.proto.messages.AbstractMessage;
+import org.eclipse.moquette.server.netty.NettyMQTTHandler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

broker/src/test/resources/log4j.properties

@@ -2,22 +2,22 @@
 #log4j.rootLogger=ERROR, A1
 log4j.rootLogger=ERROR, stdout, file
 
-log4j.logger.org.dna.mqtt=WARN
-log4j.logger.org.dna.mqtt.moquette.server.ServerIntegrationFuseTest=DEBUG
-#log4j.logger.org.dna.mqtt.moquette.server.ServerLowlevelMessagesIntegrationTests=DEBUG
-log4j.logger.org.dna.mqtt.moquette.server.ServerIntegrationQoSValidationTest=INFO
-log4j.logger.org.dna.mqtt.moquette.messaging.spi.impl.ProtocolProcessor=WARN
-#log4j.logger.org.dna.mqtt.moquette.messaging.spi.impl.ProtocolProcessor=DEBUG
-#log4j.logger.org.dna.mqtt.moquette.messaging.spi.impl.ProtocolProcessor=TRACE
-log4j.logger.org.dna.mqtt.moquette.messaging.spi.impl.SimpleMessaging=WARN
+log4j.logger.org.eclipse.moquette=WARN
+log4j.logger.org.eclipse.moquette.server.ServerIntegrationFuseTest=DEBUG
+#log4j.logger.org.eclipse.moquette.server.ServerLowlevelMessagesIntegrationTests=DEBUG
+log4j.logger.org.eclipse.moquette.server.ServerIntegrationQoSValidationTest=INFO
+log4j.logger.org.eclipse.moquette.spi.impl.ProtocolProcessor=WARN
+#log4j.logger.org.eclipse.moquette.spi.impl.ProtocolProcessor=DEBUG
+#log4j.logger.org.eclipse.moquette.spi.impl.ProtocolProcessor=TRACE
+log4j.logger.org.eclipse.moquette.spi.impl.SimpleMessaging=WARN
 
 #Protocol parsing
-log4j.logger.org.dna.mqtt.moquette.server.netty.NettyMQTTHandler=WARN
-#log4j.logger.org.dna.mqtt.moquette.server.netty.NettyMQTTHandler=DEBUG
-log4j.logger.org.dna.mqtt.moquette.parser.netty=WARN
+log4j.logger.org.eclipse.moquette.server.netty.NettyMQTTHandler=WARN
+#log4j.logger.org.eclipse.moquette.server.netty.NettyMQTTHandler=DEBUG
+log4j.logger.org.eclipse.moquette.parser.netty=WARN
 #Storage service
-#log4j.logger.org.dna.mqtt.moquette.messaging.spi.impl.subscriptions.SubscriptionsStore=DEBUG
-log4j.logger.org.dna.mqtt.moquette.messaging.spi.persistence.MapDBPersistentStore=WARN
+#log4j.logger.org.eclipse.moquette.spi.impl.subscriptions.SubscriptionsStore=DEBUG
+log4j.logger.org.eclipse.moquette.spi.persistence.MapDBPersistentStore=WARN
 
 # stdout appender is set to be a ConsoleAppender.
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender

bundle/pom.xml

@@ -6,7 +6,7 @@
         <relativePath>../</relativePath>
         <!--<relativePath>../pom.xml</relativePath>-->
         <artifactId>moquette-parent</artifactId>
-        <groupId>org.dna.mqtt</groupId>
+        <groupId>org.eclipse.moquette</groupId>
         <version>0.7-SNAPSHOT</version>
     </parent>
 
@@ -21,19 +21,19 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.dna.mqtt</groupId>
+            <groupId>${project.groupId}</groupId>
             <artifactId>moquette-parser-commons</artifactId>
             <version>${project.version}</version>
         </dependency>
         
         <dependency>
-            <groupId>org.dna.mqtt</groupId>
+            <groupId>${project.groupId}</groupId>
             <artifactId>moquette-netty-parser</artifactId>
             <version>${project.version}</version>
         </dependency>
         
         <dependency>
-            <groupId>org.dna.mqtt</groupId>
+            <groupId>${project.groupId}</groupId>
             <artifactId>moquette-broker</artifactId>
             <version>${project.version}</version>
         </dependency>
@@ -185,18 +185,18 @@
                 <configuration>
                     <instructions>
                         <Export-Package>
-                            <!--org.dna.mqtt.commons,-->
+                            <!--org.eclipse.moquette.commons,-->
                             <!--org.apache.commons.logging,-->
-                            <!--org.dna.mqtt.moquette.messaging.spi.impl.storage,-->
-                            <!--org.dna.mqtt.moquette.messaging.spi.impl.subscriptions,-->
-                            org.dna.mqtt.proto.messages.*,
-                            org.dna.mqtt.moquette.server.netty.metrics
+                            <!--org.eclipse.moquette.spi.impl.storage,-->
+                            <!--org.eclipse.moquette.spi.impl.subscriptions,-->
+                            org.eclipse.moquette.proto.messages.*,
+                            org.eclipse.moquette.server.netty.metrics
                         </Export-Package>
-                        <Private-Package>org.dna.mqtt.moquette.bundle,
+                        <Private-Package>org.eclipse.moquette.bundle,
                             ${project.groupId}.*,
                             com.lmax.*
                         </Private-Package>
-                        <Import-Package>!org.dna.mqtt,*</Import-Package>
+                        <Import-Package>!org.eclipse.moquette,*</Import-Package>
                         <Bundle-Activator>${project.groupId}.moquette.bundle.Activator</Bundle-Activator>
                     </instructions>
                 </configuration>
@@ -221,11 +221,10 @@
         </plugins>
     </build>
     
-    <repositories>
+    <!--repositories>
         <repository>
             <id>Paho Releases</id>
             <url>https://repo.eclipse.org/content/repositories/paho-releases/</url>
         </repository>
-
-    </repositories>
+    </repositories-->
 </project>

bundle/src/main/java/org/eclipse/moquette/bundle/Activator.java

@@ -13,9 +13,9 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.dna.mqtt.moquette.bundle;
+package org.eclipse.moquette.bundle;
 
-import org.dna.mqtt.moquette.server.Server;
+import org.eclipse.moquette.server.Server;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
 import org.slf4j.Logger;

distribution/pom.xml

@@ -5,7 +5,7 @@
         <relativePath>../</relativePath>
         <!--<relativePath>../pom.xml</relativePath>-->
         <artifactId>moquette-parent</artifactId>
-        <groupId>org.dna.mqtt</groupId>
+        <groupId>org.eclipse.moquette</groupId>
         <version>0.7-SNAPSHOT</version>
     </parent>
 
@@ -16,19 +16,19 @@
     <!-- Includes all modules -->
     <dependencies>
         <dependency>
-            <groupId>org.dna.mqtt</groupId>
+            <groupId>${project.groupId}</groupId>
             <artifactId>moquette-broker</artifactId>
             <version>${project.version}</version>
         </dependency>
 
         <dependency>
-            <groupId>org.dna.mqtt</groupId>
+            <groupId>${project.groupId}</groupId>
             <artifactId>moquette-parser-commons</artifactId>
             <version>${project.version}</version>
         </dependency>
         
         <dependency>
-            <groupId>org.dna.mqtt</groupId>
+            <groupId>${project.groupId}</groupId>
             <artifactId>moquette-netty-parser</artifactId>
             <version>${project.version}</version>
         </dependency>

distribution/src/main/resources/log4j.properties

@@ -2,17 +2,17 @@
 #log4j.rootLogger=ERROR, A1
 log4j.rootLogger=ERROR, stdout, file
 
-log4j.logger.org.dna.mqtt=INFO
-log4j.logger.org.dna.mqtt.moquette.messaging.spi.impl.ProtocolProcessor=INFO
-log4j.logger.org.dna.mqtt.moquette.messaging.spi.impl.SimpleMessaging=WARN
+log4j.logger.org.eclipse.moquette=INFO
+log4j.logger.org.eclipse.moquette.spi.impl.ProtocolProcessor=INFO
+log4j.logger.org.eclipse.moquette.spi.impl.SimpleMessaging=WARN
 
 #Protocol parsing
-log4j.logger.org.dna.mqtt.moquette.server.netty.NettyMQTTHandler=WARN
-#log4j.logger.org.dna.mqtt.moquette.server.netty.NettyMQTTHandler=DEBUG
-log4j.logger.org.dna.mqtt.moquette.parser.netty=WARN
+log4j.logger.org.eclipse.moquette.server.netty.NettyMQTTHandler=WARN
+#log4j.logger.org.eclipse.moquette.server.netty.NettyMQTTHandler=DEBUG
+log4j.logger.org.eclipse.moquette.parser.netty=WARN
 #Storage server
-#log4j.logger.org.dna.mqtt.moquette.messaging.spi.impl.subscriptions.SubscriptionsStore=DEBUG
-#log4j.logger.org.dna.mqtt.moquette.messaging.spi.impl.HawtDBStorageService=DEBUG
+#log4j.logger.org.eclipse.moquette.spi.impl.subscriptions.SubscriptionsStore=DEBUG
+#log4j.logger.org.eclipse.moquette.spi.impl.HawtDBStorageService=DEBUG
 
 # stdout appender is set to be a ConsoleAppender.
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
@@ -30,4 +30,4 @@ log4j.appender.file.File=moquette.log
 log4j.appender.file.MaxFileSize=1MB
 log4j.appender.file.MaxBackupIndex=1
 log4j.appender.file.layout=org.apache.log4j.PatternLayout
-log4j.appender.file.layout.ConversionPattern=%-4r [%t] %-5p %c{1} %x - %m%n
+log4j.appender.file.layout.ConversionPattern=%-4r [%t] %-5p %c{1} %x - %m%n

distribution/src/main/scripts/moquette.sh

@@ -52,5 +52,5 @@ MOQUETTE_PATH=$MOQUETTE_HOME/
 #LOG_FILE_LEVEL=fine
 JAVA_OPTS_SCRIPT="-XX:+HeapDumpOnOutOfMemoryError -Djava.awt.headless=true"
 
-$JAVA -server $JAVA_OPTS $JAVA_OPTS_SCRIPT -Dlog4j.configuration="file:$LOG_FILE" -Dmoquette.path="$MOQUETTE_PATH" -cp "$MOQUETTE_HOME/lib/moquette-broker-0.6-SNAPSHOT.jar:$MOQUETTE_HOME/lib/*" org.dna.mqtt.moquette.server.Server
+$JAVA -server $JAVA_OPTS $JAVA_OPTS_SCRIPT -Dlog4j.configuration="file:$LOG_FILE" -Dmoquette.path="$MOQUETTE_PATH" -cp "$MOQUETTE_HOME/lib/moquette-broker-0.6-SNAPSHOT.jar:$MOQUETTE_HOME/lib/*" org.eclipse.moquette.server.Server
 

netty_parser/pom.xml

@@ -6,7 +6,7 @@
         <relativePath>../</relativePath>
         <!--<relativePath>../pom.xml</relativePath>-->
         <artifactId>moquette-parent</artifactId>
-        <groupId>org.dna.mqtt</groupId>
+        <groupId>org.eclipse.moquette</groupId>
         <version>0.7-SNAPSHOT</version>
     </parent>
 
@@ -21,7 +21,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.dna.mqtt</groupId>
+            <groupId>${project.groupId}</groupId>
             <artifactId>moquette-parser-commons</artifactId>
             <version>${project.version}</version>
         </dependency>
@@ -95,8 +95,8 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
                     <excludes>
-                        <exclude>org/dna/mqtt/moquette/proto/TestUtils.java</exclude>
-                        <exclude>org/dna/mqtt/moquette/proto/TestUtils$*</exclude>
+                        <exclude>org/eclipse/moquette/parser/netty/TestUtils.java</exclude>
+                        <exclude>org/eclipse/moquette/parser/netty/TestUtils$*</exclude>
                     </excludes>
                 </configuration>
             </plugin>

netty_parser/src/main/java/org/eclipse/moquette/parser/netty/ConnAckDecoder.java

@@ -1,9 +1,9 @@
-package org.dna.mqtt.moquette.parser.netty;
+package org.eclipse.moquette.parser.netty;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.util.AttributeMap;
 import java.util.List;
-import org.dna.mqtt.proto.messages.ConnAckMessage;
+import org.eclipse.moquette.proto.messages.ConnAckMessage;
 
 /**
  *

netty_parser/src/main/java/org/eclipse/moquette/parser/netty/ConnAckEncoder.java

@@ -13,12 +13,12 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.dna.mqtt.moquette.parser.netty;
+package org.eclipse.moquette.parser.netty;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
-import org.dna.mqtt.proto.messages.AbstractMessage;
-import org.dna.mqtt.proto.messages.ConnAckMessage;
+import org.eclipse.moquette.proto.messages.AbstractMessage;
+import org.eclipse.moquette.proto.messages.ConnAckMessage;
 
 /**
  *

netty_parser/src/main/java/org/eclipse/moquette/parser/netty/ConnectDecoder.java

@@ -13,7 +13,7 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.dna.mqtt.moquette.parser.netty;
+package org.eclipse.moquette.parser.netty;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.handler.codec.CorruptedFrameException;
@@ -22,10 +22,10 @@ import io.netty.util.AttributeKey;
 import io.netty.util.AttributeMap;
 import java.io.UnsupportedEncodingException;
 import java.util.List;
-import static org.dna.mqtt.moquette.parser.netty.Utils.VERSION_3_1;
-import static org.dna.mqtt.moquette.parser.netty.Utils.VERSION_3_1_1;
-import org.dna.mqtt.proto.messages.AbstractMessage;
-import org.dna.mqtt.proto.messages.ConnectMessage;
+import static org.eclipse.moquette.parser.netty.Utils.VERSION_3_1;
+import static org.eclipse.moquette.parser.netty.Utils.VERSION_3_1_1;
+import org.eclipse.moquette.proto.messages.AbstractMessage;
+import org.eclipse.moquette.proto.messages.ConnectMessage;
 
 /**
  *

netty_parser/src/main/java/org/eclipse/moquette/parser/netty/ConnectEncoder.java

@@ -13,12 +13,12 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.dna.mqtt.moquette.parser.netty;
+package org.eclipse.moquette.parser.netty;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
-import org.dna.mqtt.proto.messages.AbstractMessage;
-import org.dna.mqtt.proto.messages.ConnectMessage;
+import org.eclipse.moquette.proto.messages.AbstractMessage;
+import org.eclipse.moquette.proto.messages.ConnectMessage;
 
 /**
  *

netty_parser/src/main/java/org/eclipse/moquette/parser/netty/DemuxDecoder.java

@@ -13,13 +13,13 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.dna.mqtt.moquette.parser.netty;
+package org.eclipse.moquette.parser.netty;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.handler.codec.CorruptedFrameException;
 import io.netty.util.AttributeMap;
 import java.util.List;
-import org.dna.mqtt.proto.messages.AbstractMessage;
+import org.eclipse.moquette.proto.messages.AbstractMessage;
 
 /**
  *

netty_parser/src/main/java/org/eclipse/moquette/parser/netty/DemuxEncoder.java

@@ -13,11 +13,11 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.dna.mqtt.moquette.parser.netty;
+package org.eclipse.moquette.parser.netty;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
-import org.dna.mqtt.proto.messages.AbstractMessage;
+import org.eclipse.moquette.proto.messages.AbstractMessage;
 
 /**
  *

netty_parser/src/main/java/org/eclipse/moquette/parser/netty/DisconnectDecoder.java

@@ -13,12 +13,12 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.dna.mqtt.moquette.parser.netty;
+package org.eclipse.moquette.parser.netty;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.util.AttributeMap;
 import java.util.List;
-import org.dna.mqtt.proto.messages.DisconnectMessage;
+import org.eclipse.moquette.proto.messages.DisconnectMessage;
 
 /**
  *

netty_parser/src/main/java/org/eclipse/moquette/parser/netty/DisconnectEncoder.java

@@ -13,12 +13,12 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.dna.mqtt.moquette.parser.netty;
+package org.eclipse.moquette.parser.netty;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
-import org.dna.mqtt.proto.messages.AbstractMessage;
-import org.dna.mqtt.proto.messages.DisconnectMessage;
+import org.eclipse.moquette.proto.messages.AbstractMessage;
+import org.eclipse.moquette.proto.messages.DisconnectMessage;
 
 /**
  *

netty_parser/src/main/java/org/eclipse/moquette/parser/netty/MQTTDecoder.java

@@ -13,7 +13,7 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.dna.mqtt.moquette.parser.netty;
+package org.eclipse.moquette.parser.netty;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
@@ -23,7 +23,7 @@ import io.netty.util.AttributeKey;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import org.dna.mqtt.proto.messages.AbstractMessage;
+import org.eclipse.moquette.proto.messages.AbstractMessage;
 
 /**
  *

netty_parser/src/main/java/org/eclipse/moquette/parser/netty/MQTTEncoder.java

@@ -13,7 +13,7 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.dna.mqtt.moquette.parser.netty;
+package org.eclipse.moquette.parser.netty;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
@@ -21,7 +21,7 @@ import io.netty.handler.codec.CorruptedFrameException;
 import io.netty.handler.codec.MessageToByteEncoder;
 import java.util.HashMap;
 import java.util.Map;
-import org.dna.mqtt.proto.messages.AbstractMessage;
+import org.eclipse.moquette.proto.messages.AbstractMessage;
 
 /**
  *

netty_parser/src/main/java/org/eclipse/moquette/parser/netty/MessageIDDecoder.java

@@ -13,12 +13,12 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.dna.mqtt.moquette.parser.netty;
+package org.eclipse.moquette.parser.netty;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.util.AttributeMap;
 import java.util.List;
-import org.dna.mqtt.proto.messages.MessageIDMessage;
+import org.eclipse.moquette.proto.messages.MessageIDMessage;
 
 /**
  *

netty_parser/src/main/java/org/eclipse/moquette/parser/netty/PingReqDecoder.java

@@ -13,12 +13,12 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.dna.mqtt.moquette.parser.netty;
+package org.eclipse.moquette.parser.netty;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.util.AttributeMap;
 import java.util.List;
-import org.dna.mqtt.proto.messages.PingReqMessage;
+import org.eclipse.moquette.proto.messages.PingReqMessage;
 
 /**
  *

netty_parser/src/main/java/org/eclipse/moquette/parser/netty/PingReqEncoder.java

@@ -13,12 +13,12 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.dna.mqtt.moquette.parser.netty;
+package org.eclipse.moquette.parser.netty;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
-import org.dna.mqtt.proto.messages.AbstractMessage;
-import org.dna.mqtt.proto.messages.PingReqMessage;
+import org.eclipse.moquette.proto.messages.AbstractMessage;
+import org.eclipse.moquette.proto.messages.PingReqMessage;
 
 /**
  *

netty_parser/src/main/java/org/eclipse/moquette/parser/netty/PingRespDecoder.java

@@ -13,12 +13,12 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.dna.mqtt.moquette.parser.netty;
+package org.eclipse.moquette.parser.netty;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.util.AttributeMap;
 import java.util.List;
-import org.dna.mqtt.proto.messages.PingRespMessage;
+import org.eclipse.moquette.proto.messages.PingRespMessage;
 
 /**
  *

netty_parser/src/main/java/org/eclipse/moquette/parser/netty/PingRespEncoder.java

@@ -13,12 +13,12 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.dna.mqtt.moquette.parser.netty;
+package org.eclipse.moquette.parser.netty;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
-import org.dna.mqtt.proto.messages.AbstractMessage;
-import org.dna.mqtt.proto.messages.PingRespMessage;
+import org.eclipse.moquette.proto.messages.AbstractMessage;
+import org.eclipse.moquette.proto.messages.PingRespMessage;
 
 /**
  *

netty_parser/src/main/java/org/eclipse/moquette/parser/netty/PubAckDecoder.java

@@ -13,10 +13,10 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.dna.mqtt.moquette.parser.netty;
+package org.eclipse.moquette.parser.netty;
 
-import org.dna.mqtt.proto.messages.MessageIDMessage;
-import org.dna.mqtt.proto.messages.PubAckMessage;
+import org.eclipse.moquette.proto.messages.MessageIDMessage;
+import org.eclipse.moquette.proto.messages.PubAckMessage;
 
 /**
  *

netty_parser/src/main/java/org/eclipse/moquette/parser/netty/PubAckEncoder.java

@@ -13,12 +13,12 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.dna.mqtt.moquette.parser.netty;
+package org.eclipse.moquette.parser.netty;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
-import org.dna.mqtt.proto.messages.AbstractMessage;
-import org.dna.mqtt.proto.messages.PubAckMessage;
+import org.eclipse.moquette.proto.messages.AbstractMessage;
+import org.eclipse.moquette.proto.messages.PubAckMessage;
 
 /**
  *

netty_parser/src/main/java/org/eclipse/moquette/parser/netty/PubCompDecoder.java

@@ -13,10 +13,10 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.dna.mqtt.moquette.parser.netty;
+package org.eclipse.moquette.parser.netty;
 
-import org.dna.mqtt.proto.messages.MessageIDMessage;
-import org.dna.mqtt.proto.messages.PubCompMessage;
+import org.eclipse.moquette.proto.messages.MessageIDMessage;
+import org.eclipse.moquette.proto.messages.PubCompMessage;
 
 
 /**

netty_parser/src/main/java/org/eclipse/moquette/parser/netty/PubCompEncoder.java

@@ -13,12 +13,12 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.dna.mqtt.moquette.parser.netty;
+package org.eclipse.moquette.parser.netty;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
-import org.dna.mqtt.proto.messages.PubCompMessage;
-import org.dna.mqtt.proto.messages.AbstractMessage;
+import org.eclipse.moquette.proto.messages.PubCompMessage;
+import org.eclipse.moquette.proto.messages.AbstractMessage;
 
 /**
  *

netty_parser/src/main/java/org/eclipse/moquette/parser/netty/PubRecDecoder.java

@@ -13,10 +13,10 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.dna.mqtt.moquette.parser.netty;
+package org.eclipse.moquette.parser.netty;
 
-import org.dna.mqtt.proto.messages.MessageIDMessage;
-import org.dna.mqtt.proto.messages.PubRecMessage;
+import org.eclipse.moquette.proto.messages.MessageIDMessage;
+import org.eclipse.moquette.proto.messages.PubRecMessage;
 
 /**
  *

netty_parser/src/main/java/org/eclipse/moquette/parser/netty/PubRecEncoder.java

@@ -13,12 +13,12 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.dna.mqtt.moquette.parser.netty;
+package org.eclipse.moquette.parser.netty;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
-import org.dna.mqtt.proto.messages.AbstractMessage;
-import org.dna.mqtt.proto.messages.PubRecMessage;
+import org.eclipse.moquette.proto.messages.AbstractMessage;
+import org.eclipse.moquette.proto.messages.PubRecMessage;
 
 /**
  *

netty_parser/src/main/java/org/eclipse/moquette/parser/netty/PubRelDecoder.java

@@ -13,14 +13,14 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.dna.mqtt.moquette.parser.netty;
+package org.eclipse.moquette.parser.netty;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.util.AttributeMap;
 import java.io.UnsupportedEncodingException;
 import java.util.List;
-import org.dna.mqtt.proto.messages.MessageIDMessage;
-import org.dna.mqtt.proto.messages.PubRelMessage;
+import org.eclipse.moquette.proto.messages.MessageIDMessage;
+import org.eclipse.moquette.proto.messages.PubRelMessage;
 
 /**
  *

netty_parser/src/main/java/org/eclipse/moquette/parser/netty/PubRelEncoder.java

@@ -13,12 +13,12 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.dna.mqtt.moquette.parser.netty;
+package org.eclipse.moquette.parser.netty;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
-import org.dna.mqtt.proto.messages.AbstractMessage;
-import org.dna.mqtt.proto.messages.PubRelMessage;
+import org.eclipse.moquette.proto.messages.AbstractMessage;
+import org.eclipse.moquette.proto.messages.PubRelMessage;
 
 /**
  *

netty_parser/src/main/java/org/eclipse/moquette/parser/netty/PublishDecoder.java

@@ -13,15 +13,15 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.dna.mqtt.moquette.parser.netty;
+package org.eclipse.moquette.parser.netty;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.handler.codec.CorruptedFrameException;
 import io.netty.util.AttributeMap;
 import java.util.List;
-import org.dna.mqtt.proto.messages.AbstractMessage;
-import org.dna.mqtt.proto.messages.PublishMessage;
+import org.eclipse.moquette.proto.messages.AbstractMessage;
+import org.eclipse.moquette.proto.messages.PublishMessage;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

netty_parser/src/main/java/org/eclipse/moquette/parser/netty/PublishEncoder.java

@@ -13,12 +13,12 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.dna.mqtt.moquette.parser.netty;
+package org.eclipse.moquette.parser.netty;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
-import org.dna.mqtt.proto.messages.AbstractMessage;
-import org.dna.mqtt.proto.messages.PublishMessage;
+import org.eclipse.moquette.proto.messages.AbstractMessage;
+import org.eclipse.moquette.proto.messages.PublishMessage;
 
 /**
  *