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

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;