Move all library code to function-specific modules.

cluster/pom.xml

@@ -26,6 +26,19 @@
   <artifactId>atomix-cluster</artifactId>
   <name>Atomix Cluster</name>
 
+  <dependencies>
+    <dependency>
+      <groupId>io.atomix</groupId>
+      <artifactId>atomix-utils</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>io.atomix</groupId>
+      <artifactId>atomix-event</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+  </dependencies>
+
   <build>
     <plugins>
       <plugin>

core/src/main/java/io/atomix/cluster/NodeId.java → cluster/src/main/java/io/atomix/cluster/NodeId.java

@@ -15,7 +15,7 @@
  */
 package io.atomix.cluster;
 
-import io.atomix.util.Identifier;
+import io.atomix.utils.Identifier;
 
 /**
  * Controller cluster identity.

core/src/main/java/io/atomix/cluster/PartitionId.java → cluster/src/main/java/io/atomix/cluster/PartitionId.java

@@ -15,7 +15,7 @@
  */
 package io.atomix.cluster;
 
-import io.atomix.util.Identifier;
+import io.atomix.utils.Identifier;
 
 import static com.google.common.base.Preconditions.checkArgument;
 

core/src/main/java/io/atomix/protocols/package-info.java → core/src/main/java/io/atomix/Atomix.java

@@ -13,8 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+package io.atomix;
 
 /**
- * Atomix distributed systems protocols.
+ * Atomix!
  */
-package io.atomix.protocols;
+public interface Atomix {
+}

utils/event/pom.xml → event/pom.xml

@@ -18,13 +18,26 @@
 
   <parent>
     <groupId>io.atomix</groupId>
-    <artifactId>atomix-utils-parent</artifactId>
+    <artifactId>atomix-parent</artifactId>
     <version>2.0.0-SNAPSHOT</version>
   </parent>
 
   <packaging>bundle</packaging>
   <artifactId>atomix-event</artifactId>
-  <name>Atomix Utilities :: Event</name>
+  <name>Atomix Event</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>io.atomix</groupId>
+      <artifactId>atomix-logging</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>io.atomix</groupId>
+      <artifactId>atomix-utils</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+  </dependencies>
 
   <build>
     <plugins>

core/src/main/java/io/atomix/event/ListenerRegistry.java → event/src/main/java/io/atomix/event/ListenerRegistry.java

@@ -15,13 +15,13 @@
  */
 package io.atomix.event;
 
-import org.slf4j.Logger;
+import io.atomix.logging.Logger;
+import io.atomix.logging.LoggerFactory;
 
 import java.util.Set;
 import java.util.concurrent.CopyOnWriteArraySet;
 
 import static com.google.common.base.Preconditions.checkNotNull;
-import static org.slf4j.LoggerFactory.getLogger;
 
 /**
  * Base implementation of an event sink and a registry capable of tracking
@@ -32,7 +32,7 @@ public class ListenerRegistry<E extends Event, L extends EventListener<E>>
 
   private static final long LIMIT = 1_800; // ms
 
-  private final Logger log = getLogger(getClass());
+  private final Logger log = LoggerFactory.getLogger(getClass());
 
   private long lastStart;
   private L lastListener;

utils/logging/pom.xml → logging/api/pom.xml

@@ -18,13 +18,13 @@
 
   <parent>
     <groupId>io.atomix</groupId>
-    <artifactId>atomix-utils-parent</artifactId>
+    <artifactId>atomix-logging-parent</artifactId>
     <version>2.0.0-SNAPSHOT</version>
   </parent>
 
   <packaging>bundle</packaging>
   <artifactId>atomix-logging</artifactId>
-  <name>Atomix Utilities :: Logging</name>
+  <name>Atomix Logging</name>
 
   <build>
     <plugins>

logging/api/src/main/java/io/atomix/logging/LoggerFactory.java

@@ -0,0 +1,66 @@
+/*
+ * Copyright 2017-present Open Networking Laboratory
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.atomix.logging;
+
+import java.util.Iterator;
+import java.util.ServiceLoader;
+
+/**
+ * Logger factory.
+ */
+public final class LoggerFactory {
+  private static volatile LoggingService service;
+
+  static {
+    init();
+  }
+
+  /**
+   * Initializes the logger factory.
+   */
+  private static void init() {
+    Iterator<LoggingService> iterator = ServiceLoader.load(LoggingService.class).iterator();
+    if (!iterator.hasNext()) {
+      throw new AssertionError("No logging service found");
+    }
+    service = iterator.next();
+  }
+
+  /**
+   * Returns a logger by name.
+   *
+   * @param name the logger name
+   * @return the logger
+   */
+  public static Logger getLogger(String name) {
+    return service.getLogger(name);
+  }
+
+  /**
+   * Returns a logger by class.
+   *
+   * @param clazz the class for which to return the logger
+   * @return the logger for the given class
+   */
+  public static Logger getLogger(Class<?> clazz) {
+    return service.getLogger(clazz);
+  }
+
+  // No constructor.
+  private LoggerFactory() {
+  }
+
+}

logging/api/src/main/java/io/atomix/logging/LoggingService.java

@@ -0,0 +1,39 @@
+/*
+ * Copyright 2017-present Open Networking Laboratory
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.atomix.logging;
+
+/**
+ * Logging service.
+ */
+public interface LoggingService {
+
+  /**
+   * Returns a logger by name.
+   *
+   * @param name the logger name
+   * @return the logger
+   */
+  Logger getLogger(String name);
+
+  /**
+   * Returns a logger by class.
+   *
+   * @param clazz the class for which to return the logger
+   * @return the logger for the given class
+   */
+  Logger getLogger(Class<?> clazz);
+
+}

serializers/pom.xml → logging/pom.xml

@@ -23,10 +23,11 @@
   </parent>
 
   <packaging>pom</packaging>
-  <artifactId>atomix-serializers-parent</artifactId>
-  <name>Atomix Serializers Parent</name>
+  <artifactId>atomix-logging-parent</artifactId>
+  <name>Atomix Logging Parent</name>
 
   <modules>
-    <module>kryo</module>
+    <module>api</module>
+    <module>slf4j</module>
   </modules>
 </project>

serializers/kryo/pom.xml → logging/slf4j/pom.xml

@@ -18,13 +18,26 @@
 
   <parent>
     <groupId>io.atomix</groupId>
-    <artifactId>atomix-serializers-parent</artifactId>
+    <artifactId>atomix-logging-parent</artifactId>
     <version>2.0.0-SNAPSHOT</version>
   </parent>
 
   <packaging>bundle</packaging>
-  <artifactId>atomix-kryo</artifactId>
-  <name>Atomix Serializers :: Kryo</name>
+  <artifactId>atomix-slf4j</artifactId>
+  <name>Atomix Logging :: SLF4J</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>io.atomix</groupId>
+      <artifactId>atomix-logging</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>${slf4j.version}</version>
+    </dependency>
+  </dependencies>
 
   <build>
     <plugins>

core/src/main/java/io/atomix/logging/impl/Slf4jLogger.java → logging/slf4j/src/main/java/io/atomix/logging/slf4j/Slf4jLogger.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.atomix.logging.impl;
+package io.atomix.logging.slf4j;
 
 import io.atomix.logging.Logger;
 import org.slf4j.LoggerFactory;

core/src/main/java/io/atomix/logging/LoggingService.java → logging/slf4j/src/main/java/io/atomix/logging/slf4j/Slf4jLoggerFactory.java

@@ -13,15 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.atomix.logging;
+package io.atomix.logging.slf4j;
 
 /**
- *
+ * Logger factory.
  */
-public interface LoggingService {
-
-  Logger getLogger(String name);
-
-  Logger getLogger(Class<?> clazz);
-
+public class Slf4jLoggerFactory {
 }

core/src/main/java/io/atomix/logging/impl/Slf4jLoggingService.java → logging/slf4j/src/main/java/io/atomix/logging/slf4j/Slf4jLoggingService.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.atomix.logging.impl;
+package io.atomix.logging.slf4j;
 
 import io.atomix.logging.Logger;
 import io.atomix.logging.LoggingService;

logging/slf4j/src/main/resources/META-INF/services/io.atomix.logging.LoggingService

@@ -0,0 +1,16 @@
+#
+# Copyright 2017-present Open Networking Laboratory
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+io.atomix.logging.slf4j.Slf4jLoggingService

messaging/api/pom.xml

@@ -0,0 +1,61 @@
+<!--
+  ~ Copyright 2017-present Open Networking Laboratory
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<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/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>io.atomix</groupId>
+    <artifactId>atomix-messaging-parent</artifactId>
+    <version>2.0.0-SNAPSHOT</version>
+  </parent>
+
+  <packaging>bundle</packaging>
+  <artifactId>atomix-messaging</artifactId>
+  <name>Atomix Messaging</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>io.atomix</groupId>
+      <artifactId>atomix-utils</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>io.atomix</groupId>
+      <artifactId>atomix-cluster</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <extensions>true</extensions>
+        <configuration>
+          <instructions>
+            <Export-Package>
+              io.atomix.*
+            </Export-Package>
+            <Import-Package>
+              !sun.nio.ch,!sun.misc,*
+            </Import-Package>
+          </instructions>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>