Moved Netty messaging out of onos-core-dist to under onos-utils

@@ -33,6 +33,12 @@
             <artifactId>onlab-nio</artifactId>
             <artifactId>onlab-nio</artifactId>
             <version>${project.version}</version>
             <version>${project.version}</version>
         </dependency>
         </dependency>
+        
+        <dependency>
+            <groupId>org.onlab.onos</groupId>
+            <artifactId>onlab-netty</artifactId>
+            <version>${project.version}</version>
+        </dependency>
 
 
         <dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <groupId>com.fasterxml.jackson.core</groupId>
@@ -51,15 +57,6 @@
           <groupId>de.javakaffee</groupId>
           <groupId>de.javakaffee</groupId>
           <artifactId>kryo-serializers</artifactId>
           <artifactId>kryo-serializers</artifactId>
         </dependency>
         </dependency>
-        <dependency>
-          <groupId>io.netty</groupId>
-          <artifactId>netty-all</artifactId>
-        </dependency>
-        <dependency>
-          <groupId>commons-pool</groupId>
-          <artifactId>commons-pool</artifactId>
-          <version>1.6</version>
-        </dependency>
     </dependencies>
     </dependencies>
 
 
     <build>
     <build>

@@ -23,10 +23,10 @@ import org.onlab.onos.store.cluster.messaging.ClusterCommunicationService;
 import org.onlab.onos.store.cluster.messaging.ClusterMessage;
 import org.onlab.onos.store.cluster.messaging.ClusterMessage;
 import org.onlab.onos.store.cluster.messaging.ClusterMessageHandler;
 import org.onlab.onos.store.cluster.messaging.ClusterMessageHandler;
 import org.onlab.onos.store.cluster.messaging.MessageSubject;
 import org.onlab.onos.store.cluster.messaging.MessageSubject;
-import org.onlab.onos.store.messaging.Endpoint;
-import org.onlab.onos.store.messaging.Message;
-import org.onlab.onos.store.messaging.MessageHandler;
-import org.onlab.onos.store.messaging.MessagingService;
+import org.onlab.netty.Endpoint;
+import org.onlab.netty.Message;
+import org.onlab.netty.MessageHandler;
+import org.onlab.netty.MessagingService;
 import org.slf4j.Logger;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.LoggerFactory;
 
 

@@ -7,7 +7,7 @@ import org.junit.Test;
 import org.onlab.onos.cluster.DefaultControllerNode;
 import org.onlab.onos.cluster.DefaultControllerNode;
 import org.onlab.onos.cluster.NodeId;
 import org.onlab.onos.cluster.NodeId;
 import org.onlab.onos.store.cluster.messaging.impl.OnosClusterCommunicationManager;
 import org.onlab.onos.store.cluster.messaging.impl.OnosClusterCommunicationManager;
-import org.onlab.onos.store.messaging.impl.NettyMessagingService;
+import org.onlab.netty.NettyMessagingService;
 import org.onlab.packet.IpPrefix;
 import org.onlab.packet.IpPrefix;
 
 
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.CountDownLatch;

+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.onlab.onos</groupId>
+        <artifactId>onlab-utils</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>onlab-netty</artifactId>
+    <packaging>bundle</packaging>
+
+    <description>Network I/O using Netty framework</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava-testlib</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.onlab.onos</groupId>
+            <artifactId>onlab-misc</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.onlab.onos</groupId>
+            <artifactId>onlab-junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>de.javakaffee</groupId>
+            <artifactId>kryo-serializers</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-all</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>commons-pool</groupId>
+            <artifactId>commons-pool</artifactId>
+            <version>1.6</version>
+        </dependency>
+    </dependencies>
+
+</project>

-package org.onlab.onos.store.messaging.impl;
+package org.onlab.netty;
 
 
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import java.util.concurrent.TimeoutException;
 
 
-import org.onlab.onos.store.messaging.Response;
-
 /**
 /**
  * An asynchronous response.
  * An asynchronous response.
  * This class provides a base implementation of Response, with methods to retrieve the
  * This class provides a base implementation of Response, with methods to retrieve the

-package org.onlab.onos.store.messaging.impl;
+package org.onlab.netty;
 
 
 import java.io.IOException;
 import java.io.IOException;
 
 
-import org.onlab.onos.store.messaging.Message;
-import org.onlab.onos.store.messaging.MessageHandler;
-
 /**
 /**
  * Message handler that echos the message back to the sender.
  * Message handler that echos the message back to the sender.
  */
  */

-package org.onlab.onos.store.messaging;
+package org.onlab.netty;
 
 
 /**
 /**
  * Representation of a TCP/UDP communication end point.
  * Representation of a TCP/UDP communication end point.

-package org.onlab.onos.store.messaging.impl;
+package org.onlab.netty;
 
 
 import java.io.IOException;
 import java.io.IOException;
 
 
-import org.onlab.onos.store.messaging.Endpoint;
-import org.onlab.onos.store.messaging.Message;
-
 /**
 /**
  * Internal message representation with additional attributes
  * Internal message representation with additional attributes
  * for supporting, synchronous request/reply behavior.
  * for supporting, synchronous request/reply behavior.

-package org.onlab.onos.store.messaging.impl;
+package org.onlab.netty;
 
 
 import org.onlab.util.KryoPool;
 import org.onlab.util.KryoPool;
 import org.slf4j.Logger;
 import org.slf4j.Logger;

-package org.onlab.onos.store.messaging.impl;
-
-import org.onlab.onos.store.messaging.Message;
-import org.onlab.onos.store.messaging.MessageHandler;
+package org.onlab.netty;
 
 
 /**
 /**
  * A MessageHandler that simply logs the information.
  * A MessageHandler that simply logs the information.
@@ -12,4 +9,4 @@ public class LoggingHandler implements MessageHandler {
     public void handle(Message message) {
     public void handle(Message message) {
         System.out.println("Received: " + message.payload());
         System.out.println("Received: " + message.payload());
     }
     }
-}
\ No newline at end of file
+}

-package org.onlab.onos.store.messaging;
+package org.onlab.netty;
 
 
 import java.io.IOException;
 import java.io.IOException;
 
 

-package org.onlab.onos.store.messaging.impl;
+package org.onlab.netty;
 
 
 import java.util.Arrays;
 import java.util.Arrays;
 import java.util.List;
 import java.util.List;
 
 
 import static com.google.common.base.Preconditions.checkState;
 import static com.google.common.base.Preconditions.checkState;
 
 
-import org.onlab.onos.store.messaging.Endpoint;
-
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.ByteToMessageDecoder;
 import io.netty.handler.codec.ByteToMessageDecoder;
 
 
 /**
 /**
- * Decode bytes into a InrenalMessage.
+ * Decode bytes into a InternalMessage.
  */
  */
 public class MessageDecoder extends ByteToMessageDecoder {
 public class MessageDecoder extends ByteToMessageDecoder {
 
 

-package org.onlab.onos.store.messaging.impl;
+package org.onlab.netty;
 
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelHandlerContext;

-package org.onlab.onos.store.messaging;
+package org.onlab.netty;
 
 
 import java.io.IOException;
 import java.io.IOException;
 
 

-package org.onlab.onos.store.messaging;
+package org.onlab.netty;
 
 
 import java.io.IOException;
 import java.io.IOException;
 
 

-package org.onlab.onos.store.messaging.impl;
+package org.onlab.netty;
 
 
 import java.io.IOException;
 import java.io.IOException;
 import java.net.UnknownHostException;
 import java.net.UnknownHostException;
@@ -25,16 +25,6 @@ import org.apache.commons.lang.math.RandomUtils;
 import org.apache.commons.pool.KeyedObjectPool;
 import org.apache.commons.pool.KeyedObjectPool;
 import org.apache.commons.pool.KeyedPoolableObjectFactory;
 import org.apache.commons.pool.KeyedPoolableObjectFactory;
 import org.apache.commons.pool.impl.GenericKeyedObjectPool;
 import org.apache.commons.pool.impl.GenericKeyedObjectPool;
-import org.apache.felix.scr.annotations.Activate;
-import org.apache.felix.scr.annotations.Component;
-import org.apache.felix.scr.annotations.Deactivate;
-import org.apache.felix.scr.annotations.Reference;
-import org.apache.felix.scr.annotations.ReferenceCardinality;
-import org.apache.felix.scr.annotations.Service;
-import org.onlab.onos.store.messaging.Endpoint;
-import org.onlab.onos.store.messaging.MessageHandler;
-import org.onlab.onos.store.messaging.MessagingService;
-import org.onlab.onos.store.messaging.Response;
 import org.slf4j.Logger;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.LoggerFactory;
 
 
@@ -44,8 +34,6 @@ import com.google.common.cache.CacheBuilder;
 /**
 /**
  * A Netty based implementation of MessagingService.
  * A Netty based implementation of MessagingService.
  */
  */
-@Component(immediate = true)
-@Service
 public class NettyMessagingService implements MessagingService {
 public class NettyMessagingService implements MessagingService {
 
 
     private final Logger log = LoggerFactory.getLogger(getClass());
     private final Logger log = LoggerFactory.getLogger(getClass());
@@ -59,7 +47,6 @@ public class NettyMessagingService implements MessagingService {
     private Cache<Long, AsyncResponse<?>> responseFutures;
     private Cache<Long, AsyncResponse<?>> responseFutures;
     private final Endpoint localEp;
     private final Endpoint localEp;
 
 
-    @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
     protected Serializer serializer;
     protected Serializer serializer;
 
 
     public NettyMessagingService() {
     public NettyMessagingService() {
@@ -78,7 +65,6 @@ public class NettyMessagingService implements MessagingService {
         }
         }
     }
     }
 
 
-    @Activate
     public void activate() throws Exception {
     public void activate() throws Exception {
         responseFutures = CacheBuilder.newBuilder()
         responseFutures = CacheBuilder.newBuilder()
                 .maximumSize(100000)
                 .maximumSize(100000)
@@ -89,7 +75,6 @@ public class NettyMessagingService implements MessagingService {
         startAcceptingConnections();
         startAcceptingConnections();
     }
     }
 
 
-    @Deactivate
     public void deactivate() throws Exception {
     public void deactivate() throws Exception {
         channels.close();
         channels.close();
         bossGroup.shutdownGracefully();
         bossGroup.shutdownGracefully();

-package org.onlab.onos.store.messaging;
+package org.onlab.netty;
 
 
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import java.util.concurrent.TimeoutException;

-package org.onlab.onos.store.messaging.impl;
+package org.onlab.netty;
 
 
 /**
 /**
  * Interface for encoding/decoding message payloads.
  * Interface for encoding/decoding message payloads.

-package org.onlab.onos.store.messaging.impl;
+package org.onlab.netty;
 
 
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeUnit;
 
 
-import org.onlab.onos.store.messaging.Endpoint;
-import org.onlab.onos.store.messaging.Response;
-
 public final class SimpleClient {
 public final class SimpleClient {
     private SimpleClient() {}
     private SimpleClient() {}
 
 

-package org.onlab.onos.store.messaging.impl;
+package org.onlab.netty;
 
 
 public final class SimpleServer {
 public final class SimpleServer {
     private SimpleServer() {}
     private SimpleServer() {}

@@ -19,6 +19,7 @@
     <modules>
     <modules>
         <module>junit</module>
         <module>junit</module>
         <module>misc</module>
         <module>misc</module>
+        <module>netty</module>
         <module>nio</module>
         <module>nio</module>
         <module>osgi</module>
         <module>osgi</module>
         <module>rest</module>
         <module>rest</module>