renamed iodriver to mediadriver and refactored.

sanIncredible · Mar 7, 2014 · 1645bbb · 1645bbb
1 parent b1bd6c0
commit 1645bbb
Show file tree

Hide file tree

Showing 14 changed files with 20 additions and 21 deletions.
diff --git a/aeron-iodriver/src/main/java/uk/co/real_logic/aeron/iodriver/package-info.java b/aeron-iodriver/src/main/java/uk/co/real_logic/aeron/iodriver/package-info.java
diff --git a/aeron-iodriver/.gitignore → aeron-mediadriver/.gitignore b/aeron-iodriver/.gitignore → aeron-mediadriver/.gitignore
diff --git a/aeron-iodriver/build.gradle → aeron-mediadriver/build.gradle b/aeron-iodriver/build.gradle → aeron-mediadriver/build.gradle
diff --git a/.../real_logic/aeron/iodriver/EventLoop.java → ...al_logic/aeron/mediadriver/EventLoop.java b/.../real_logic/aeron/iodriver/EventLoop.java → ...al_logic/aeron/mediadriver/EventLoop.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package uk.co.real_logic.aeron.iodriver;
+package uk.co.real_logic.aeron.mediadriver;
 
 import java.io.Closeable;
 import java.io.IOException;
@@ -24,12 +24,11 @@
 import java.util.Set;
 
 /**
- * Event loop for JVM based iodriver
+ * Event loop for JVM based mediadriver
  *
  * Contains Selector logic
  *
  * Does not provide timers
- * Deliberately simple and braindead
  */
 public class EventLoop implements Closeable, Runnable
 {

diff --git a/...al_logic/aeron/iodriver/FrameHandler.java → ...logic/aeron/mediadriver/FrameHandler.java b/...al_logic/aeron/iodriver/FrameHandler.java → ...logic/aeron/mediadriver/FrameHandler.java
@@ -13,15 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package uk.co.real_logic.aeron.iodriver;
+package uk.co.real_logic.aeron.mediadriver;
 
 import uk.co.real_logic.aeron.util.DataHeaderFlyweight;
 import uk.co.real_logic.aeron.util.HeaderFlyweight;
 
 import java.net.InetSocketAddress;
 
 /**
- * Handler interface for various Frame types. For iodriver, specifically, this is Data or Control.
+ * Handler interface for various Frame types. For mediadriver, specifically, this is Data or Control.
  *
  * This interface should expand to handle various addressing models. But InetSocketAddress is exposed
  * at the moment.

diff --git a/...o/real_logic/aeron/iodriver/IoDriver.java → ..._logic/aeron/mediadriver/MediaDriver.java b/...o/real_logic/aeron/iodriver/IoDriver.java → ..._logic/aeron/mediadriver/MediaDriver.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package uk.co.real_logic.aeron.iodriver;
+package uk.co.real_logic.aeron.mediadriver;
 
 import java.net.InetSocketAddress;
 import java.util.HashMap;
@@ -22,9 +22,9 @@
 import java.util.concurrent.Executors;
 
 /**
- * Main class for JVM-based iodriver
+ * Main class for JVM-based mediadriver
  */
-public class IoDriver
+public class MediaDriver
 {
     // This is used by senders to associate Session IDs to SrcFrameHandlers for sending.
     private final Map<Long, SrcFrameHandler> sessionIdMap = new HashMap<>();

diff --git a/...logic/aeron/iodriver/RcvFrameHandler.java → ...ic/aeron/mediadriver/RcvFrameHandler.java b/...logic/aeron/iodriver/RcvFrameHandler.java → ...ic/aeron/mediadriver/RcvFrameHandler.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package uk.co.real_logic.aeron.iodriver;
+package uk.co.real_logic.aeron.mediadriver;
 
 import uk.co.real_logic.aeron.util.DataHeaderFlyweight;
 import uk.co.real_logic.aeron.util.HeaderFlyweight;

diff --git a/...eal_logic/aeron/iodriver/ReadHandler.java → ..._logic/aeron/mediadriver/ReadHandler.java b/...eal_logic/aeron/iodriver/ReadHandler.java → ..._logic/aeron/mediadriver/ReadHandler.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package uk.co.real_logic.aeron.iodriver;
+package uk.co.real_logic.aeron.mediadriver;
 
 /**
  * Interface for a handler of SelectionKey.OP_READ events

diff --git a/...logic/aeron/iodriver/SrcFrameHandler.java → ...ic/aeron/mediadriver/SrcFrameHandler.java b/...logic/aeron/iodriver/SrcFrameHandler.java → ...ic/aeron/mediadriver/SrcFrameHandler.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package uk.co.real_logic.aeron.iodriver;
+package uk.co.real_logic.aeron.mediadriver;
 
 import uk.co.real_logic.aeron.util.DataHeaderFlyweight;
 import uk.co.real_logic.aeron.util.HeaderFlyweight;

diff --git a/...real_logic/aeron/iodriver/UDPChannel.java → ...l_logic/aeron/mediadriver/UDPChannel.java b/...real_logic/aeron/iodriver/UDPChannel.java → ...l_logic/aeron/mediadriver/UDPChannel.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package uk.co.real_logic.aeron.iodriver;
+package uk.co.real_logic.aeron.mediadriver;
 
 import uk.co.real_logic.aeron.util.DataHeaderFlyweight;
 import uk.co.real_logic.aeron.util.HeaderFlyweight;

diff --git a/aeron-mediadriver/src/main/java/uk/co/real_logic/aeron/mediadriver/package-info.java b/aeron-mediadriver/src/main/java/uk/co/real_logic/aeron/mediadriver/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Holds the JVM-based mediadriver classes and main.
+ */
+package uk.co.real_logic.aeron.mediadriver;
diff --git a/...l_logic/aeron/iodriver/EventLoopTest.java → ...ogic/aeron/mediadriver/EventLoopTest.java b/...l_logic/aeron/iodriver/EventLoopTest.java → ...ogic/aeron/mediadriver/EventLoopTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package uk.co.real_logic.aeron.iodriver;
+package uk.co.real_logic.aeron.mediadriver;
 
 import org.junit.Test;
 import uk.co.real_logic.aeron.util.DataHeaderFlyweight;

diff --git a/build.gradle b/build.gradle
@@ -101,7 +101,7 @@ subprojects {
     }
 }
 
-project(':aeron-iodriver') {
+project(':aeron-mediadriver') {
     dependencies {
         compile project(':aeron-util')
     }
@@ -115,14 +115,14 @@ project(':aeron-core') {
 
 project(':aeron-examples') {
     dependencies {
-        compile project(':aeron-core'), project(':aeron-iodriver')
+        compile project(':aeron-core'), project(':aeron-mediadriver')
     }
 }
 
 project(':aeron-benchmark') {
     apply plugin: 'shadow'
     dependencies {
-        compile project(':aeron-core'), project(':aeron-iodriver')
+        compile project(':aeron-core'), project(':aeron-mediadriver')
         compile 'org.openjdk.jmh:jmh-core:0.4.2'
     }
     shadow {

diff --git a/settings.gradle b/settings.gradle
@@ -1 +1 @@
-include 'aeron-util', 'aeron-core', 'aeron-iodriver', 'aeron-examples', 'aeron-benchmark'
+include 'aeron-util', 'aeron-core', 'aeron-mediadriver', 'aeron-examples', 'aeron-benchmark'
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		include 'aeron-util', 'aeron-core', 'aeron-iodriver', 'aeron-examples', 'aeron-benchmark'
		include 'aeron-util', 'aeron-core', 'aeron-mediadriver', 'aeron-examples', 'aeron-benchmark'