Moved parser_commons submodule to org.eclipse.moquette

This commit is contained in:
andrea
2014-10-05 10:53:45 +02:00
parent af79794300
commit a599c38537
93 changed files with 164 additions and 169 deletions
@@ -18,7 +18,7 @@ package org.dna.mqtt.moquette.messaging.spi;
import java.io.Serializable;
import java.nio.ByteBuffer;
import org.dna.mqtt.moquette.messaging.spi.impl.events.PublishEvent;
import org.dna.mqtt.moquette.proto.messages.AbstractMessage;
import org.dna.mqtt.proto.messages.AbstractMessage;
import java.util.Collection;
import java.util.List;
@@ -15,7 +15,7 @@
*/
package org.dna.mqtt.moquette.messaging.spi;
import org.dna.mqtt.moquette.proto.messages.AbstractMessage;
import org.dna.mqtt.proto.messages.AbstractMessage;
import org.dna.mqtt.moquette.server.ServerChannel;
/**
@@ -18,7 +18,7 @@ package org.dna.mqtt.moquette.messaging.spi.impl;
import java.lang.reflect.Method;
import java.util.HashMap;
import java.util.Map;
import org.dna.mqtt.moquette.proto.messages.AbstractMessage;
import org.dna.mqtt.proto.messages.AbstractMessage;
import org.dna.mqtt.moquette.server.ServerChannel;
/**
@@ -22,7 +22,7 @@ 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.moquette.proto.messages.AbstractMessage;
import org.dna.mqtt.proto.messages.AbstractMessage;
import org.dna.mqtt.moquette.messaging.spi.ISessionsStore;
import org.slf4j.Logger;
@@ -36,20 +36,20 @@ 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.moquette.proto.messages.AbstractMessage;
import org.dna.mqtt.moquette.proto.messages.AbstractMessage.QOSType;
import org.dna.mqtt.moquette.proto.messages.ConnAckMessage;
import org.dna.mqtt.moquette.proto.messages.ConnectMessage;
import org.dna.mqtt.moquette.proto.messages.DisconnectMessage;
import org.dna.mqtt.moquette.proto.messages.PubAckMessage;
import org.dna.mqtt.moquette.proto.messages.PubCompMessage;
import org.dna.mqtt.moquette.proto.messages.PubRecMessage;
import org.dna.mqtt.moquette.proto.messages.PubRelMessage;
import org.dna.mqtt.moquette.proto.messages.PublishMessage;
import org.dna.mqtt.moquette.proto.messages.SubAckMessage;
import org.dna.mqtt.moquette.proto.messages.SubscribeMessage;
import org.dna.mqtt.moquette.proto.messages.UnsubAckMessage;
import org.dna.mqtt.moquette.proto.messages.UnsubscribeMessage;
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;
@@ -31,7 +31,7 @@ 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.moquette.proto.messages.*;
import org.dna.mqtt.proto.messages.*;
import org.dna.mqtt.moquette.server.IAuthenticator;
import org.dna.mqtt.moquette.server.ServerChannel;
import org.slf4j.Logger;
@@ -15,7 +15,7 @@
*/
package org.dna.mqtt.moquette.messaging.spi.impl.events;
import org.dna.mqtt.moquette.proto.messages.AbstractMessage;
import org.dna.mqtt.proto.messages.AbstractMessage;
import org.dna.mqtt.moquette.server.ServerChannel;
/**
@@ -15,8 +15,8 @@
*/
package org.dna.mqtt.moquette.messaging.spi.impl.events;
import org.dna.mqtt.moquette.proto.Utils;
import org.dna.mqtt.moquette.proto.messages.AbstractMessage;
import org.dna.mqtt.proto.Utils;
import org.dna.mqtt.proto.messages.AbstractMessage;
import org.dna.mqtt.moquette.server.ServerChannel;
/**
@@ -15,10 +15,9 @@
*/
package org.dna.mqtt.moquette.messaging.spi.impl.events;
import org.dna.mqtt.moquette.proto.messages.AbstractMessage.QOSType;
import org.dna.mqtt.proto.messages.AbstractMessage.QOSType;
import java.nio.ByteBuffer;
import org.dna.mqtt.moquette.proto.messages.PublishMessage;
/**
*
@@ -18,7 +18,7 @@ package org.dna.mqtt.moquette.messaging.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.moquette.proto.messages.AbstractMessage.QOSType;
import org.dna.mqtt.proto.messages.AbstractMessage.QOSType;
/**
* Publish event serialized to the DB.
@@ -16,7 +16,7 @@
package org.dna.mqtt.moquette.messaging.spi.impl.subscriptions;
import java.io.Serializable;
import org.dna.mqtt.moquette.proto.messages.AbstractMessage.QOSType;
import org.dna.mqtt.proto.messages.AbstractMessage.QOSType;
/**
* Maintain the information about which Topic a certain ClientID is subscribed
@@ -16,14 +16,14 @@
package org.dna.mqtt.moquette.messaging.spi.persistence;
import org.dna.mqtt.moquette.MQTTException;
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.moquette.proto.messages.AbstractMessage;
import org.dna.mqtt.proto.messages.AbstractMessage;
import static org.dna.mqtt.moquette.server.Server.STORAGE_FILE_PATH;
import org.mapdb.DB;
import org.mapdb.DBMaker;
@@ -21,10 +21,10 @@ 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.moquette.proto.Utils;
import org.dna.mqtt.moquette.proto.messages.AbstractMessage;
import static org.dna.mqtt.moquette.proto.messages.AbstractMessage.*;
import org.dna.mqtt.moquette.proto.messages.PingRespMessage;
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.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -15,8 +15,8 @@
*/
package org.dna.mqtt.moquette.messaging.spi.impl;
import org.dna.mqtt.moquette.proto.messages.ConnAckMessage;
import org.dna.mqtt.moquette.proto.messages.ConnectMessage;
import org.dna.mqtt.proto.messages.ConnAckMessage;
import org.dna.mqtt.proto.messages.ConnectMessage;
import org.dna.mqtt.moquette.server.ServerChannel;
import static org.junit.Assert.*;
import org.junit.Before;
@@ -19,7 +19,7 @@ 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.moquette.proto.messages.AbstractMessage;
import org.dna.mqtt.proto.messages.AbstractMessage;
import org.dna.mqtt.moquette.server.Server;
import org.junit.After;
import org.junit.Test;
@@ -18,7 +18,6 @@ package org.dna.mqtt.moquette.messaging.spi.impl;
import java.nio.ByteBuffer;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -30,14 +29,14 @@ 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.moquette.proto.messages.AbstractMessage;
import org.dna.mqtt.moquette.proto.messages.AbstractMessage.QOSType;
import org.dna.mqtt.moquette.proto.messages.ConnAckMessage;
import org.dna.mqtt.moquette.proto.messages.ConnectMessage;
import org.dna.mqtt.moquette.proto.messages.DisconnectMessage;
import org.dna.mqtt.moquette.proto.messages.PublishMessage;
import org.dna.mqtt.moquette.proto.messages.SubAckMessage;
import org.dna.mqtt.moquette.proto.messages.SubscribeMessage;
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 static org.junit.Assert.*;
@@ -21,7 +21,7 @@ import java.util.Arrays;
import java.util.List;
import org.dna.mqtt.moquette.messaging.spi.impl.MemoryStorageService;
import org.dna.mqtt.moquette.proto.messages.AbstractMessage;
import org.dna.mqtt.proto.messages.AbstractMessage;
import static org.junit.Assert.*;
import org.junit.Before;
@@ -19,10 +19,10 @@ import java.io.File;
import java.io.IOException;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import org.dna.mqtt.moquette.proto.messages.AbstractMessage;
import org.dna.mqtt.moquette.proto.messages.AbstractMessage.QOSType;
import org.dna.mqtt.moquette.proto.messages.ConnAckMessage;
import org.dna.mqtt.moquette.proto.messages.ConnectMessage;
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.fusesource.mqtt.client.BlockingConnection;
import org.fusesource.mqtt.client.MQTT;
@@ -24,11 +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 java.util.concurrent.Callable;
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.moquette.proto.messages.AbstractMessage;
import org.dna.mqtt.proto.messages.AbstractMessage;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -18,8 +18,8 @@ package org.dna.mqtt.moquette.testclient;
import io.netty.channel.ChannelHandler;
import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.ChannelInboundHandlerAdapter;
import org.dna.mqtt.moquette.proto.Utils;
import org.dna.mqtt.moquette.proto.messages.AbstractMessage;
import org.dna.mqtt.proto.Utils;
import org.dna.mqtt.proto.messages.AbstractMessage;
import org.dna.mqtt.moquette.server.netty.NettyMQTTHandler;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+1 -1
View File
@@ -189,7 +189,7 @@
<!--org.apache.commons.logging,-->
<!--org.dna.mqtt.moquette.messaging.spi.impl.storage,-->
<!--org.dna.mqtt.moquette.messaging.spi.impl.subscriptions,-->
org.dna.mqtt.moquette.proto.messages.*,
org.dna.mqtt.proto.messages.*,
org.dna.mqtt.moquette.server.netty.metrics
</Export-Package>
<Private-Package>org.dna.mqtt.moquette.bundle,
@@ -3,7 +3,7 @@ package org.dna.mqtt.moquette.parser.netty;
import io.netty.buffer.ByteBuf;
import io.netty.util.AttributeMap;
import java.util.List;
import org.dna.mqtt.moquette.proto.messages.ConnAckMessage;
import org.dna.mqtt.proto.messages.ConnAckMessage;
/**
*
@@ -17,8 +17,8 @@ package org.dna.mqtt.moquette.parser.netty;
import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext;
import org.dna.mqtt.moquette.proto.messages.AbstractMessage;
import org.dna.mqtt.moquette.proto.messages.ConnAckMessage;
import org.dna.mqtt.proto.messages.AbstractMessage;
import org.dna.mqtt.proto.messages.ConnAckMessage;
/**
*
@@ -16,7 +16,6 @@
package org.dna.mqtt.moquette.parser.netty;
import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext;
import io.netty.handler.codec.CorruptedFrameException;
import io.netty.util.Attribute;
import io.netty.util.AttributeKey;
@@ -25,8 +24,8 @@ 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.moquette.proto.messages.AbstractMessage;
import org.dna.mqtt.moquette.proto.messages.ConnectMessage;
import org.dna.mqtt.proto.messages.AbstractMessage;
import org.dna.mqtt.proto.messages.ConnectMessage;
/**
*
@@ -17,8 +17,8 @@ package org.dna.mqtt.moquette.parser.netty;
import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext;
import org.dna.mqtt.moquette.proto.messages.AbstractMessage;
import org.dna.mqtt.moquette.proto.messages.ConnectMessage;
import org.dna.mqtt.proto.messages.AbstractMessage;
import org.dna.mqtt.proto.messages.ConnectMessage;
/**
*
@@ -19,7 +19,7 @@ import io.netty.buffer.ByteBuf;
import io.netty.handler.codec.CorruptedFrameException;
import io.netty.util.AttributeMap;
import java.util.List;
import org.dna.mqtt.moquette.proto.messages.AbstractMessage;
import org.dna.mqtt.proto.messages.AbstractMessage;
/**
*
@@ -17,7 +17,7 @@ package org.dna.mqtt.moquette.parser.netty;
import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext;
import org.dna.mqtt.moquette.proto.messages.AbstractMessage;
import org.dna.mqtt.proto.messages.AbstractMessage;
/**
*
@@ -18,7 +18,7 @@ package org.dna.mqtt.moquette.parser.netty;
import io.netty.buffer.ByteBuf;
import io.netty.util.AttributeMap;
import java.util.List;
import org.dna.mqtt.moquette.proto.messages.DisconnectMessage;
import org.dna.mqtt.proto.messages.DisconnectMessage;
/**
*
@@ -17,8 +17,8 @@ package org.dna.mqtt.moquette.parser.netty;
import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext;
import org.dna.mqtt.moquette.proto.messages.AbstractMessage;
import org.dna.mqtt.moquette.proto.messages.DisconnectMessage;
import org.dna.mqtt.proto.messages.AbstractMessage;
import org.dna.mqtt.proto.messages.DisconnectMessage;
/**
*
@@ -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.moquette.proto.messages.AbstractMessage;
import org.dna.mqtt.proto.messages.AbstractMessage;
/**
*
@@ -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.moquette.proto.messages.AbstractMessage;
import org.dna.mqtt.proto.messages.AbstractMessage;
/**
*
@@ -18,7 +18,7 @@ package org.dna.mqtt.moquette.parser.netty;
import io.netty.buffer.ByteBuf;
import io.netty.util.AttributeMap;
import java.util.List;
import org.dna.mqtt.moquette.proto.messages.MessageIDMessage;
import org.dna.mqtt.proto.messages.MessageIDMessage;
/**
*
@@ -18,7 +18,7 @@ package org.dna.mqtt.moquette.parser.netty;
import io.netty.buffer.ByteBuf;
import io.netty.util.AttributeMap;
import java.util.List;
import org.dna.mqtt.moquette.proto.messages.PingReqMessage;
import org.dna.mqtt.proto.messages.PingReqMessage;
/**
*
@@ -17,8 +17,8 @@ package org.dna.mqtt.moquette.parser.netty;
import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext;
import org.dna.mqtt.moquette.proto.messages.AbstractMessage;
import org.dna.mqtt.moquette.proto.messages.PingReqMessage;
import org.dna.mqtt.proto.messages.AbstractMessage;
import org.dna.mqtt.proto.messages.PingReqMessage;
/**
*
@@ -18,7 +18,7 @@ package org.dna.mqtt.moquette.parser.netty;
import io.netty.buffer.ByteBuf;
import io.netty.util.AttributeMap;
import java.util.List;
import org.dna.mqtt.moquette.proto.messages.PingRespMessage;
import org.dna.mqtt.proto.messages.PingRespMessage;
/**
*
@@ -17,8 +17,8 @@ package org.dna.mqtt.moquette.parser.netty;
import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext;
import org.dna.mqtt.moquette.proto.messages.AbstractMessage;
import org.dna.mqtt.moquette.proto.messages.PingRespMessage;
import org.dna.mqtt.proto.messages.AbstractMessage;
import org.dna.mqtt.proto.messages.PingRespMessage;
/**
*
@@ -15,8 +15,8 @@
*/
package org.dna.mqtt.moquette.parser.netty;
import org.dna.mqtt.moquette.proto.messages.MessageIDMessage;
import org.dna.mqtt.moquette.proto.messages.PubAckMessage;
import org.dna.mqtt.proto.messages.MessageIDMessage;
import org.dna.mqtt.proto.messages.PubAckMessage;
/**
*
@@ -17,8 +17,8 @@ package org.dna.mqtt.moquette.parser.netty;
import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext;
import org.dna.mqtt.moquette.proto.messages.AbstractMessage;
import org.dna.mqtt.moquette.proto.messages.PubAckMessage;
import org.dna.mqtt.proto.messages.AbstractMessage;
import org.dna.mqtt.proto.messages.PubAckMessage;
/**
*
@@ -15,8 +15,8 @@
*/
package org.dna.mqtt.moquette.parser.netty;
import org.dna.mqtt.moquette.proto.messages.MessageIDMessage;
import org.dna.mqtt.moquette.proto.messages.PubCompMessage;
import org.dna.mqtt.proto.messages.MessageIDMessage;
import org.dna.mqtt.proto.messages.PubCompMessage;
/**
@@ -17,8 +17,8 @@ package org.dna.mqtt.moquette.parser.netty;
import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext;
import org.dna.mqtt.moquette.proto.messages.PubCompMessage;
import org.dna.mqtt.moquette.proto.messages.AbstractMessage;
import org.dna.mqtt.proto.messages.PubCompMessage;
import org.dna.mqtt.proto.messages.AbstractMessage;
/**
*
@@ -15,8 +15,8 @@
*/
package org.dna.mqtt.moquette.parser.netty;
import org.dna.mqtt.moquette.proto.messages.MessageIDMessage;
import org.dna.mqtt.moquette.proto.messages.PubRecMessage;
import org.dna.mqtt.proto.messages.MessageIDMessage;
import org.dna.mqtt.proto.messages.PubRecMessage;
/**
*
@@ -17,8 +17,8 @@ package org.dna.mqtt.moquette.parser.netty;
import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext;
import org.dna.mqtt.moquette.proto.messages.AbstractMessage;
import org.dna.mqtt.moquette.proto.messages.PubRecMessage;
import org.dna.mqtt.proto.messages.AbstractMessage;
import org.dna.mqtt.proto.messages.PubRecMessage;
/**
*
@@ -19,8 +19,8 @@ import io.netty.buffer.ByteBuf;
import io.netty.util.AttributeMap;
import java.io.UnsupportedEncodingException;
import java.util.List;
import org.dna.mqtt.moquette.proto.messages.MessageIDMessage;
import org.dna.mqtt.moquette.proto.messages.PubRelMessage;
import org.dna.mqtt.proto.messages.MessageIDMessage;
import org.dna.mqtt.proto.messages.PubRelMessage;
/**
*
@@ -17,8 +17,8 @@ package org.dna.mqtt.moquette.parser.netty;
import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext;
import org.dna.mqtt.moquette.proto.messages.AbstractMessage;
import org.dna.mqtt.moquette.proto.messages.PubRelMessage;
import org.dna.mqtt.proto.messages.AbstractMessage;
import org.dna.mqtt.proto.messages.PubRelMessage;
/**
*
@@ -17,12 +17,11 @@ package org.dna.mqtt.moquette.parser.netty;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
import io.netty.channel.ChannelHandlerContext;
import io.netty.handler.codec.CorruptedFrameException;
import io.netty.util.AttributeMap;
import java.util.List;
import org.dna.mqtt.moquette.proto.messages.AbstractMessage;
import org.dna.mqtt.moquette.proto.messages.PublishMessage;
import org.dna.mqtt.proto.messages.AbstractMessage;
import org.dna.mqtt.proto.messages.PublishMessage;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -17,8 +17,8 @@ package org.dna.mqtt.moquette.parser.netty;
import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext;
import org.dna.mqtt.moquette.proto.messages.AbstractMessage;
import org.dna.mqtt.moquette.proto.messages.PublishMessage;
import org.dna.mqtt.proto.messages.AbstractMessage;
import org.dna.mqtt.proto.messages.PublishMessage;
/**
*
@@ -18,8 +18,8 @@ package org.dna.mqtt.moquette.parser.netty;
import io.netty.buffer.ByteBuf;
import io.netty.util.AttributeMap;
import java.util.List;
import org.dna.mqtt.moquette.proto.messages.AbstractMessage;
import org.dna.mqtt.moquette.proto.messages.SubAckMessage;
import org.dna.mqtt.proto.messages.AbstractMessage;
import org.dna.mqtt.proto.messages.SubAckMessage;
/**
*
@@ -17,8 +17,8 @@ package org.dna.mqtt.moquette.parser.netty;
import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext;
import org.dna.mqtt.moquette.proto.messages.AbstractMessage;
import org.dna.mqtt.moquette.proto.messages.SubAckMessage;
import org.dna.mqtt.proto.messages.AbstractMessage;
import org.dna.mqtt.proto.messages.SubAckMessage;
/**
*
@@ -20,8 +20,8 @@ import io.netty.handler.codec.CorruptedFrameException;
import io.netty.util.AttributeMap;
import java.io.UnsupportedEncodingException;
import java.util.List;
import org.dna.mqtt.moquette.proto.messages.AbstractMessage.QOSType;
import org.dna.mqtt.moquette.proto.messages.SubscribeMessage;
import org.dna.mqtt.proto.messages.AbstractMessage.QOSType;
import org.dna.mqtt.proto.messages.SubscribeMessage;
/**
*
@@ -17,8 +17,8 @@ package org.dna.mqtt.moquette.parser.netty;
import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext;
import org.dna.mqtt.moquette.proto.messages.AbstractMessage;
import org.dna.mqtt.moquette.proto.messages.SubscribeMessage;
import org.dna.mqtt.proto.messages.AbstractMessage;
import org.dna.mqtt.proto.messages.SubscribeMessage;
/**
*
@@ -15,8 +15,8 @@
*/
package org.dna.mqtt.moquette.parser.netty;
import org.dna.mqtt.moquette.proto.messages.MessageIDMessage;
import org.dna.mqtt.moquette.proto.messages.UnsubAckMessage;
import org.dna.mqtt.proto.messages.MessageIDMessage;
import org.dna.mqtt.proto.messages.UnsubAckMessage;
/**
*
@@ -17,8 +17,8 @@ package org.dna.mqtt.moquette.parser.netty;
import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext;
import org.dna.mqtt.moquette.proto.messages.AbstractMessage;
import org.dna.mqtt.moquette.proto.messages.UnsubAckMessage;
import org.dna.mqtt.proto.messages.AbstractMessage;
import org.dna.mqtt.proto.messages.UnsubAckMessage;
/**
*
@@ -19,8 +19,8 @@ import io.netty.buffer.ByteBuf;
import io.netty.handler.codec.CorruptedFrameException;
import io.netty.util.AttributeMap;
import java.util.List;
import org.dna.mqtt.moquette.proto.messages.AbstractMessage;
import org.dna.mqtt.moquette.proto.messages.UnsubscribeMessage;
import org.dna.mqtt.proto.messages.AbstractMessage;
import org.dna.mqtt.proto.messages.UnsubscribeMessage;
/**
*
@@ -17,8 +17,8 @@ package org.dna.mqtt.moquette.parser.netty;
import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext;
import org.dna.mqtt.moquette.proto.messages.AbstractMessage;
import org.dna.mqtt.moquette.proto.messages.UnsubscribeMessage;
import org.dna.mqtt.proto.messages.AbstractMessage;
import org.dna.mqtt.proto.messages.UnsubscribeMessage;
/**
@@ -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.moquette.proto.messages.AbstractMessage;
import org.dna.mqtt.proto.messages.AbstractMessage;
import org.slf4j.LoggerFactory;
/**
@@ -19,8 +19,8 @@ import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
import java.util.ArrayList;
import java.util.List;
import org.dna.mqtt.moquette.proto.messages.AbstractMessage;
import org.dna.mqtt.moquette.proto.messages.ConnAckMessage;
import org.dna.mqtt.proto.messages.AbstractMessage;
import org.dna.mqtt.proto.messages.ConnAckMessage;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
@@ -20,7 +20,7 @@ import io.netty.buffer.ByteBufAllocator;
import io.netty.buffer.Unpooled;
import io.netty.buffer.UnpooledByteBufAllocator;
import io.netty.channel.ChannelHandlerContext;
import org.dna.mqtt.moquette.proto.messages.ConnAckMessage;
import org.dna.mqtt.proto.messages.ConnAckMessage;
import org.junit.Before;
import org.junit.Test;
import static org.junit.Assert.*;
@@ -26,8 +26,8 @@ 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.moquette.proto.messages.AbstractMessage;
import org.dna.mqtt.moquette.proto.messages.ConnectMessage;
import org.dna.mqtt.proto.messages.AbstractMessage;
import org.dna.mqtt.proto.messages.ConnectMessage;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
@@ -18,7 +18,7 @@ package org.dna.mqtt.moquette.parser.netty;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
import io.netty.channel.ChannelHandlerContext;
import org.dna.mqtt.moquette.proto.messages.ConnectMessage;
import org.dna.mqtt.proto.messages.ConnectMessage;
import org.junit.Test;
import org.junit.Before;
import static org.junit.Assert.*;
@@ -19,8 +19,8 @@ import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
import java.util.ArrayList;
import java.util.List;
import org.dna.mqtt.moquette.proto.messages.AbstractMessage;
import org.dna.mqtt.moquette.proto.messages.PubAckMessage;
import org.dna.mqtt.proto.messages.AbstractMessage;
import org.dna.mqtt.proto.messages.PubAckMessage;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
@@ -22,7 +22,7 @@ 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.moquette.proto.messages.PubAckMessage;
import org.dna.mqtt.proto.messages.PubAckMessage;
/**
*
@@ -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.moquette.proto.messages.AbstractMessage;
import org.dna.mqtt.proto.messages.AbstractMessage;
import org.junit.Test;
import static org.junit.Assert.*;
import org.junit.Before;
@@ -24,8 +24,8 @@ import java.nio.Buffer;
import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.List;
import org.dna.mqtt.moquette.proto.messages.AbstractMessage;
import org.dna.mqtt.moquette.proto.messages.PublishMessage;
import org.dna.mqtt.proto.messages.AbstractMessage;
import org.dna.mqtt.proto.messages.PublishMessage;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
@@ -23,8 +23,8 @@ 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.moquette.proto.messages.AbstractMessage.QOSType;
import org.dna.mqtt.moquette.proto.messages.PublishMessage;
import org.dna.mqtt.proto.messages.AbstractMessage.QOSType;
import org.dna.mqtt.proto.messages.PublishMessage;
/**
*
@@ -19,8 +19,8 @@ import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
import java.util.ArrayList;
import java.util.List;
import org.dna.mqtt.moquette.proto.messages.AbstractMessage;
import org.dna.mqtt.moquette.proto.messages.SubAckMessage;
import org.dna.mqtt.proto.messages.AbstractMessage;
import org.dna.mqtt.proto.messages.SubAckMessage;
import static org.junit.Assert.*;
import org.junit.Before;
import org.junit.Test;
@@ -19,8 +19,8 @@ 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.moquette.proto.messages.AbstractMessage;
import org.dna.mqtt.moquette.proto.messages.SubAckMessage;
import org.dna.mqtt.proto.messages.AbstractMessage;
import org.dna.mqtt.proto.messages.SubAckMessage;
import static org.junit.Assert.assertEquals;
import org.junit.Before;
import org.junit.Test;
@@ -20,8 +20,8 @@ import io.netty.buffer.Unpooled;
import io.netty.handler.codec.CorruptedFrameException;
import java.util.ArrayList;
import java.util.List;
import org.dna.mqtt.moquette.proto.messages.AbstractMessage;
import org.dna.mqtt.moquette.proto.messages.SubscribeMessage;
import org.dna.mqtt.proto.messages.AbstractMessage;
import org.dna.mqtt.proto.messages.SubscribeMessage;
import static org.junit.Assert.*;
import org.junit.Before;
import org.junit.Test;
@@ -18,8 +18,8 @@ package org.dna.mqtt.moquette.parser.netty;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
import io.netty.channel.ChannelHandlerContext;
import org.dna.mqtt.moquette.proto.messages.AbstractMessage;
import org.dna.mqtt.moquette.proto.messages.SubscribeMessage;
import org.dna.mqtt.proto.messages.AbstractMessage;
import org.dna.mqtt.proto.messages.SubscribeMessage;
import static org.junit.Assert.assertEquals;
import org.junit.Before;
import org.junit.Test;
@@ -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.moquette.proto.messages.AbstractMessage;
import org.dna.mqtt.moquette.proto.messages.UnsubscribeMessage;
import org.dna.mqtt.proto.messages.AbstractMessage;
import org.dna.mqtt.proto.messages.UnsubscribeMessage;
import static org.junit.Assert.*;
import org.junit.Before;
import org.junit.Test;
@@ -18,8 +18,8 @@ package org.dna.mqtt.moquette.parser.netty;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
import io.netty.channel.ChannelHandlerContext;
import org.dna.mqtt.moquette.proto.messages.AbstractMessage;
import org.dna.mqtt.moquette.proto.messages.UnsubscribeMessage;
import org.dna.mqtt.proto.messages.AbstractMessage;
import org.dna.mqtt.proto.messages.UnsubscribeMessage;
import static org.junit.Assert.assertEquals;
import org.junit.Before;
import org.junit.Test;
@@ -22,8 +22,8 @@ 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.moquette.proto.messages.AbstractMessage;
import org.dna.mqtt.moquette.proto.messages.UnsubscribeMessage;
import org.dna.mqtt.proto.messages.AbstractMessage;
import org.dna.mqtt.proto.messages.UnsubscribeMessage;
/**
*
+5 -5
View File
@@ -6,7 +6,7 @@
<relativePath>../</relativePath>
<!--<relativePath>../pom.xml</relativePath>-->
<artifactId>moquette-parent</artifactId>
<groupId>org.dna.mqtt</groupId>
<groupId>org.eclipse.moquette</groupId>
<version>0.7-SNAPSHOT</version>
</parent>
@@ -53,16 +53,16 @@
</configuration>
</plugin>
<plugin>
<!--plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<excludes>
<exclude>org/dna/mqtt/moquette/proto/TestUtils.java</exclude>
<exclude>org/dna/mqtt/moquette/proto/TestUtils$*</exclude>
<exclude>org/eclipse/moquette/proto/TestUtils.java</exclude>
<exclude>org/eclipse/moquette/proto/TestUtils$*</exclude>
</excludes>
</configuration>
</plugin>
</plugin-->
</plugins>
</build>
@@ -13,7 +13,7 @@
*
* You may elect to redistribute this code under either of these licenses.
*/
package org.dna.mqtt.commons;
package org.eclipse.moquette.commons;
/**
* Contains some useful constants.
@@ -13,7 +13,7 @@
*
* You may elect to redistribute this code under either of these licenses.
*/
package org.dna.mqtt.moquette;
package org.eclipse.moquette.proto;
/**
*
@@ -13,9 +13,9 @@
*
* You may elect to redistribute this code under either of these licenses.
*/
package org.dna.mqtt.moquette.proto;
package org.eclipse.moquette.proto;
import org.dna.mqtt.moquette.proto.messages.AbstractMessage;
import org.eclipse.moquette.proto.messages.AbstractMessage;
/**
* Common utils methodd used in codecs.
@@ -13,7 +13,7 @@
*
* You may elect to redistribute this code under either of these licenses.
*/
package org.dna.mqtt.moquette.proto.messages;
package org.eclipse.moquette.proto.messages;
/**
* Basic abstract message for all MQTT protocol messages.
@@ -13,7 +13,7 @@
*
* You may elect to redistribute this code under either of these licenses.
*/
package org.dna.mqtt.moquette.proto.messages;
package org.eclipse.moquette.proto.messages;
/**
* The attributes Qos, Dup and Retain aren't used.
@@ -13,7 +13,7 @@
*
* You may elect to redistribute this code under either of these licenses.
*/
package org.dna.mqtt.moquette.proto.messages;
package org.eclipse.moquette.proto.messages;
/**
* The attributes Qos, Dup and Retain aren't used for Connect message
@@ -13,7 +13,7 @@
*
* You may elect to redistribute this code under either of these licenses.
*/
package org.dna.mqtt.moquette.proto.messages;
package org.eclipse.moquette.proto.messages;
/**
* Doesn't care DUP, QOS and RETAIN flags.
@@ -13,7 +13,7 @@
*
* You may elect to redistribute this code under either of these licenses.
*/
package org.dna.mqtt.moquette.proto.messages;
package org.eclipse.moquette.proto.messages;
/**
* Base class for alla the messages that carries only MessageID. (PUBACK, PUBREC,
@@ -13,7 +13,7 @@
*
* You may elect to redistribute this code under either of these licenses.
*/
package org.dna.mqtt.moquette.proto.messages;
package org.eclipse.moquette.proto.messages;
/**
* Doesn't care DUP, QOS and RETAIN flags.
@@ -13,7 +13,7 @@
*
* You may elect to redistribute this code under either of these licenses.
*/
package org.dna.mqtt.moquette.proto.messages;
package org.eclipse.moquette.proto.messages;
/**
* Doesn't care DUP, QOS and RETAIN flags.
@@ -13,7 +13,7 @@
*
* You may elect to redistribute this code under either of these licenses.
*/
package org.dna.mqtt.moquette.proto.messages;
package org.eclipse.moquette.proto.messages;
/**
* Placeholder for PUBACK message.
@@ -13,7 +13,7 @@
*
* You may elect to redistribute this code under either of these licenses.
*/
package org.dna.mqtt.moquette.proto.messages;
package org.eclipse.moquette.proto.messages;
/**
*
@@ -13,7 +13,7 @@
*
* You may elect to redistribute this code under either of these licenses.
*/
package org.dna.mqtt.moquette.proto.messages;
package org.eclipse.moquette.proto.messages;
/**
* Placeholder for PUBREC message.
@@ -13,7 +13,7 @@
*
* You may elect to redistribute this code under either of these licenses.
*/
package org.dna.mqtt.moquette.proto.messages;
package org.eclipse.moquette.proto.messages;
/**
*
@@ -13,7 +13,7 @@
*
* You may elect to redistribute this code under either of these licenses.
*/
package org.dna.mqtt.moquette.proto.messages;
package org.eclipse.moquette.proto.messages;
import java.nio.ByteBuffer;
@@ -13,7 +13,7 @@
*
* You may elect to redistribute this code under either of these licenses.
*/
package org.dna.mqtt.moquette.proto.messages;
package org.eclipse.moquette.proto.messages;
import java.util.ArrayList;
import java.util.List;
@@ -13,7 +13,7 @@
*
* You may elect to redistribute this code under either of these licenses.
*/
package org.dna.mqtt.moquette.proto.messages;
package org.eclipse.moquette.proto.messages;
import java.util.ArrayList;
import java.util.List;
@@ -13,7 +13,7 @@
*
* You may elect to redistribute this code under either of these licenses.
*/
package org.dna.mqtt.moquette.proto.messages;
package org.eclipse.moquette.proto.messages;
/**
*
@@ -13,7 +13,7 @@
*
* You may elect to redistribute this code under either of these licenses.
*/
package org.dna.mqtt.moquette.proto.messages;
package org.eclipse.moquette.proto.messages;
import java.util.ArrayList;
import java.util.List;
@@ -13,7 +13,7 @@
*
* You may elect to redistribute this code under either of these licenses.
*/
package org.dna.mqtt.moquette.proto.messages;
package org.eclipse.moquette.proto.messages;
/**
*
+1 -1
View File
@@ -6,7 +6,7 @@
<mina-version>2.0.7</mina-version>
</properties>
<groupId>org.dna.mqtt</groupId>
<groupId>org.eclipse.moquette</groupId>
<artifactId>moquette-parent</artifactId>
<packaging>pom</packaging>