diff --git a/broker/pom.xml b/broker/pom.xml index 304d3a7a..13f96979 100644 --- a/broker/pom.xml +++ b/broker/pom.xml @@ -6,7 +6,7 @@ ../ moquette-parent - org.dna.mqtt + org.eclipse.moquette 0.7-SNAPSHOT @@ -21,13 +21,13 @@ - org.dna.mqtt + ${project.groupId} moquette-parser-commons ${project.version} - org.dna.mqtt + ${project.groupId} moquette-netty-parser ${project.version} @@ -214,11 +214,11 @@ - + diff --git a/broker/src/main/java/org/dna/mqtt/moquette/server/ConfigurationParser.java b/broker/src/main/java/org/eclipse/moquette/server/ConfigurationParser.java similarity index 97% rename from broker/src/main/java/org/dna/mqtt/moquette/server/ConfigurationParser.java rename to broker/src/main/java/org/eclipse/moquette/server/ConfigurationParser.java index b6ccf572..9138acbc 100644 --- a/broker/src/main/java/org/dna/mqtt/moquette/server/ConfigurationParser.java +++ b/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; diff --git a/broker/src/main/java/org/dna/mqtt/moquette/server/ConnectionDescriptor.java b/broker/src/main/java/org/eclipse/moquette/server/ConnectionDescriptor.java similarity index 97% rename from broker/src/main/java/org/dna/mqtt/moquette/server/ConnectionDescriptor.java rename to broker/src/main/java/org/eclipse/moquette/server/ConnectionDescriptor.java index b4899cab..5cc04df8 100644 --- a/broker/src/main/java/org/dna/mqtt/moquette/server/ConnectionDescriptor.java +++ b/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, diff --git a/broker/src/main/java/org/dna/mqtt/moquette/server/Constants.java b/broker/src/main/java/org/eclipse/moquette/server/Constants.java similarity index 95% rename from broker/src/main/java/org/dna/mqtt/moquette/server/Constants.java rename to broker/src/main/java/org/eclipse/moquette/server/Constants.java index f2ed2dbb..340c75b0 100644 --- a/broker/src/main/java/org/dna/mqtt/moquette/server/Constants.java +++ b/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 diff --git a/broker/src/main/java/org/dna/mqtt/moquette/server/IAuthenticator.java b/broker/src/main/java/org/eclipse/moquette/server/IAuthenticator.java similarity index 95% rename from broker/src/main/java/org/dna/mqtt/moquette/server/IAuthenticator.java rename to broker/src/main/java/org/eclipse/moquette/server/IAuthenticator.java index 8a80f1b2..3ba33a27 100644 --- a/broker/src/main/java/org/dna/mqtt/moquette/server/IAuthenticator.java +++ b/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 diff --git a/broker/src/main/java/org/dna/mqtt/moquette/server/Server.java b/broker/src/main/java/org/eclipse/moquette/server/Server.java similarity index 95% rename from broker/src/main/java/org/dna/mqtt/moquette/server/Server.java rename to broker/src/main/java/org/eclipse/moquette/server/Server.java index c1398d46..fa180423 100644 --- a/broker/src/main/java/org/dna/mqtt/moquette/server/Server.java +++ b/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; /** diff --git a/broker/src/main/java/org/dna/mqtt/moquette/server/ServerAcceptor.java b/broker/src/main/java/org/eclipse/moquette/server/ServerAcceptor.java similarity index 89% rename from broker/src/main/java/org/dna/mqtt/moquette/server/ServerAcceptor.java rename to broker/src/main/java/org/eclipse/moquette/server/ServerAcceptor.java index e4715265..7c91d180 100644 --- a/broker/src/main/java/org/dna/mqtt/moquette/server/ServerAcceptor.java +++ b/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; /** * diff --git a/broker/src/main/java/org/dna/mqtt/moquette/server/ServerChannel.java b/broker/src/main/java/org/eclipse/moquette/server/ServerChannel.java similarity index 95% rename from broker/src/main/java/org/dna/mqtt/moquette/server/ServerChannel.java rename to broker/src/main/java/org/eclipse/moquette/server/ServerChannel.java index 127221e0..c4f099c2 100644 --- a/broker/src/main/java/org/dna/mqtt/moquette/server/ServerChannel.java +++ b/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; /** * diff --git a/broker/src/main/java/org/dna/mqtt/moquette/server/netty/MoquetteIdleTimoutHandler.java b/broker/src/main/java/org/eclipse/moquette/server/netty/MoquetteIdleTimoutHandler.java similarity index 96% rename from broker/src/main/java/org/dna/mqtt/moquette/server/netty/MoquetteIdleTimoutHandler.java rename to broker/src/main/java/org/eclipse/moquette/server/netty/MoquetteIdleTimoutHandler.java index 44144b18..ca1ca0dc 100644 --- a/broker/src/main/java/org/dna/mqtt/moquette/server/netty/MoquetteIdleTimoutHandler.java +++ b/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; diff --git a/broker/src/main/java/org/dna/mqtt/moquette/server/netty/NettyAcceptor.java b/broker/src/main/java/org/eclipse/moquette/server/netty/NettyAcceptor.java similarity index 96% rename from broker/src/main/java/org/dna/mqtt/moquette/server/netty/NettyAcceptor.java rename to broker/src/main/java/org/eclipse/moquette/server/netty/NettyAcceptor.java index 0c18c176..31355d07 100644 --- a/broker/src/main/java/org/dna/mqtt/moquette/server/netty/NettyAcceptor.java +++ b/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; diff --git a/broker/src/main/java/org/dna/mqtt/moquette/server/netty/NettyChannel.java b/broker/src/main/java/org/eclipse/moquette/server/netty/NettyChannel.java similarity index 95% rename from broker/src/main/java/org/dna/mqtt/moquette/server/netty/NettyChannel.java rename to broker/src/main/java/org/eclipse/moquette/server/netty/NettyChannel.java index 44ec93d5..9f1cb32c 100644 --- a/broker/src/main/java/org/dna/mqtt/moquette/server/netty/NettyChannel.java +++ b/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; /** * diff --git a/broker/src/main/java/org/dna/mqtt/moquette/server/netty/NettyMQTTHandler.java b/broker/src/main/java/org/eclipse/moquette/server/netty/NettyMQTTHandler.java similarity index 89% rename from broker/src/main/java/org/dna/mqtt/moquette/server/netty/NettyMQTTHandler.java rename to broker/src/main/java/org/eclipse/moquette/server/netty/NettyMQTTHandler.java index 9455e437..4a02f1b4 100644 --- a/broker/src/main/java/org/dna/mqtt/moquette/server/netty/NettyMQTTHandler.java +++ b/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; diff --git a/broker/src/main/java/org/dna/mqtt/moquette/server/netty/metrics/BytesMetrics.java b/broker/src/main/java/org/eclipse/moquette/server/netty/metrics/BytesMetrics.java similarity index 95% rename from broker/src/main/java/org/dna/mqtt/moquette/server/netty/metrics/BytesMetrics.java rename to broker/src/main/java/org/eclipse/moquette/server/netty/metrics/BytesMetrics.java index d90c0a7b..b9badbda 100644 --- a/broker/src/main/java/org/dna/mqtt/moquette/server/netty/metrics/BytesMetrics.java +++ b/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; diff --git a/broker/src/main/java/org/dna/mqtt/moquette/server/netty/metrics/BytesMetricsCollector.java b/broker/src/main/java/org/eclipse/moquette/server/netty/metrics/BytesMetricsCollector.java similarity index 96% rename from broker/src/main/java/org/dna/mqtt/moquette/server/netty/metrics/BytesMetricsCollector.java rename to broker/src/main/java/org/eclipse/moquette/server/netty/metrics/BytesMetricsCollector.java index fa8a7270..dacf9ae3 100644 --- a/broker/src/main/java/org/dna/mqtt/moquette/server/netty/metrics/BytesMetricsCollector.java +++ b/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; diff --git a/broker/src/main/java/org/dna/mqtt/moquette/server/netty/metrics/BytesMetricsHandler.java b/broker/src/main/java/org/eclipse/moquette/server/netty/metrics/BytesMetricsHandler.java similarity index 97% rename from broker/src/main/java/org/dna/mqtt/moquette/server/netty/metrics/BytesMetricsHandler.java rename to broker/src/main/java/org/eclipse/moquette/server/netty/metrics/BytesMetricsHandler.java index 6a2ccd85..da37ac85 100644 --- a/broker/src/main/java/org/dna/mqtt/moquette/server/netty/metrics/BytesMetricsHandler.java +++ b/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; diff --git a/broker/src/main/java/org/dna/mqtt/moquette/server/netty/metrics/MessageMetrics.java b/broker/src/main/java/org/eclipse/moquette/server/netty/metrics/MessageMetrics.java similarity index 95% rename from broker/src/main/java/org/dna/mqtt/moquette/server/netty/metrics/MessageMetrics.java rename to broker/src/main/java/org/eclipse/moquette/server/netty/metrics/MessageMetrics.java index df6db2ac..e3a2c953 100644 --- a/broker/src/main/java/org/dna/mqtt/moquette/server/netty/metrics/MessageMetrics.java +++ b/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; diff --git a/broker/src/main/java/org/dna/mqtt/moquette/server/netty/metrics/MessageMetricsCollector.java b/broker/src/main/java/org/eclipse/moquette/server/netty/metrics/MessageMetricsCollector.java similarity index 96% rename from broker/src/main/java/org/dna/mqtt/moquette/server/netty/metrics/MessageMetricsCollector.java rename to broker/src/main/java/org/eclipse/moquette/server/netty/metrics/MessageMetricsCollector.java index e8357f08..41b450ee 100644 --- a/broker/src/main/java/org/dna/mqtt/moquette/server/netty/metrics/MessageMetricsCollector.java +++ b/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; diff --git a/broker/src/main/java/org/dna/mqtt/moquette/server/netty/metrics/MessageMetricsHandler.java b/broker/src/main/java/org/eclipse/moquette/server/netty/metrics/MessageMetricsHandler.java similarity index 97% rename from broker/src/main/java/org/dna/mqtt/moquette/server/netty/metrics/MessageMetricsHandler.java rename to broker/src/main/java/org/eclipse/moquette/server/netty/metrics/MessageMetricsHandler.java index 3df3a923..710f4957 100644 --- a/broker/src/main/java/org/dna/mqtt/moquette/server/netty/metrics/MessageMetricsHandler.java +++ b/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; diff --git a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/IMatchingCondition.java b/broker/src/main/java/org/eclipse/moquette/spi/IMatchingCondition.java similarity index 93% rename from broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/IMatchingCondition.java rename to broker/src/main/java/org/eclipse/moquette/spi/IMatchingCondition.java index ed7f93a5..b3e7038e 100644 --- a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/IMatchingCondition.java +++ b/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; /** */ diff --git a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/IMessagesStore.java b/broker/src/main/java/org/eclipse/moquette/spi/IMessagesStore.java similarity index 94% rename from broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/IMessagesStore.java rename to broker/src/main/java/org/eclipse/moquette/spi/IMessagesStore.java index ea25e71c..8b60ddd1 100644 --- a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/IMessagesStore.java +++ b/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; diff --git a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/IMessaging.java b/broker/src/main/java/org/eclipse/moquette/spi/IMessaging.java similarity index 87% rename from broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/IMessaging.java rename to broker/src/main/java/org/eclipse/moquette/spi/IMessaging.java index ada0b4d9..3bf8f637 100644 --- a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/IMessaging.java +++ b/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. diff --git a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/ISessionsStore.java b/broker/src/main/java/org/eclipse/moquette/spi/ISessionsStore.java similarity index 91% rename from broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/ISessionsStore.java rename to broker/src/main/java/org/eclipse/moquette/spi/ISessionsStore.java index be1583d9..002f77bc 100644 --- a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/ISessionsStore.java +++ b/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. diff --git a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/AcceptAllAuthenticator.java b/broker/src/main/java/org/eclipse/moquette/spi/impl/AcceptAllAuthenticator.java similarity index 65% rename from broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/AcceptAllAuthenticator.java rename to broker/src/main/java/org/eclipse/moquette/spi/impl/AcceptAllAuthenticator.java index 545856a7..bff7e1de 100644 --- a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/AcceptAllAuthenticator.java +++ b/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. diff --git a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/AnnotationSupport.java b/broker/src/main/java/org/eclipse/moquette/spi/impl/AnnotationSupport.java similarity index 93% rename from broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/AnnotationSupport.java rename to broker/src/main/java/org/eclipse/moquette/spi/impl/AnnotationSupport.java index 99837b6f..35da32c6 100644 --- a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/AnnotationSupport.java +++ b/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. diff --git a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/DebugUtils.java b/broker/src/main/java/org/eclipse/moquette/spi/impl/DebugUtils.java similarity index 94% rename from broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/DebugUtils.java rename to broker/src/main/java/org/eclipse/moquette/spi/impl/DebugUtils.java index e1a3c502..fe600aa3 100644 --- a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/DebugUtils.java +++ b/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; diff --git a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/FileAuthenticator.java b/broker/src/main/java/org/eclipse/moquette/spi/impl/FileAuthenticator.java similarity index 97% rename from broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/FileAuthenticator.java rename to broker/src/main/java/org/eclipse/moquette/spi/impl/FileAuthenticator.java index 2bdd9118..c08bb585 100644 --- a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/FileAuthenticator.java +++ b/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; diff --git a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/MQTTMessage.java b/broker/src/main/java/org/eclipse/moquette/spi/impl/MQTTMessage.java similarity index 95% rename from broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/MQTTMessage.java rename to broker/src/main/java/org/eclipse/moquette/spi/impl/MQTTMessage.java index 78cc0d79..b9026e76 100644 --- a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/MQTTMessage.java +++ b/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; diff --git a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/MemoryStorageService.java b/broker/src/main/java/org/eclipse/moquette/spi/impl/MemoryStorageService.java similarity index 93% rename from broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/MemoryStorageService.java rename to broker/src/main/java/org/eclipse/moquette/spi/impl/MemoryStorageService.java index a9c15c84..c163ccf5 100644 --- a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/MemoryStorageService.java +++ b/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; diff --git a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/ProtocolProcessor.java b/broker/src/main/java/org/eclipse/moquette/spi/impl/ProtocolProcessor.java similarity index 93% rename from broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/ProtocolProcessor.java rename to broker/src/main/java/org/eclipse/moquette/spi/impl/ProtocolProcessor.java index 0f9f63e5..c7ac82a2 100644 --- a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/ProtocolProcessor.java +++ b/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; diff --git a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/SimpleMessaging.java b/broker/src/main/java/org/eclipse/moquette/spi/impl/SimpleMessaging.java similarity index 91% rename from broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/SimpleMessaging.java rename to broker/src/main/java/org/eclipse/moquette/spi/impl/SimpleMessaging.java index eb09f351..d49d6893 100644 --- a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/SimpleMessaging.java +++ b/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; diff --git a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/ValueEvent.java b/broker/src/main/java/org/eclipse/moquette/spi/impl/ValueEvent.java similarity index 90% rename from broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/ValueEvent.java rename to broker/src/main/java/org/eclipse/moquette/spi/impl/ValueEvent.java index c88758aa..85ce2c50 100644 --- a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/ValueEvent.java +++ b/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. diff --git a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/events/LostConnectionEvent.java b/broker/src/main/java/org/eclipse/moquette/spi/impl/events/LostConnectionEvent.java similarity index 94% rename from broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/events/LostConnectionEvent.java rename to broker/src/main/java/org/eclipse/moquette/spi/impl/events/LostConnectionEvent.java index 22f2ea11..72ab28fa 100644 --- a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/events/LostConnectionEvent.java +++ b/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 diff --git a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/events/MessagingEvent.java b/broker/src/main/java/org/eclipse/moquette/spi/impl/events/MessagingEvent.java similarity index 92% rename from broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/events/MessagingEvent.java rename to broker/src/main/java/org/eclipse/moquette/spi/impl/events/MessagingEvent.java index af22e4b7..14979386 100644 --- a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/events/MessagingEvent.java +++ b/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. diff --git a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/events/OutputMessagingEvent.java b/broker/src/main/java/org/eclipse/moquette/spi/impl/events/OutputMessagingEvent.java similarity index 87% rename from broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/events/OutputMessagingEvent.java rename to broker/src/main/java/org/eclipse/moquette/spi/impl/events/OutputMessagingEvent.java index 719c7b0f..401bd8f3 100644 --- a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/events/OutputMessagingEvent.java +++ b/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; /** * diff --git a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/events/ProtocolEvent.java b/broker/src/main/java/org/eclipse/moquette/spi/impl/events/ProtocolEvent.java similarity index 86% rename from broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/events/ProtocolEvent.java rename to broker/src/main/java/org/eclipse/moquette/spi/impl/events/ProtocolEvent.java index 8a457492..c02c52e7 100644 --- a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/events/ProtocolEvent.java +++ b/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 diff --git a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/events/PubAckEvent.java b/broker/src/main/java/org/eclipse/moquette/spi/impl/events/PubAckEvent.java similarity index 94% rename from broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/events/PubAckEvent.java rename to broker/src/main/java/org/eclipse/moquette/spi/impl/events/PubAckEvent.java index 709bfb2c..864de1bb 100644 --- a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/events/PubAckEvent.java +++ b/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 diff --git a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/events/PublishEvent.java b/broker/src/main/java/org/eclipse/moquette/spi/impl/events/PublishEvent.java similarity index 94% rename from broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/events/PublishEvent.java rename to broker/src/main/java/org/eclipse/moquette/spi/impl/events/PublishEvent.java index 87face45..974bc968 100644 --- a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/events/PublishEvent.java +++ b/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; diff --git a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/events/RepublishEvent.java b/broker/src/main/java/org/eclipse/moquette/spi/impl/events/RepublishEvent.java similarity index 94% rename from broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/events/RepublishEvent.java rename to broker/src/main/java/org/eclipse/moquette/spi/impl/events/RepublishEvent.java index 9ba7ab37..a6d5ea78 100644 --- a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/events/RepublishEvent.java +++ b/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. diff --git a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/events/StopEvent.java b/broker/src/main/java/org/eclipse/moquette/spi/impl/events/StopEvent.java similarity index 92% rename from broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/events/StopEvent.java rename to broker/src/main/java/org/eclipse/moquette/spi/impl/events/StopEvent.java index 8b4912fa..8b45577b 100644 --- a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/events/StopEvent.java +++ b/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 diff --git a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/events/SubscribeEvent.java b/broker/src/main/java/org/eclipse/moquette/spi/impl/events/SubscribeEvent.java similarity index 88% rename from broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/events/SubscribeEvent.java rename to broker/src/main/java/org/eclipse/moquette/spi/impl/events/SubscribeEvent.java index 3a3c0253..658acfee 100644 --- a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/events/SubscribeEvent.java +++ b/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; /** * diff --git a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/storage/StoredPublishEvent.java b/broker/src/main/java/org/eclipse/moquette/spi/impl/storage/StoredPublishEvent.java similarity index 90% rename from broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/storage/StoredPublishEvent.java rename to broker/src/main/java/org/eclipse/moquette/spi/impl/storage/StoredPublishEvent.java index a468e3b9..483a2bf4 100644 --- a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/storage/StoredPublishEvent.java +++ b/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. diff --git a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/subscriptions/Subscription.java b/broker/src/main/java/org/eclipse/moquette/spi/impl/subscriptions/Subscription.java similarity index 96% rename from broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/subscriptions/Subscription.java rename to broker/src/main/java/org/eclipse/moquette/spi/impl/subscriptions/Subscription.java index 44b39dad..cc015180 100644 --- a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/subscriptions/Subscription.java +++ b/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 diff --git a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/subscriptions/SubscriptionsStore.java b/broker/src/main/java/org/eclipse/moquette/spi/impl/subscriptions/SubscriptionsStore.java similarity index 98% rename from broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/subscriptions/SubscriptionsStore.java rename to broker/src/main/java/org/eclipse/moquette/spi/impl/subscriptions/SubscriptionsStore.java index 4a592a12..664d75a6 100644 --- a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/subscriptions/SubscriptionsStore.java +++ b/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; diff --git a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/subscriptions/Token.java b/broker/src/main/java/org/eclipse/moquette/spi/impl/subscriptions/Token.java similarity index 96% rename from broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/subscriptions/Token.java rename to broker/src/main/java/org/eclipse/moquette/spi/impl/subscriptions/Token.java index 76c22ff2..117e986c 100644 --- a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/subscriptions/Token.java +++ b/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 { diff --git a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/subscriptions/TreeNode.java b/broker/src/main/java/org/eclipse/moquette/spi/impl/subscriptions/TreeNode.java similarity index 98% rename from broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/subscriptions/TreeNode.java rename to broker/src/main/java/org/eclipse/moquette/spi/impl/subscriptions/TreeNode.java index d84eb67f..fdeee9eb 100644 --- a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/impl/subscriptions/TreeNode.java +++ b/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; diff --git a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/persistence/MapDBPersistentStore.java b/broker/src/main/java/org/eclipse/moquette/spi/persistence/MapDBPersistentStore.java similarity index 93% rename from broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/persistence/MapDBPersistentStore.java rename to broker/src/main/java/org/eclipse/moquette/spi/persistence/MapDBPersistentStore.java index 02d756ed..62ea5278 100644 --- a/broker/src/main/java/org/dna/mqtt/moquette/messaging/spi/persistence/MapDBPersistentStore.java +++ b/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; diff --git a/broker/src/test/java/org/dna/mqtt/moquette/spec/v3_1_1/connection/ConnectionIT.java b/broker/src/test/java/org/eclipse/moquette/connection/ConnectionIT.java similarity index 95% rename from broker/src/test/java/org/dna/mqtt/moquette/spec/v3_1_1/connection/ConnectionIT.java rename to broker/src/test/java/org/eclipse/moquette/connection/ConnectionIT.java index aed48466..3b264751 100644 --- a/broker/src/test/java/org/dna/mqtt/moquette/spec/v3_1_1/connection/ConnectionIT.java +++ b/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; diff --git a/broker/src/test/java/org/dna/mqtt/moquette/server/ConfigurationParserTest.java b/broker/src/test/java/org/eclipse/moquette/server/ConfigurationParserTest.java similarity index 97% rename from broker/src/test/java/org/dna/mqtt/moquette/server/ConfigurationParserTest.java rename to broker/src/test/java/org/eclipse/moquette/server/ConfigurationParserTest.java index a958403f..1a9758d5 100644 --- a/broker/src/test/java/org/dna/mqtt/moquette/server/ConfigurationParserTest.java +++ b/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; diff --git a/broker/src/test/java/org/dna/mqtt/moquette/server/MQTTWebSocket.java b/broker/src/test/java/org/eclipse/moquette/server/MQTTWebSocket.java similarity index 98% rename from broker/src/test/java/org/dna/mqtt/moquette/server/MQTTWebSocket.java rename to broker/src/test/java/org/eclipse/moquette/server/MQTTWebSocket.java index 06e068fa..7951a7c4 100644 --- a/broker/src/test/java/org/dna/mqtt/moquette/server/MQTTWebSocket.java +++ b/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; diff --git a/broker/src/test/java/org/dna/mqtt/moquette/server/ServerIntegrationFuseTest.java b/broker/src/test/java/org/eclipse/moquette/server/ServerIntegrationFuseTest.java similarity index 99% rename from broker/src/test/java/org/dna/mqtt/moquette/server/ServerIntegrationFuseTest.java rename to broker/src/test/java/org/eclipse/moquette/server/ServerIntegrationFuseTest.java index 23704e7f..fa75c7a4 100644 --- a/broker/src/test/java/org/dna/mqtt/moquette/server/ServerIntegrationFuseTest.java +++ b/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; diff --git a/broker/src/test/java/org/dna/mqtt/moquette/server/ServerIntegrationPahoTest.java b/broker/src/test/java/org/eclipse/moquette/server/ServerIntegrationPahoTest.java similarity index 99% rename from broker/src/test/java/org/dna/mqtt/moquette/server/ServerIntegrationPahoTest.java rename to broker/src/test/java/org/eclipse/moquette/server/ServerIntegrationPahoTest.java index d076d096..36ed2d1d 100644 --- a/broker/src/test/java/org/dna/mqtt/moquette/server/ServerIntegrationPahoTest.java +++ b/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; diff --git a/broker/src/test/java/org/dna/mqtt/moquette/server/ServerIntegrationQoSValidationTest.java b/broker/src/test/java/org/eclipse/moquette/server/ServerIntegrationQoSValidationTest.java similarity index 99% rename from broker/src/test/java/org/dna/mqtt/moquette/server/ServerIntegrationQoSValidationTest.java rename to broker/src/test/java/org/eclipse/moquette/server/ServerIntegrationQoSValidationTest.java index 83bde1b4..f2c2310c 100644 --- a/broker/src/test/java/org/dna/mqtt/moquette/server/ServerIntegrationQoSValidationTest.java +++ b/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; diff --git a/broker/src/test/java/org/dna/mqtt/moquette/server/ServerIntegrationSSLTest.java b/broker/src/test/java/org/eclipse/moquette/server/ServerIntegrationSSLTest.java similarity index 99% rename from broker/src/test/java/org/dna/mqtt/moquette/server/ServerIntegrationSSLTest.java rename to broker/src/test/java/org/eclipse/moquette/server/ServerIntegrationSSLTest.java index 3036d48f..1e9175fe 100644 --- a/broker/src/test/java/org/dna/mqtt/moquette/server/ServerIntegrationSSLTest.java +++ b/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; diff --git a/broker/src/test/java/org/dna/mqtt/moquette/server/ServerIntegrationWebSocketTest.java b/broker/src/test/java/org/eclipse/moquette/server/ServerIntegrationWebSocketTest.java similarity index 96% rename from broker/src/test/java/org/dna/mqtt/moquette/server/ServerIntegrationWebSocketTest.java rename to broker/src/test/java/org/eclipse/moquette/server/ServerIntegrationWebSocketTest.java index dcdf4d08..bc4b626a 100644 --- a/broker/src/test/java/org/dna/mqtt/moquette/server/ServerIntegrationWebSocketTest.java +++ b/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; diff --git a/broker/src/test/java/org/dna/mqtt/moquette/server/ServerLowlevelMessagesIntegrationTests.java b/broker/src/test/java/org/eclipse/moquette/server/ServerLowlevelMessagesIntegrationTests.java similarity index 94% rename from broker/src/test/java/org/dna/mqtt/moquette/server/ServerLowlevelMessagesIntegrationTests.java rename to broker/src/test/java/org/eclipse/moquette/server/ServerLowlevelMessagesIntegrationTests.java index fb31c636..b2a429db 100644 --- a/broker/src/test/java/org/dna/mqtt/moquette/server/ServerLowlevelMessagesIntegrationTests.java +++ b/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; diff --git a/broker/src/test/java/org/dna/mqtt/moquette/server/ServerRestartIntegrationTest.java b/broker/src/test/java/org/eclipse/moquette/server/ServerRestartIntegrationTest.java similarity index 99% rename from broker/src/test/java/org/dna/mqtt/moquette/server/ServerRestartIntegrationTest.java rename to broker/src/test/java/org/eclipse/moquette/server/ServerRestartIntegrationTest.java index ed4f9e38..4702391b 100644 --- a/broker/src/test/java/org/dna/mqtt/moquette/server/ServerRestartIntegrationTest.java +++ b/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; diff --git a/broker/src/test/java/org/dna/mqtt/moquette/server/TestCallback.java b/broker/src/test/java/org/eclipse/moquette/server/TestCallback.java similarity index 98% rename from broker/src/test/java/org/dna/mqtt/moquette/server/TestCallback.java rename to broker/src/test/java/org/eclipse/moquette/server/TestCallback.java index 541c1128..cbc1eb1d 100644 --- a/broker/src/test/java/org/dna/mqtt/moquette/server/TestCallback.java +++ b/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; diff --git a/broker/src/test/java/org/dna/mqtt/moquette/messaging/spi/impl/AnnotationSupportTest.java b/broker/src/test/java/org/eclipse/moquette/spi/impl/AnnotationSupportTest.java similarity index 89% rename from broker/src/test/java/org/dna/mqtt/moquette/messaging/spi/impl/AnnotationSupportTest.java rename to broker/src/test/java/org/eclipse/moquette/spi/impl/AnnotationSupportTest.java index 1cb4c446..f968e196 100644 --- a/broker/src/test/java/org/dna/mqtt/moquette/messaging/spi/impl/AnnotationSupportTest.java +++ b/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; diff --git a/broker/src/test/java/org/dna/mqtt/moquette/messaging/spi/impl/FileAuthenticatorTest.java b/broker/src/test/java/org/eclipse/moquette/spi/impl/FileAuthenticatorTest.java similarity index 93% rename from broker/src/test/java/org/dna/mqtt/moquette/messaging/spi/impl/FileAuthenticatorTest.java rename to broker/src/test/java/org/eclipse/moquette/spi/impl/FileAuthenticatorTest.java index e9a6cef0..b546e095 100644 --- a/broker/src/test/java/org/dna/mqtt/moquette/messaging/spi/impl/FileAuthenticatorTest.java +++ b/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.*; diff --git a/broker/src/test/java/org/dna/mqtt/moquette/messaging/spi/impl/MapDBPersistentStoreTest.java b/broker/src/test/java/org/eclipse/moquette/spi/impl/MapDBPersistentStoreTest.java similarity index 88% rename from broker/src/test/java/org/dna/mqtt/moquette/messaging/spi/impl/MapDBPersistentStoreTest.java rename to broker/src/test/java/org/eclipse/moquette/spi/impl/MapDBPersistentStoreTest.java index b73c9c5a..b5439893 100644 --- a/broker/src/test/java/org/dna/mqtt/moquette/messaging/spi/impl/MapDBPersistentStoreTest.java +++ b/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.*; diff --git a/broker/src/test/java/org/dna/mqtt/moquette/messaging/spi/impl/MockAuthenticator.java b/broker/src/test/java/org/eclipse/moquette/spi/impl/MockAuthenticator.java similarity index 91% rename from broker/src/test/java/org/dna/mqtt/moquette/messaging/spi/impl/MockAuthenticator.java rename to broker/src/test/java/org/eclipse/moquette/spi/impl/MockAuthenticator.java index f1b0af0b..5fad05d5 100644 --- a/broker/src/test/java/org/dna/mqtt/moquette/messaging/spi/impl/MockAuthenticator.java +++ b/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. diff --git a/broker/src/test/java/org/dna/mqtt/moquette/messaging/spi/impl/ProtocolProcessorTest.java b/broker/src/test/java/org/eclipse/moquette/spi/impl/ProtocolProcessorTest.java similarity index 95% rename from broker/src/test/java/org/dna/mqtt/moquette/messaging/spi/impl/ProtocolProcessorTest.java rename to broker/src/test/java/org/eclipse/moquette/spi/impl/ProtocolProcessorTest.java index cf88ce54..69f5d676 100644 --- a/broker/src/test/java/org/dna/mqtt/moquette/messaging/spi/impl/ProtocolProcessorTest.java +++ b/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; diff --git a/broker/src/test/java/org/dna/mqtt/moquette/messaging/spi/impl/subscriptions/SubscriptionsStoreTest.java b/broker/src/test/java/org/eclipse/moquette/spi/impl/subscriptions/SubscriptionsStoreTest.java similarity index 98% rename from broker/src/test/java/org/dna/mqtt/moquette/messaging/spi/impl/subscriptions/SubscriptionsStoreTest.java rename to broker/src/test/java/org/eclipse/moquette/spi/impl/subscriptions/SubscriptionsStoreTest.java index 7b96a56c..afcb7ba9 100644 --- a/broker/src/test/java/org/dna/mqtt/moquette/messaging/spi/impl/subscriptions/SubscriptionsStoreTest.java +++ b/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; diff --git a/broker/src/test/java/org/dna/mqtt/moquette/testclient/Client.java b/broker/src/test/java/org/eclipse/moquette/testclient/Client.java similarity index 93% rename from broker/src/test/java/org/dna/mqtt/moquette/testclient/Client.java rename to broker/src/test/java/org/eclipse/moquette/testclient/Client.java index a105ac95..cde5ce42 100644 --- a/broker/src/test/java/org/dna/mqtt/moquette/testclient/Client.java +++ b/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; diff --git a/broker/src/test/java/org/dna/mqtt/moquette/testclient/ClientNettyMQTTHandler.java b/broker/src/test/java/org/eclipse/moquette/testclient/ClientNettyMQTTHandler.java similarity index 88% rename from broker/src/test/java/org/dna/mqtt/moquette/testclient/ClientNettyMQTTHandler.java rename to broker/src/test/java/org/eclipse/moquette/testclient/ClientNettyMQTTHandler.java index 60bff732..697dbe18 100644 --- a/broker/src/test/java/org/dna/mqtt/moquette/testclient/ClientNettyMQTTHandler.java +++ b/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; diff --git a/broker/src/test/resources/log4j.properties b/broker/src/test/resources/log4j.properties index 1652ee6f..0a6fd0dc 100644 --- a/broker/src/test/resources/log4j.properties +++ b/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 diff --git a/broker/src/test/scripts/org/dna/mqtt/moquette/spec/v3_1_1/connection/connect.then.close.rpt b/broker/src/test/scripts/org/eclipse/moquette/spec/v3_1_1/connection/connect.then.close.rpt similarity index 100% rename from broker/src/test/scripts/org/dna/mqtt/moquette/spec/v3_1_1/connection/connect.then.close.rpt rename to broker/src/test/scripts/org/eclipse/moquette/spec/v3_1_1/connection/connect.then.close.rpt diff --git a/broker/src/test/scripts/org/dna/mqtt/moquette/spec/v3_1_1/connection/connect.with.WillFlag.set.to.zero.but.WillQoS.set.to.nonzero.rpt b/broker/src/test/scripts/org/eclipse/moquette/spec/v3_1_1/connection/connect.with.WillFlag.set.to.zero.but.WillQoS.set.to.nonzero.rpt similarity index 100% rename from broker/src/test/scripts/org/dna/mqtt/moquette/spec/v3_1_1/connection/connect.with.WillFlag.set.to.zero.but.WillQoS.set.to.nonzero.rpt rename to broker/src/test/scripts/org/eclipse/moquette/spec/v3_1_1/connection/connect.with.WillFlag.set.to.zero.but.WillQoS.set.to.nonzero.rpt diff --git a/broker/src/test/scripts/org/dna/mqtt/moquette/spec/v3_1_1/connection/connect.with.invalid.WillQoS.rpt b/broker/src/test/scripts/org/eclipse/moquette/spec/v3_1_1/connection/connect.with.invalid.WillQoS.rpt similarity index 100% rename from broker/src/test/scripts/org/dna/mqtt/moquette/spec/v3_1_1/connection/connect.with.invalid.WillQoS.rpt rename to broker/src/test/scripts/org/eclipse/moquette/spec/v3_1_1/connection/connect.with.invalid.WillQoS.rpt diff --git a/bundle/pom.xml b/bundle/pom.xml index 98cc5718..83e6a0c9 100644 --- a/bundle/pom.xml +++ b/bundle/pom.xml @@ -6,7 +6,7 @@ ../ moquette-parent - org.dna.mqtt + org.eclipse.moquette 0.7-SNAPSHOT @@ -21,19 +21,19 @@ - org.dna.mqtt + ${project.groupId} moquette-parser-commons ${project.version} - org.dna.mqtt + ${project.groupId} moquette-netty-parser ${project.version} - org.dna.mqtt + ${project.groupId} moquette-broker ${project.version} @@ -185,18 +185,18 @@ - + - - - org.dna.mqtt.proto.messages.*, - org.dna.mqtt.moquette.server.netty.metrics + + + org.eclipse.moquette.proto.messages.*, + org.eclipse.moquette.server.netty.metrics - org.dna.mqtt.moquette.bundle, + org.eclipse.moquette.bundle, ${project.groupId}.*, com.lmax.* - !org.dna.mqtt,* + !org.eclipse.moquette,* ${project.groupId}.moquette.bundle.Activator @@ -221,11 +221,10 @@ - + diff --git a/bundle/src/main/java/org/dna/mqtt/moquette/bundle/Activator.java b/bundle/src/main/java/org/eclipse/moquette/bundle/Activator.java similarity index 94% rename from bundle/src/main/java/org/dna/mqtt/moquette/bundle/Activator.java rename to bundle/src/main/java/org/eclipse/moquette/bundle/Activator.java index cad7e531..6df34ff0 100644 --- a/bundle/src/main/java/org/dna/mqtt/moquette/bundle/Activator.java +++ b/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; diff --git a/distribution/pom.xml b/distribution/pom.xml index 44f25f53..9ef5b7f3 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -5,7 +5,7 @@ ../ moquette-parent - org.dna.mqtt + org.eclipse.moquette 0.7-SNAPSHOT @@ -16,19 +16,19 @@ - org.dna.mqtt + ${project.groupId} moquette-broker ${project.version} - org.dna.mqtt + ${project.groupId} moquette-parser-commons ${project.version} - org.dna.mqtt + ${project.groupId} moquette-netty-parser ${project.version} diff --git a/distribution/src/main/resources/log4j.properties b/distribution/src/main/resources/log4j.properties index f6223173..5a9cc456 100644 --- a/distribution/src/main/resources/log4j.properties +++ b/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 \ No newline at end of file +log4j.appender.file.layout.ConversionPattern=%-4r [%t] %-5p %c{1} %x - %m%n diff --git a/distribution/src/main/scripts/moquette.sh b/distribution/src/main/scripts/moquette.sh index 614c70d8..5d1b4235 100644 --- a/distribution/src/main/scripts/moquette.sh +++ b/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 diff --git a/netty_parser/pom.xml b/netty_parser/pom.xml index 09b33886..6500d2da 100644 --- a/netty_parser/pom.xml +++ b/netty_parser/pom.xml @@ -6,7 +6,7 @@ ../ moquette-parent - org.dna.mqtt + org.eclipse.moquette 0.7-SNAPSHOT @@ -21,7 +21,7 @@ - org.dna.mqtt + ${project.groupId} moquette-parser-commons ${project.version} @@ -95,8 +95,8 @@ maven-surefire-plugin - org/dna/mqtt/moquette/proto/TestUtils.java - org/dna/mqtt/moquette/proto/TestUtils$* + org/eclipse/moquette/parser/netty/TestUtils.java + org/eclipse/moquette/parser/netty/TestUtils$* diff --git a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/ConnAckDecoder.java b/netty_parser/src/main/java/org/eclipse/moquette/parser/netty/ConnAckDecoder.java similarity index 86% rename from netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/ConnAckDecoder.java rename to netty_parser/src/main/java/org/eclipse/moquette/parser/netty/ConnAckDecoder.java index 00347e4a..149287f9 100644 --- a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/ConnAckDecoder.java +++ b/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; /** * diff --git a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/ConnAckEncoder.java b/netty_parser/src/main/java/org/eclipse/moquette/parser/netty/ConnAckEncoder.java similarity index 87% rename from netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/ConnAckEncoder.java rename to netty_parser/src/main/java/org/eclipse/moquette/parser/netty/ConnAckEncoder.java index a92ce8c3..10d4973f 100644 --- a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/ConnAckEncoder.java +++ b/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; /** * diff --git a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/ConnectDecoder.java b/netty_parser/src/main/java/org/eclipse/moquette/parser/netty/ConnectDecoder.java similarity index 96% rename from netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/ConnectDecoder.java rename to netty_parser/src/main/java/org/eclipse/moquette/parser/netty/ConnectDecoder.java index 4d175c6a..3fe8cc28 100644 --- a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/ConnectDecoder.java +++ b/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; /** * diff --git a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/ConnectEncoder.java b/netty_parser/src/main/java/org/eclipse/moquette/parser/netty/ConnectEncoder.java similarity index 95% rename from netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/ConnectEncoder.java rename to netty_parser/src/main/java/org/eclipse/moquette/parser/netty/ConnectEncoder.java index 727017d6..6f5e6e0c 100644 --- a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/ConnectEncoder.java +++ b/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; /** * diff --git a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/DemuxDecoder.java b/netty_parser/src/main/java/org/eclipse/moquette/parser/netty/DemuxDecoder.java similarity index 96% rename from netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/DemuxDecoder.java rename to netty_parser/src/main/java/org/eclipse/moquette/parser/netty/DemuxDecoder.java index 2e6bf7da..2e7f521d 100644 --- a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/DemuxDecoder.java +++ b/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; /** * diff --git a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/DemuxEncoder.java b/netty_parser/src/main/java/org/eclipse/moquette/parser/netty/DemuxEncoder.java similarity index 89% rename from netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/DemuxEncoder.java rename to netty_parser/src/main/java/org/eclipse/moquette/parser/netty/DemuxEncoder.java index b26ce3fc..9927d2b0 100644 --- a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/DemuxEncoder.java +++ b/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; /** * diff --git a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/DisconnectDecoder.java b/netty_parser/src/main/java/org/eclipse/moquette/parser/netty/DisconnectDecoder.java similarity index 91% rename from netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/DisconnectDecoder.java rename to netty_parser/src/main/java/org/eclipse/moquette/parser/netty/DisconnectDecoder.java index 63b34a07..fa1c8ba3 100644 --- a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/DisconnectDecoder.java +++ b/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; /** * diff --git a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/DisconnectEncoder.java b/netty_parser/src/main/java/org/eclipse/moquette/parser/netty/DisconnectEncoder.java similarity index 85% rename from netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/DisconnectEncoder.java rename to netty_parser/src/main/java/org/eclipse/moquette/parser/netty/DisconnectEncoder.java index c65bf290..469c7e66 100644 --- a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/DisconnectEncoder.java +++ b/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; /** * diff --git a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/MQTTDecoder.java b/netty_parser/src/main/java/org/eclipse/moquette/parser/netty/MQTTDecoder.java similarity index 96% rename from netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/MQTTDecoder.java rename to netty_parser/src/main/java/org/eclipse/moquette/parser/netty/MQTTDecoder.java index 94c69cdb..37aa2cda 100644 --- a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/MQTTDecoder.java +++ b/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; /** * diff --git a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/MQTTEncoder.java b/netty_parser/src/main/java/org/eclipse/moquette/parser/netty/MQTTEncoder.java similarity index 96% rename from netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/MQTTEncoder.java rename to netty_parser/src/main/java/org/eclipse/moquette/parser/netty/MQTTEncoder.java index a5ef95dd..7ede73d8 100644 --- a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/MQTTEncoder.java +++ b/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; /** * diff --git a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/MessageIDDecoder.java b/netty_parser/src/main/java/org/eclipse/moquette/parser/netty/MessageIDDecoder.java similarity index 92% rename from netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/MessageIDDecoder.java rename to netty_parser/src/main/java/org/eclipse/moquette/parser/netty/MessageIDDecoder.java index 292e2e1c..348ef64a 100644 --- a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/MessageIDDecoder.java +++ b/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; /** * diff --git a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PingReqDecoder.java b/netty_parser/src/main/java/org/eclipse/moquette/parser/netty/PingReqDecoder.java similarity index 91% rename from netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PingReqDecoder.java rename to netty_parser/src/main/java/org/eclipse/moquette/parser/netty/PingReqDecoder.java index d6f65c7c..c4c7d6a7 100644 --- a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PingReqDecoder.java +++ b/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; /** * diff --git a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PingReqEncoder.java b/netty_parser/src/main/java/org/eclipse/moquette/parser/netty/PingReqEncoder.java similarity index 85% rename from netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PingReqEncoder.java rename to netty_parser/src/main/java/org/eclipse/moquette/parser/netty/PingReqEncoder.java index 0fa14211..4a184054 100644 --- a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PingReqEncoder.java +++ b/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; /** * diff --git a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PingRespDecoder.java b/netty_parser/src/main/java/org/eclipse/moquette/parser/netty/PingRespDecoder.java similarity index 91% rename from netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PingRespDecoder.java rename to netty_parser/src/main/java/org/eclipse/moquette/parser/netty/PingRespDecoder.java index fb287109..0744729e 100644 --- a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PingRespDecoder.java +++ b/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; /** * diff --git a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PingRespEncoder.java b/netty_parser/src/main/java/org/eclipse/moquette/parser/netty/PingRespEncoder.java similarity index 85% rename from netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PingRespEncoder.java rename to netty_parser/src/main/java/org/eclipse/moquette/parser/netty/PingRespEncoder.java index c2c57189..81597524 100644 --- a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PingRespEncoder.java +++ b/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; /** * diff --git a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PubAckDecoder.java b/netty_parser/src/main/java/org/eclipse/moquette/parser/netty/PubAckDecoder.java similarity index 82% rename from netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PubAckDecoder.java rename to netty_parser/src/main/java/org/eclipse/moquette/parser/netty/PubAckDecoder.java index 8d67e4ea..0a801c60 100644 --- a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PubAckDecoder.java +++ b/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; /** * diff --git a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PubAckEncoder.java b/netty_parser/src/main/java/org/eclipse/moquette/parser/netty/PubAckEncoder.java similarity index 88% rename from netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PubAckEncoder.java rename to netty_parser/src/main/java/org/eclipse/moquette/parser/netty/PubAckEncoder.java index 7acd5e16..eab4d8bf 100644 --- a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PubAckEncoder.java +++ b/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; /** * diff --git a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PubCompDecoder.java b/netty_parser/src/main/java/org/eclipse/moquette/parser/netty/PubCompDecoder.java similarity index 82% rename from netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PubCompDecoder.java rename to netty_parser/src/main/java/org/eclipse/moquette/parser/netty/PubCompDecoder.java index bb467f7c..5b439fac 100644 --- a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PubCompDecoder.java +++ b/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; /** diff --git a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PubCompEncoder.java b/netty_parser/src/main/java/org/eclipse/moquette/parser/netty/PubCompEncoder.java similarity index 86% rename from netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PubCompEncoder.java rename to netty_parser/src/main/java/org/eclipse/moquette/parser/netty/PubCompEncoder.java index 07b0866a..08d40506 100644 --- a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PubCompEncoder.java +++ b/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; /** * diff --git a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PubRecDecoder.java b/netty_parser/src/main/java/org/eclipse/moquette/parser/netty/PubRecDecoder.java similarity index 82% rename from netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PubRecDecoder.java rename to netty_parser/src/main/java/org/eclipse/moquette/parser/netty/PubRecDecoder.java index 4a5c7d7a..7c772b70 100644 --- a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PubRecDecoder.java +++ b/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; /** * diff --git a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PubRecEncoder.java b/netty_parser/src/main/java/org/eclipse/moquette/parser/netty/PubRecEncoder.java similarity index 86% rename from netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PubRecEncoder.java rename to netty_parser/src/main/java/org/eclipse/moquette/parser/netty/PubRecEncoder.java index ce788133..3a256579 100644 --- a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PubRecEncoder.java +++ b/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; /** * diff --git a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PubRelDecoder.java b/netty_parser/src/main/java/org/eclipse/moquette/parser/netty/PubRelDecoder.java similarity index 88% rename from netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PubRelDecoder.java rename to netty_parser/src/main/java/org/eclipse/moquette/parser/netty/PubRelDecoder.java index b90bc767..8e30d045 100644 --- a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PubRelDecoder.java +++ b/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; /** * diff --git a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PubRelEncoder.java b/netty_parser/src/main/java/org/eclipse/moquette/parser/netty/PubRelEncoder.java similarity index 86% rename from netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PubRelEncoder.java rename to netty_parser/src/main/java/org/eclipse/moquette/parser/netty/PubRelEncoder.java index 7fd3cef4..e358ad53 100644 --- a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PubRelEncoder.java +++ b/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; /** * diff --git a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PublishDecoder.java b/netty_parser/src/main/java/org/eclipse/moquette/parser/netty/PublishDecoder.java similarity index 95% rename from netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PublishDecoder.java rename to netty_parser/src/main/java/org/eclipse/moquette/parser/netty/PublishDecoder.java index e06449b7..e80b7ba3 100644 --- a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PublishDecoder.java +++ b/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; diff --git a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PublishEncoder.java b/netty_parser/src/main/java/org/eclipse/moquette/parser/netty/PublishEncoder.java similarity index 93% rename from netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PublishEncoder.java rename to netty_parser/src/main/java/org/eclipse/moquette/parser/netty/PublishEncoder.java index 35191047..0daa20bd 100644 --- a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/PublishEncoder.java +++ b/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; /** * diff --git a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/SubAckDecoder.java b/netty_parser/src/main/java/org/eclipse/moquette/parser/netty/SubAckDecoder.java similarity index 91% rename from netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/SubAckDecoder.java rename to netty_parser/src/main/java/org/eclipse/moquette/parser/netty/SubAckDecoder.java index 52a2294d..bf9f322d 100644 --- a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/SubAckDecoder.java +++ b/netty_parser/src/main/java/org/eclipse/moquette/parser/netty/SubAckDecoder.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.util.AttributeMap; import java.util.List; -import org.dna.mqtt.proto.messages.AbstractMessage; -import org.dna.mqtt.proto.messages.SubAckMessage; +import org.eclipse.moquette.proto.messages.AbstractMessage; +import org.eclipse.moquette.proto.messages.SubAckMessage; /** * diff --git a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/SubAckEncoder.java b/netty_parser/src/main/java/org/eclipse/moquette/parser/netty/SubAckEncoder.java similarity index 90% rename from netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/SubAckEncoder.java rename to netty_parser/src/main/java/org/eclipse/moquette/parser/netty/SubAckEncoder.java index e1d5fd3b..212667ee 100644 --- a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/SubAckEncoder.java +++ b/netty_parser/src/main/java/org/eclipse/moquette/parser/netty/SubAckEncoder.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.SubAckMessage; +import org.eclipse.moquette.proto.messages.AbstractMessage; +import org.eclipse.moquette.proto.messages.SubAckMessage; /** * diff --git a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/SubscribeDecoder.java b/netty_parser/src/main/java/org/eclipse/moquette/parser/netty/SubscribeDecoder.java similarity index 93% rename from netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/SubscribeDecoder.java rename to netty_parser/src/main/java/org/eclipse/moquette/parser/netty/SubscribeDecoder.java index e87de46c..1522f16b 100644 --- a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/SubscribeDecoder.java +++ b/netty_parser/src/main/java/org/eclipse/moquette/parser/netty/SubscribeDecoder.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.handler.codec.CorruptedFrameException; import io.netty.util.AttributeMap; import java.io.UnsupportedEncodingException; import java.util.List; -import org.dna.mqtt.proto.messages.AbstractMessage.QOSType; -import org.dna.mqtt.proto.messages.SubscribeMessage; +import org.eclipse.moquette.proto.messages.AbstractMessage.QOSType; +import org.eclipse.moquette.proto.messages.SubscribeMessage; /** * diff --git a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/SubscribeEncoder.java b/netty_parser/src/main/java/org/eclipse/moquette/parser/netty/SubscribeEncoder.java similarity index 92% rename from netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/SubscribeEncoder.java rename to netty_parser/src/main/java/org/eclipse/moquette/parser/netty/SubscribeEncoder.java index bd2c1039..8658d71b 100644 --- a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/SubscribeEncoder.java +++ b/netty_parser/src/main/java/org/eclipse/moquette/parser/netty/SubscribeEncoder.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.SubscribeMessage; +import org.eclipse.moquette.proto.messages.AbstractMessage; +import org.eclipse.moquette.proto.messages.SubscribeMessage; /** * diff --git a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/UnsubAckDecoder.java b/netty_parser/src/main/java/org/eclipse/moquette/parser/netty/UnsubAckDecoder.java similarity index 82% rename from netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/UnsubAckDecoder.java rename to netty_parser/src/main/java/org/eclipse/moquette/parser/netty/UnsubAckDecoder.java index eaaf5e33..fda79342 100644 --- a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/UnsubAckDecoder.java +++ b/netty_parser/src/main/java/org/eclipse/moquette/parser/netty/UnsubAckDecoder.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.UnsubAckMessage; +import org.eclipse.moquette.proto.messages.MessageIDMessage; +import org.eclipse.moquette.proto.messages.UnsubAckMessage; /** * diff --git a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/UnsubAckEncoder.java b/netty_parser/src/main/java/org/eclipse/moquette/parser/netty/UnsubAckEncoder.java similarity index 86% rename from netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/UnsubAckEncoder.java rename to netty_parser/src/main/java/org/eclipse/moquette/parser/netty/UnsubAckEncoder.java index 16293855..5fac051a 100644 --- a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/UnsubAckEncoder.java +++ b/netty_parser/src/main/java/org/eclipse/moquette/parser/netty/UnsubAckEncoder.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.UnsubAckMessage; +import org.eclipse.moquette.proto.messages.AbstractMessage; +import org.eclipse.moquette.proto.messages.UnsubAckMessage; /** * diff --git a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/UnsubscribeDecoder.java b/netty_parser/src/main/java/org/eclipse/moquette/parser/netty/UnsubscribeDecoder.java similarity index 92% rename from netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/UnsubscribeDecoder.java rename to netty_parser/src/main/java/org/eclipse/moquette/parser/netty/UnsubscribeDecoder.java index d9e0a450..083499c2 100644 --- a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/UnsubscribeDecoder.java +++ b/netty_parser/src/main/java/org/eclipse/moquette/parser/netty/UnsubscribeDecoder.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.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.UnsubscribeMessage; +import org.eclipse.moquette.proto.messages.AbstractMessage; +import org.eclipse.moquette.proto.messages.UnsubscribeMessage; /** * diff --git a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/UnsubscribeEncoder.java b/netty_parser/src/main/java/org/eclipse/moquette/parser/netty/UnsubscribeEncoder.java similarity index 92% rename from netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/UnsubscribeEncoder.java rename to netty_parser/src/main/java/org/eclipse/moquette/parser/netty/UnsubscribeEncoder.java index 9d24472b..5085da4d 100644 --- a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/UnsubscribeEncoder.java +++ b/netty_parser/src/main/java/org/eclipse/moquette/parser/netty/UnsubscribeEncoder.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.UnsubscribeMessage; +import org.eclipse.moquette.proto.messages.AbstractMessage; +import org.eclipse.moquette.proto.messages.UnsubscribeMessage; /** diff --git a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/Utils.java b/netty_parser/src/main/java/org/eclipse/moquette/parser/netty/Utils.java similarity index 98% rename from netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/Utils.java rename to netty_parser/src/main/java/org/eclipse/moquette/parser/netty/Utils.java index 3a300591..2b2f9123 100644 --- a/netty_parser/src/main/java/org/dna/mqtt/moquette/parser/netty/Utils.java +++ b/netty_parser/src/main/java/org/eclipse/moquette/parser/netty/Utils.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.buffer.Unpooled; @@ -21,7 +21,7 @@ import io.netty.handler.codec.CorruptedFrameException; import io.netty.util.Attribute; import io.netty.util.AttributeMap; import java.io.UnsupportedEncodingException; -import org.dna.mqtt.proto.messages.AbstractMessage; +import org.eclipse.moquette.proto.messages.AbstractMessage; import org.slf4j.LoggerFactory; /** diff --git a/netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/ConnAckDecoderTest.java b/netty_parser/src/test/java/org/eclipse/moquette/parser/netty/ConnAckDecoderTest.java similarity index 92% rename from netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/ConnAckDecoderTest.java rename to netty_parser/src/test/java/org/eclipse/moquette/parser/netty/ConnAckDecoderTest.java index 86cacb8a..b8bb1b15 100644 --- a/netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/ConnAckDecoderTest.java +++ b/netty_parser/src/test/java/org/eclipse/moquette/parser/netty/ConnAckDecoderTest.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.buffer.Unpooled; import java.util.ArrayList; import java.util.List; -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; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; diff --git a/netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/ConnAckEncoderTest.java b/netty_parser/src/test/java/org/eclipse/moquette/parser/netty/ConnAckEncoderTest.java similarity index 95% rename from netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/ConnAckEncoderTest.java rename to netty_parser/src/test/java/org/eclipse/moquette/parser/netty/ConnAckEncoderTest.java index b7fb2de5..969e3316 100644 --- a/netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/ConnAckEncoderTest.java +++ b/netty_parser/src/test/java/org/eclipse/moquette/parser/netty/ConnAckEncoderTest.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.buffer.ByteBufAllocator; import io.netty.buffer.Unpooled; import io.netty.buffer.UnpooledByteBufAllocator; import io.netty.channel.ChannelHandlerContext; -import org.dna.mqtt.proto.messages.ConnAckMessage; +import org.eclipse.moquette.proto.messages.ConnAckMessage; import org.junit.Before; import org.junit.Test; import static org.junit.Assert.*; diff --git a/netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/ConnectDecoderTest.java b/netty_parser/src/test/java/org/eclipse/moquette/parser/netty/ConnectDecoderTest.java similarity index 97% rename from netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/ConnectDecoderTest.java rename to netty_parser/src/test/java/org/eclipse/moquette/parser/netty/ConnectDecoderTest.java index 3527700e..01210ce8 100644 --- a/netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/ConnectDecoderTest.java +++ b/netty_parser/src/test/java/org/eclipse/moquette/parser/netty/ConnectDecoderTest.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.buffer.Unpooled; @@ -24,10 +24,10 @@ import io.netty.util.DefaultAttributeMap; import java.io.UnsupportedEncodingException; import java.util.ArrayList; 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; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; diff --git a/netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/ConnectEncoderTest.java b/netty_parser/src/test/java/org/eclipse/moquette/parser/netty/ConnectEncoderTest.java similarity index 96% rename from netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/ConnectEncoderTest.java rename to netty_parser/src/test/java/org/eclipse/moquette/parser/netty/ConnectEncoderTest.java index 4bdf3a6d..4167f3da 100644 --- a/netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/ConnectEncoderTest.java +++ b/netty_parser/src/test/java/org/eclipse/moquette/parser/netty/ConnectEncoderTest.java @@ -13,16 +13,16 @@ * * 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.channel.ChannelHandlerContext; -import org.dna.mqtt.proto.messages.ConnectMessage; +import org.eclipse.moquette.proto.messages.ConnectMessage; import org.junit.Test; import org.junit.Before; import static org.junit.Assert.*; -import static org.dna.mqtt.moquette.parser.netty.TestUtils.*; +import static org.eclipse.moquette.parser.netty.TestUtils.*; /** diff --git a/netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/PubAckDecoderTest.java b/netty_parser/src/test/java/org/eclipse/moquette/parser/netty/PubAckDecoderTest.java similarity index 92% rename from netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/PubAckDecoderTest.java rename to netty_parser/src/test/java/org/eclipse/moquette/parser/netty/PubAckDecoderTest.java index 8a971dcf..eb87caf2 100644 --- a/netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/PubAckDecoderTest.java +++ b/netty_parser/src/test/java/org/eclipse/moquette/parser/netty/PubAckDecoderTest.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.buffer.Unpooled; import java.util.ArrayList; import java.util.List; -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; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; diff --git a/netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/PubAckEncoderTest.java b/netty_parser/src/test/java/org/eclipse/moquette/parser/netty/PubAckEncoderTest.java similarity index 91% rename from netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/PubAckEncoderTest.java rename to netty_parser/src/test/java/org/eclipse/moquette/parser/netty/PubAckEncoderTest.java index 6b95b182..1d179332 100644 --- a/netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/PubAckEncoderTest.java +++ b/netty_parser/src/test/java/org/eclipse/moquette/parser/netty/PubAckEncoderTest.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.buffer.Unpooled; @@ -21,8 +21,8 @@ import io.netty.channel.ChannelHandlerContext; import org.junit.Test; import org.junit.Before; import static org.junit.Assert.*; -import static org.dna.mqtt.moquette.parser.netty.TestUtils.*; -import org.dna.mqtt.proto.messages.PubAckMessage; +import static org.eclipse.moquette.parser.netty.TestUtils.*; +import org.eclipse.moquette.proto.messages.PubAckMessage; /** * diff --git a/netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/PubRelDecoderTest.java b/netty_parser/src/test/java/org/eclipse/moquette/parser/netty/PubRelDecoderTest.java similarity index 95% rename from netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/PubRelDecoderTest.java rename to netty_parser/src/test/java/org/eclipse/moquette/parser/netty/PubRelDecoderTest.java index 7970a0d0..f3f20e0e 100644 --- a/netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/PubRelDecoderTest.java +++ b/netty_parser/src/test/java/org/eclipse/moquette/parser/netty/PubRelDecoderTest.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.buffer.Unpooled; @@ -22,7 +22,7 @@ import io.netty.util.AttributeMap; import io.netty.util.DefaultAttributeMap; import java.util.ArrayList; import java.util.List; -import org.dna.mqtt.proto.messages.AbstractMessage; +import org.eclipse.moquette.proto.messages.AbstractMessage; import org.junit.Test; import static org.junit.Assert.*; import org.junit.Before; diff --git a/netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/PublishDecoderTest.java b/netty_parser/src/test/java/org/eclipse/moquette/parser/netty/PublishDecoderTest.java similarity index 98% rename from netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/PublishDecoderTest.java rename to netty_parser/src/test/java/org/eclipse/moquette/parser/netty/PublishDecoderTest.java index 2bf3c032..7edde60b 100644 --- a/netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/PublishDecoderTest.java +++ b/netty_parser/src/test/java/org/eclipse/moquette/parser/netty/PublishDecoderTest.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.buffer.Unpooled; @@ -24,8 +24,8 @@ import java.nio.Buffer; import java.nio.ByteBuffer; import java.util.ArrayList; 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 static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; diff --git a/netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/PublishEncoderTest.java b/netty_parser/src/test/java/org/eclipse/moquette/parser/netty/PublishEncoderTest.java similarity index 96% rename from netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/PublishEncoderTest.java rename to netty_parser/src/test/java/org/eclipse/moquette/parser/netty/PublishEncoderTest.java index 29009669..0de0469a 100644 --- a/netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/PublishEncoderTest.java +++ b/netty_parser/src/test/java/org/eclipse/moquette/parser/netty/PublishEncoderTest.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.buffer.Unpooled; @@ -22,9 +22,9 @@ import java.nio.ByteBuffer; import org.junit.Before; import org.junit.Test; import static org.junit.Assert.*; -import static org.dna.mqtt.moquette.parser.netty.TestUtils.*; -import org.dna.mqtt.proto.messages.AbstractMessage.QOSType; -import org.dna.mqtt.proto.messages.PublishMessage; +import static org.eclipse.moquette.parser.netty.TestUtils.*; +import org.eclipse.moquette.proto.messages.AbstractMessage.QOSType; +import org.eclipse.moquette.proto.messages.PublishMessage; /** * diff --git a/netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/SubAckDecoderTest.java b/netty_parser/src/test/java/org/eclipse/moquette/parser/netty/SubAckDecoderTest.java similarity index 95% rename from netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/SubAckDecoderTest.java rename to netty_parser/src/test/java/org/eclipse/moquette/parser/netty/SubAckDecoderTest.java index 21d2db23..ec76035e 100644 --- a/netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/SubAckDecoderTest.java +++ b/netty_parser/src/test/java/org/eclipse/moquette/parser/netty/SubAckDecoderTest.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.buffer.Unpooled; import java.util.ArrayList; import java.util.List; -import org.dna.mqtt.proto.messages.AbstractMessage; -import org.dna.mqtt.proto.messages.SubAckMessage; +import org.eclipse.moquette.proto.messages.AbstractMessage; +import org.eclipse.moquette.proto.messages.SubAckMessage; import static org.junit.Assert.*; import org.junit.Before; import org.junit.Test; diff --git a/netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/SubAckEncoderTest.java b/netty_parser/src/test/java/org/eclipse/moquette/parser/netty/SubAckEncoderTest.java similarity index 91% rename from netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/SubAckEncoderTest.java rename to netty_parser/src/test/java/org/eclipse/moquette/parser/netty/SubAckEncoderTest.java index db5feab6..94b14655 100644 --- a/netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/SubAckEncoderTest.java +++ b/netty_parser/src/test/java/org/eclipse/moquette/parser/netty/SubAckEncoderTest.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.buffer.Unpooled; import io.netty.channel.ChannelHandlerContext; -import static org.dna.mqtt.moquette.parser.netty.TestUtils.mockChannelHandler; -import org.dna.mqtt.proto.messages.AbstractMessage; -import org.dna.mqtt.proto.messages.SubAckMessage; +import static org.eclipse.moquette.parser.netty.TestUtils.mockChannelHandler; +import org.eclipse.moquette.proto.messages.AbstractMessage; +import org.eclipse.moquette.proto.messages.SubAckMessage; import static org.junit.Assert.assertEquals; import org.junit.Before; import org.junit.Test; diff --git a/netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/SubscribeDecoderTest.java b/netty_parser/src/test/java/org/eclipse/moquette/parser/netty/SubscribeDecoderTest.java similarity index 96% rename from netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/SubscribeDecoderTest.java rename to netty_parser/src/test/java/org/eclipse/moquette/parser/netty/SubscribeDecoderTest.java index a78d5377..693de911 100644 --- a/netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/SubscribeDecoderTest.java +++ b/netty_parser/src/test/java/org/eclipse/moquette/parser/netty/SubscribeDecoderTest.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 java.util.ArrayList; import java.util.List; -import org.dna.mqtt.proto.messages.AbstractMessage; -import org.dna.mqtt.proto.messages.SubscribeMessage; +import org.eclipse.moquette.proto.messages.AbstractMessage; +import org.eclipse.moquette.proto.messages.SubscribeMessage; import static org.junit.Assert.*; import org.junit.Before; import org.junit.Test; diff --git a/netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/SubscribeEncoderTest.java b/netty_parser/src/test/java/org/eclipse/moquette/parser/netty/SubscribeEncoderTest.java similarity index 92% rename from netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/SubscribeEncoderTest.java rename to netty_parser/src/test/java/org/eclipse/moquette/parser/netty/SubscribeEncoderTest.java index 7d5eb749..cffd4f41 100644 --- a/netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/SubscribeEncoderTest.java +++ b/netty_parser/src/test/java/org/eclipse/moquette/parser/netty/SubscribeEncoderTest.java @@ -13,17 +13,17 @@ * * 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.channel.ChannelHandlerContext; -import org.dna.mqtt.proto.messages.AbstractMessage; -import org.dna.mqtt.proto.messages.SubscribeMessage; +import org.eclipse.moquette.proto.messages.AbstractMessage; +import org.eclipse.moquette.proto.messages.SubscribeMessage; import static org.junit.Assert.assertEquals; import org.junit.Before; import org.junit.Test; -import static org.dna.mqtt.moquette.parser.netty.TestUtils.*; +import static org.eclipse.moquette.parser.netty.TestUtils.*; /** * diff --git a/netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/TestUtils.java b/netty_parser/src/test/java/org/eclipse/moquette/parser/netty/TestUtils.java similarity index 98% rename from netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/TestUtils.java rename to netty_parser/src/test/java/org/eclipse/moquette/parser/netty/TestUtils.java index d9b533e6..694d0429 100644 --- a/netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/TestUtils.java +++ b/netty_parser/src/test/java/org/eclipse/moquette/parser/netty/TestUtils.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.buffer.ByteBufAllocator; diff --git a/netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/UnsubscribeDecoderTest.java b/netty_parser/src/test/java/org/eclipse/moquette/parser/netty/UnsubscribeDecoderTest.java similarity index 95% rename from netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/UnsubscribeDecoderTest.java rename to netty_parser/src/test/java/org/eclipse/moquette/parser/netty/UnsubscribeDecoderTest.java index a7b54e66..8b528ae0 100644 --- a/netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/UnsubscribeDecoderTest.java +++ b/netty_parser/src/test/java/org/eclipse/moquette/parser/netty/UnsubscribeDecoderTest.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.buffer.Unpooled; @@ -21,8 +21,8 @@ import io.netty.handler.codec.CorruptedFrameException; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.dna.mqtt.proto.messages.AbstractMessage; -import org.dna.mqtt.proto.messages.UnsubscribeMessage; +import org.eclipse.moquette.proto.messages.AbstractMessage; +import org.eclipse.moquette.proto.messages.UnsubscribeMessage; import static org.junit.Assert.*; import org.junit.Before; import org.junit.Test; diff --git a/netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/UnsubscribeEncoderTest.java b/netty_parser/src/test/java/org/eclipse/moquette/parser/netty/UnsubscribeEncoderTest.java similarity index 93% rename from netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/UnsubscribeEncoderTest.java rename to netty_parser/src/test/java/org/eclipse/moquette/parser/netty/UnsubscribeEncoderTest.java index 8eaf0181..c5c2f53d 100644 --- a/netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/UnsubscribeEncoderTest.java +++ b/netty_parser/src/test/java/org/eclipse/moquette/parser/netty/UnsubscribeEncoderTest.java @@ -13,17 +13,17 @@ * * 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.channel.ChannelHandlerContext; -import org.dna.mqtt.proto.messages.AbstractMessage; -import org.dna.mqtt.proto.messages.UnsubscribeMessage; +import org.eclipse.moquette.proto.messages.AbstractMessage; +import org.eclipse.moquette.proto.messages.UnsubscribeMessage; import static org.junit.Assert.assertEquals; import org.junit.Before; import org.junit.Test; -import static org.dna.mqtt.moquette.parser.netty.TestUtils.*; +import static org.eclipse.moquette.parser.netty.TestUtils.*; /** * diff --git a/netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/UtilsTest.java b/netty_parser/src/test/java/org/eclipse/moquette/parser/netty/UtilsTest.java similarity index 94% rename from netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/UtilsTest.java rename to netty_parser/src/test/java/org/eclipse/moquette/parser/netty/UtilsTest.java index b123e543..226153f5 100644 --- a/netty_parser/src/test/java/org/dna/mqtt/moquette/parser/netty/UtilsTest.java +++ b/netty_parser/src/test/java/org/eclipse/moquette/parser/netty/UtilsTest.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.buffer.Unpooled; @@ -21,9 +21,9 @@ import io.netty.handler.codec.CorruptedFrameException; import org.junit.Before; import org.junit.Test; import static org.junit.Assert.*; -import static org.dna.mqtt.moquette.parser.netty.TestUtils.*; -import org.dna.mqtt.proto.messages.AbstractMessage; -import org.dna.mqtt.proto.messages.UnsubscribeMessage; +import static org.eclipse.moquette.parser.netty.TestUtils.*; +import org.eclipse.moquette.proto.messages.AbstractMessage; +import org.eclipse.moquette.proto.messages.UnsubscribeMessage; /** * diff --git a/parser_commons/src/main/java/org/eclipse/eclipse/commons/Constants.java b/parser_commons/src/main/java/org/eclipse/moquette/commons/Constants.java similarity index 100% rename from parser_commons/src/main/java/org/eclipse/eclipse/commons/Constants.java rename to parser_commons/src/main/java/org/eclipse/moquette/commons/Constants.java diff --git a/parser_commons/src/main/java/org/eclipse/eclipse/proto/MQTTException.java b/parser_commons/src/main/java/org/eclipse/moquette/proto/MQTTException.java similarity index 100% rename from parser_commons/src/main/java/org/eclipse/eclipse/proto/MQTTException.java rename to parser_commons/src/main/java/org/eclipse/moquette/proto/MQTTException.java diff --git a/parser_commons/src/main/java/org/eclipse/eclipse/proto/Utils.java b/parser_commons/src/main/java/org/eclipse/moquette/proto/Utils.java similarity index 100% rename from parser_commons/src/main/java/org/eclipse/eclipse/proto/Utils.java rename to parser_commons/src/main/java/org/eclipse/moquette/proto/Utils.java diff --git a/parser_commons/src/main/java/org/eclipse/eclipse/proto/messages/AbstractMessage.java b/parser_commons/src/main/java/org/eclipse/moquette/proto/messages/AbstractMessage.java similarity index 100% rename from parser_commons/src/main/java/org/eclipse/eclipse/proto/messages/AbstractMessage.java rename to parser_commons/src/main/java/org/eclipse/moquette/proto/messages/AbstractMessage.java diff --git a/parser_commons/src/main/java/org/eclipse/eclipse/proto/messages/ConnAckMessage.java b/parser_commons/src/main/java/org/eclipse/moquette/proto/messages/ConnAckMessage.java similarity index 100% rename from parser_commons/src/main/java/org/eclipse/eclipse/proto/messages/ConnAckMessage.java rename to parser_commons/src/main/java/org/eclipse/moquette/proto/messages/ConnAckMessage.java diff --git a/parser_commons/src/main/java/org/eclipse/eclipse/proto/messages/ConnectMessage.java b/parser_commons/src/main/java/org/eclipse/moquette/proto/messages/ConnectMessage.java similarity index 100% rename from parser_commons/src/main/java/org/eclipse/eclipse/proto/messages/ConnectMessage.java rename to parser_commons/src/main/java/org/eclipse/moquette/proto/messages/ConnectMessage.java diff --git a/parser_commons/src/main/java/org/eclipse/eclipse/proto/messages/DisconnectMessage.java b/parser_commons/src/main/java/org/eclipse/moquette/proto/messages/DisconnectMessage.java similarity index 100% rename from parser_commons/src/main/java/org/eclipse/eclipse/proto/messages/DisconnectMessage.java rename to parser_commons/src/main/java/org/eclipse/moquette/proto/messages/DisconnectMessage.java diff --git a/parser_commons/src/main/java/org/eclipse/eclipse/proto/messages/MessageIDMessage.java b/parser_commons/src/main/java/org/eclipse/moquette/proto/messages/MessageIDMessage.java similarity index 100% rename from parser_commons/src/main/java/org/eclipse/eclipse/proto/messages/MessageIDMessage.java rename to parser_commons/src/main/java/org/eclipse/moquette/proto/messages/MessageIDMessage.java diff --git a/parser_commons/src/main/java/org/eclipse/eclipse/proto/messages/PingReqMessage.java b/parser_commons/src/main/java/org/eclipse/moquette/proto/messages/PingReqMessage.java similarity index 100% rename from parser_commons/src/main/java/org/eclipse/eclipse/proto/messages/PingReqMessage.java rename to parser_commons/src/main/java/org/eclipse/moquette/proto/messages/PingReqMessage.java diff --git a/parser_commons/src/main/java/org/eclipse/eclipse/proto/messages/PingRespMessage.java b/parser_commons/src/main/java/org/eclipse/moquette/proto/messages/PingRespMessage.java similarity index 100% rename from parser_commons/src/main/java/org/eclipse/eclipse/proto/messages/PingRespMessage.java rename to parser_commons/src/main/java/org/eclipse/moquette/proto/messages/PingRespMessage.java diff --git a/parser_commons/src/main/java/org/eclipse/eclipse/proto/messages/PubAckMessage.java b/parser_commons/src/main/java/org/eclipse/moquette/proto/messages/PubAckMessage.java similarity index 100% rename from parser_commons/src/main/java/org/eclipse/eclipse/proto/messages/PubAckMessage.java rename to parser_commons/src/main/java/org/eclipse/moquette/proto/messages/PubAckMessage.java diff --git a/parser_commons/src/main/java/org/eclipse/eclipse/proto/messages/PubCompMessage.java b/parser_commons/src/main/java/org/eclipse/moquette/proto/messages/PubCompMessage.java similarity index 100% rename from parser_commons/src/main/java/org/eclipse/eclipse/proto/messages/PubCompMessage.java rename to parser_commons/src/main/java/org/eclipse/moquette/proto/messages/PubCompMessage.java diff --git a/parser_commons/src/main/java/org/eclipse/eclipse/proto/messages/PubRecMessage.java b/parser_commons/src/main/java/org/eclipse/moquette/proto/messages/PubRecMessage.java similarity index 100% rename from parser_commons/src/main/java/org/eclipse/eclipse/proto/messages/PubRecMessage.java rename to parser_commons/src/main/java/org/eclipse/moquette/proto/messages/PubRecMessage.java diff --git a/parser_commons/src/main/java/org/eclipse/eclipse/proto/messages/PubRelMessage.java b/parser_commons/src/main/java/org/eclipse/moquette/proto/messages/PubRelMessage.java similarity index 100% rename from parser_commons/src/main/java/org/eclipse/eclipse/proto/messages/PubRelMessage.java rename to parser_commons/src/main/java/org/eclipse/moquette/proto/messages/PubRelMessage.java diff --git a/parser_commons/src/main/java/org/eclipse/eclipse/proto/messages/PublishMessage.java b/parser_commons/src/main/java/org/eclipse/moquette/proto/messages/PublishMessage.java similarity index 100% rename from parser_commons/src/main/java/org/eclipse/eclipse/proto/messages/PublishMessage.java rename to parser_commons/src/main/java/org/eclipse/moquette/proto/messages/PublishMessage.java diff --git a/parser_commons/src/main/java/org/eclipse/eclipse/proto/messages/SubAckMessage.java b/parser_commons/src/main/java/org/eclipse/moquette/proto/messages/SubAckMessage.java similarity index 100% rename from parser_commons/src/main/java/org/eclipse/eclipse/proto/messages/SubAckMessage.java rename to parser_commons/src/main/java/org/eclipse/moquette/proto/messages/SubAckMessage.java diff --git a/parser_commons/src/main/java/org/eclipse/eclipse/proto/messages/SubscribeMessage.java b/parser_commons/src/main/java/org/eclipse/moquette/proto/messages/SubscribeMessage.java similarity index 100% rename from parser_commons/src/main/java/org/eclipse/eclipse/proto/messages/SubscribeMessage.java rename to parser_commons/src/main/java/org/eclipse/moquette/proto/messages/SubscribeMessage.java diff --git a/parser_commons/src/main/java/org/eclipse/eclipse/proto/messages/UnsubAckMessage.java b/parser_commons/src/main/java/org/eclipse/moquette/proto/messages/UnsubAckMessage.java similarity index 100% rename from parser_commons/src/main/java/org/eclipse/eclipse/proto/messages/UnsubAckMessage.java rename to parser_commons/src/main/java/org/eclipse/moquette/proto/messages/UnsubAckMessage.java diff --git a/parser_commons/src/main/java/org/eclipse/eclipse/proto/messages/UnsubscribeMessage.java b/parser_commons/src/main/java/org/eclipse/moquette/proto/messages/UnsubscribeMessage.java similarity index 100% rename from parser_commons/src/main/java/org/eclipse/eclipse/proto/messages/UnsubscribeMessage.java rename to parser_commons/src/main/java/org/eclipse/moquette/proto/messages/UnsubscribeMessage.java diff --git a/parser_commons/src/main/java/org/eclipse/eclipse/proto/messages/ZeroLengthMessage.java b/parser_commons/src/main/java/org/eclipse/moquette/proto/messages/ZeroLengthMessage.java similarity index 100% rename from parser_commons/src/main/java/org/eclipse/eclipse/proto/messages/ZeroLengthMessage.java rename to parser_commons/src/main/java/org/eclipse/moquette/proto/messages/ZeroLengthMessage.java diff --git a/pom.xml b/pom.xml index eb07919a..11c90421 100644 --- a/pom.xml +++ b/pom.xml @@ -55,7 +55,7 @@ - org.dna.mqtt.moquette.server.Server + org.eclipse.moquette.server.Server diff --git a/tools_scripts/brokerEmbeddedTest.groovy b/tools_scripts/brokerEmbeddedTest.groovy index 14785609..da08f1a9 100644 --- a/tools_scripts/brokerEmbeddedTest.groovy +++ b/tools_scripts/brokerEmbeddedTest.groovy @@ -1,7 +1,7 @@ @GrabResolver(name='moquette-bintray', root='http://dl.bintray.com/andsel/maven/') @Grab(group='org.dna.mqtt', module='moquette-broker', version='0.6') -import org.dna.mqtt.moquette.server.Server +import org.eclipse.moquette.server.Server println "Starting broker in embedded mode" Server server = new Server()