Move messaging package into a single module.

atomix · Nov 17, 2017 · 5dfe2b7 · 5dfe2b7
1 parent b7e7089
commit 5dfe2b7
Show file tree

Hide file tree

Showing 16 changed files with 43 additions and 112 deletions.
diff --git a/messaging/api/pom.xml b/messaging/api/pom.xml
diff --git a/messaging/netty/pom.xml b/messaging/netty/pom.xml
diff --git a/messaging/pom.xml b/messaging/pom.xml
@@ -22,12 +22,40 @@
     <version>2.1.0-SNAPSHOT</version>
   </parent>
 
-  <packaging>pom</packaging>
-  <artifactId>atomix-messaging-parent</artifactId>
-  <name>Atomix Messaging Parent</name>
+  <packaging>bundle</packaging>
+  <artifactId>atomix-messaging</artifactId>
+  <name>Atomix Messaging</name>
 
-  <modules>
-    <module>api</module>
-    <module>netty</module>
-  </modules>
+  <dependencies>
+    <dependency>
+      <groupId>io.atomix</groupId>
+      <artifactId>atomix-messaging</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>io.atomix</groupId>
+      <artifactId>atomix-utils</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-transport</artifactId>
+      <version>${netty.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-codec</artifactId>
+      <version>${netty.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-handler</artifactId>
+      <version>${netty.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-transport-native-epoll</artifactId>
+      <version>${netty.version}</version>
+    </dependency>
+  </dependencies>
 </project>
diff --git a/...in/java/io/atomix/messaging/Endpoint.java → ...in/java/io/atomix/messaging/Endpoint.java b/...in/java/io/atomix/messaging/Endpoint.java → ...in/java/io/atomix/messaging/Endpoint.java
diff --git a/...ix/messaging/ManagedMessagingService.java → ...ix/messaging/ManagedMessagingService.java b/...ix/messaging/ManagedMessagingService.java → ...ix/messaging/ManagedMessagingService.java
diff --git a/.../atomix/messaging/MessagingException.java → .../atomix/messaging/MessagingException.java b/.../atomix/messaging/MessagingException.java → .../atomix/messaging/MessagingException.java
diff --git a/...io/atomix/messaging/MessagingService.java → ...io/atomix/messaging/MessagingService.java b/...io/atomix/messaging/MessagingService.java → ...io/atomix/messaging/MessagingService.java
diff --git a/.../atomix/messaging/netty/DecoderState.java → ...o/atomix/messaging/impl/DecoderState.java b/.../atomix/messaging/netty/DecoderState.java → ...o/atomix/messaging/impl/DecoderState.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.atomix.messaging.netty;
+package io.atomix.messaging.impl;
 
 /**
  * State transitions a decoder goes through as it is decoding an incoming message.

diff --git a/...omix/messaging/netty/InternalMessage.java → ...tomix/messaging/impl/InternalMessage.java b/...omix/messaging/netty/InternalMessage.java → ...tomix/messaging/impl/InternalMessage.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.atomix.messaging.netty;
+package io.atomix.messaging.impl;
 
 /**
  * Base class for internal messages.

diff --git a/...atomix/messaging/netty/InternalReply.java → .../atomix/messaging/impl/InternalReply.java b/...atomix/messaging/netty/InternalReply.java → .../atomix/messaging/impl/InternalReply.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.atomix.messaging.netty;
+package io.atomix.messaging.impl;
 
 import com.google.common.base.MoreObjects;
 import io.atomix.utils.ArraySizeHashPrinter;

diff --git a/...omix/messaging/netty/InternalRequest.java → ...tomix/messaging/impl/InternalRequest.java b/...omix/messaging/netty/InternalRequest.java → ...tomix/messaging/impl/InternalRequest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.atomix.messaging.netty;
+package io.atomix.messaging.impl;
 
 import com.google.common.base.MoreObjects;
 import io.atomix.messaging.Endpoint;

diff --git a/...tomix/messaging/netty/MessageDecoder.java → ...atomix/messaging/impl/MessageDecoder.java b/...tomix/messaging/netty/MessageDecoder.java → ...atomix/messaging/impl/MessageDecoder.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.atomix.messaging.netty;
+package io.atomix.messaging.impl;
 
 import com.google.common.base.Charsets;
 import io.atomix.messaging.Endpoint;

diff --git a/...tomix/messaging/netty/MessageEncoder.java → ...atomix/messaging/impl/MessageEncoder.java b/...tomix/messaging/netty/MessageEncoder.java → ...atomix/messaging/impl/MessageEncoder.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.atomix.messaging.netty;
+package io.atomix.messaging.impl;
 
 import com.google.common.base.Charsets;
 import io.atomix.messaging.Endpoint;

diff --git a/...essaging/netty/NettyMessagingService.java → ...messaging/impl/NettyMessagingService.java b/...essaging/netty/NettyMessagingService.java → ...messaging/impl/NettyMessagingService.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.atomix.messaging.netty;
+package io.atomix.messaging.impl;
 
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;

diff --git a/...ava/io/atomix/messaging/package-info.java → ...ava/io/atomix/messaging/package-info.java b/...ava/io/atomix/messaging/package-info.java → ...ava/io/atomix/messaging/package-info.java
diff --git a/...ging.netty/NettyMessagingServiceTest.java → ...aging/impl/NettyMessagingServiceTest.java b/...ging.netty/NettyMessagingServiceTest.java → ...aging/impl/NettyMessagingServiceTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.atomix.messaging.netty;
+package io.atomix.messaging.impl;
 
 import com.google.common.util.concurrent.MoreExecutors;
 import com.google.common.util.concurrent.Uninterruptibles;