[SPARK-13529][BUILD] Move network/* modules into common/network-*

## What changes were proposed in this pull request? As the title says, this moves the three modules currently in network/ into common/network-*. This removes one top level, non-user-facing folder. ## How was this patch tested? Compilation and existing tests. We should run both SBT and Maven. Author: Reynold Xin <rxin@databricks.com> Closes apache#11409 from rxin/SPARK-13529.
sebastienrainville · Feb 29, 2016 · 9e01dcc · 9e01dcc
1 parent cca79fa
commit 9e01dcc
Show file tree

Hide file tree

Showing 115 changed files with 9 additions and 8 deletions.
diff --git a/network/common/pom.xml → common/network-common/pom.xml b/network/common/pom.xml → common/network-common/pom.xml
diff --git a/...pache/spark/network/TransportContext.java → ...pache/spark/network/TransportContext.java b/...pache/spark/network/TransportContext.java → ...pache/spark/network/TransportContext.java
diff --git a/...work/buffer/FileSegmentManagedBuffer.java → ...work/buffer/FileSegmentManagedBuffer.java b/...work/buffer/FileSegmentManagedBuffer.java → ...work/buffer/FileSegmentManagedBuffer.java
diff --git a/.../spark/network/buffer/LazyFileRegion.java → .../spark/network/buffer/LazyFileRegion.java b/.../spark/network/buffer/LazyFileRegion.java → .../spark/network/buffer/LazyFileRegion.java
diff --git a/...e/spark/network/buffer/ManagedBuffer.java → ...e/spark/network/buffer/ManagedBuffer.java b/...e/spark/network/buffer/ManagedBuffer.java → ...e/spark/network/buffer/ManagedBuffer.java
diff --git a/...rk/network/buffer/NettyManagedBuffer.java → ...rk/network/buffer/NettyManagedBuffer.java b/...rk/network/buffer/NettyManagedBuffer.java → ...rk/network/buffer/NettyManagedBuffer.java
diff --git a/...park/network/buffer/NioManagedBuffer.java → ...park/network/buffer/NioManagedBuffer.java b/...park/network/buffer/NioManagedBuffer.java → ...park/network/buffer/NioManagedBuffer.java
diff --git a/...rk/client/ChunkFetchFailureException.java → ...rk/client/ChunkFetchFailureException.java b/...rk/client/ChunkFetchFailureException.java → ...rk/client/ChunkFetchFailureException.java
diff --git a/...network/client/ChunkReceivedCallback.java → ...network/client/ChunkReceivedCallback.java b/...network/client/ChunkReceivedCallback.java → ...network/client/ChunkReceivedCallback.java
diff --git a/...k/network/client/RpcResponseCallback.java → ...k/network/client/RpcResponseCallback.java b/...k/network/client/RpcResponseCallback.java → ...k/network/client/RpcResponseCallback.java
diff --git a/.../spark/network/client/StreamCallback.java → .../spark/network/client/StreamCallback.java b/.../spark/network/client/StreamCallback.java → .../spark/network/client/StreamCallback.java
diff --git a/...ark/network/client/StreamInterceptor.java → ...ark/network/client/StreamInterceptor.java b/...ark/network/client/StreamInterceptor.java → ...ark/network/client/StreamInterceptor.java
diff --git a/...spark/network/client/TransportClient.java → ...spark/network/client/TransportClient.java b/...spark/network/client/TransportClient.java → ...spark/network/client/TransportClient.java
diff --git a/...work/client/TransportClientBootstrap.java → ...work/client/TransportClientBootstrap.java b/...work/client/TransportClientBootstrap.java → ...work/client/TransportClientBootstrap.java
diff --git a/...etwork/client/TransportClientFactory.java → ...etwork/client/TransportClientFactory.java b/...etwork/client/TransportClientFactory.java → ...etwork/client/TransportClientFactory.java
diff --git a/...work/client/TransportResponseHandler.java → ...work/client/TransportResponseHandler.java b/...work/client/TransportResponseHandler.java → ...work/client/TransportResponseHandler.java
diff --git a/...ark/network/protocol/AbstractMessage.java → ...ark/network/protocol/AbstractMessage.java b/...ark/network/protocol/AbstractMessage.java → ...ark/network/protocol/AbstractMessage.java
diff --git a/...ork/protocol/AbstractResponseMessage.java → ...ork/protocol/AbstractResponseMessage.java b/...ork/protocol/AbstractResponseMessage.java → ...ork/protocol/AbstractResponseMessage.java
diff --git a/...k/network/protocol/ChunkFetchFailure.java → ...k/network/protocol/ChunkFetchFailure.java b/...k/network/protocol/ChunkFetchFailure.java → ...k/network/protocol/ChunkFetchFailure.java
diff --git a/...k/network/protocol/ChunkFetchRequest.java → ...k/network/protocol/ChunkFetchRequest.java b/...k/network/protocol/ChunkFetchRequest.java → ...k/network/protocol/ChunkFetchRequest.java
diff --git a/...k/network/protocol/ChunkFetchSuccess.java → ...k/network/protocol/ChunkFetchSuccess.java b/...k/network/protocol/ChunkFetchSuccess.java → ...k/network/protocol/ChunkFetchSuccess.java
diff --git a/...che/spark/network/protocol/Encodable.java → ...che/spark/network/protocol/Encodable.java b/...che/spark/network/protocol/Encodable.java → ...che/spark/network/protocol/Encodable.java
diff --git a/...ache/spark/network/protocol/Encoders.java → ...ache/spark/network/protocol/Encoders.java b/...ache/spark/network/protocol/Encoders.java → ...ache/spark/network/protocol/Encoders.java
diff --git a/...pache/spark/network/protocol/Message.java → ...pache/spark/network/protocol/Message.java b/...pache/spark/network/protocol/Message.java → ...pache/spark/network/protocol/Message.java
diff --git a/...park/network/protocol/MessageDecoder.java → ...park/network/protocol/MessageDecoder.java b/...park/network/protocol/MessageDecoder.java → ...park/network/protocol/MessageDecoder.java
diff --git a/...park/network/protocol/MessageEncoder.java → ...park/network/protocol/MessageEncoder.java b/...park/network/protocol/MessageEncoder.java → ...park/network/protocol/MessageEncoder.java
diff --git a/...k/network/protocol/MessageWithHeader.java → ...k/network/protocol/MessageWithHeader.java b/...k/network/protocol/MessageWithHeader.java → ...k/network/protocol/MessageWithHeader.java
diff --git a/...spark/network/protocol/OneWayMessage.java → ...spark/network/protocol/OneWayMessage.java b/...spark/network/protocol/OneWayMessage.java → ...spark/network/protocol/OneWayMessage.java
diff --git a/...park/network/protocol/RequestMessage.java → ...park/network/protocol/RequestMessage.java b/...park/network/protocol/RequestMessage.java → ...park/network/protocol/RequestMessage.java
diff --git a/...ark/network/protocol/ResponseMessage.java → ...ark/network/protocol/ResponseMessage.java b/...ark/network/protocol/ResponseMessage.java → ...ark/network/protocol/ResponseMessage.java
diff --git a/...he/spark/network/protocol/RpcFailure.java → ...he/spark/network/protocol/RpcFailure.java b/...he/spark/network/protocol/RpcFailure.java → ...he/spark/network/protocol/RpcFailure.java
diff --git a/...he/spark/network/protocol/RpcRequest.java → ...he/spark/network/protocol/RpcRequest.java b/...he/spark/network/protocol/RpcRequest.java → ...he/spark/network/protocol/RpcRequest.java
diff --git a/...e/spark/network/protocol/RpcResponse.java → ...e/spark/network/protocol/RpcResponse.java b/...e/spark/network/protocol/RpcResponse.java → ...e/spark/network/protocol/RpcResponse.java
diff --git a/...spark/network/protocol/StreamChunkId.java → ...spark/network/protocol/StreamChunkId.java b/...spark/network/protocol/StreamChunkId.java → ...spark/network/protocol/StreamChunkId.java
diff --git a/...spark/network/protocol/StreamFailure.java → ...spark/network/protocol/StreamFailure.java b/...spark/network/protocol/StreamFailure.java → ...spark/network/protocol/StreamFailure.java
diff --git a/...spark/network/protocol/StreamRequest.java → ...spark/network/protocol/StreamRequest.java b/...spark/network/protocol/StreamRequest.java → ...spark/network/protocol/StreamRequest.java
diff --git a/...park/network/protocol/StreamResponse.java → ...park/network/protocol/StreamResponse.java b/...park/network/protocol/StreamResponse.java → ...park/network/protocol/StreamResponse.java
diff --git a/...ark/network/sasl/SaslClientBootstrap.java → ...ark/network/sasl/SaslClientBootstrap.java b/...ark/network/sasl/SaslClientBootstrap.java → ...ark/network/sasl/SaslClientBootstrap.java
diff --git a/...he/spark/network/sasl/SaslEncryption.java → ...he/spark/network/sasl/SaslEncryption.java b/...he/spark/network/sasl/SaslEncryption.java → ...he/spark/network/sasl/SaslEncryption.java
diff --git a/...k/network/sasl/SaslEncryptionBackend.java → ...k/network/sasl/SaslEncryptionBackend.java b/...k/network/sasl/SaslEncryptionBackend.java → ...k/network/sasl/SaslEncryptionBackend.java
diff --git a/...pache/spark/network/sasl/SaslMessage.java → ...pache/spark/network/sasl/SaslMessage.java b/...pache/spark/network/sasl/SaslMessage.java → ...pache/spark/network/sasl/SaslMessage.java
diff --git a/...he/spark/network/sasl/SaslRpcHandler.java → ...he/spark/network/sasl/SaslRpcHandler.java b/...he/spark/network/sasl/SaslRpcHandler.java → ...he/spark/network/sasl/SaslRpcHandler.java
diff --git a/...ark/network/sasl/SaslServerBootstrap.java → ...ark/network/sasl/SaslServerBootstrap.java b/...ark/network/sasl/SaslServerBootstrap.java → ...ark/network/sasl/SaslServerBootstrap.java
diff --git a/...e/spark/network/sasl/SecretKeyHolder.java → ...e/spark/network/sasl/SecretKeyHolder.java b/...e/spark/network/sasl/SecretKeyHolder.java → ...e/spark/network/sasl/SecretKeyHolder.java
diff --git a/...e/spark/network/sasl/SparkSaslClient.java → ...e/spark/network/sasl/SparkSaslClient.java b/...e/spark/network/sasl/SparkSaslClient.java → ...e/spark/network/sasl/SparkSaslClient.java
diff --git a/...e/spark/network/sasl/SparkSaslServer.java → ...e/spark/network/sasl/SparkSaslServer.java b/...e/spark/network/sasl/SparkSaslServer.java → ...e/spark/network/sasl/SparkSaslServer.java
diff --git a/.../spark/network/server/MessageHandler.java → .../spark/network/server/MessageHandler.java b/.../spark/network/server/MessageHandler.java → .../spark/network/server/MessageHandler.java
diff --git a/.../spark/network/server/NoOpRpcHandler.java → .../spark/network/server/NoOpRpcHandler.java b/.../spark/network/server/NoOpRpcHandler.java → .../spark/network/server/NoOpRpcHandler.java
diff --git a/...etwork/server/OneForOneStreamManager.java → ...etwork/server/OneForOneStreamManager.java b/...etwork/server/OneForOneStreamManager.java → ...etwork/server/OneForOneStreamManager.java
diff --git a/...ache/spark/network/server/RpcHandler.java → ...ache/spark/network/server/RpcHandler.java b/...ache/spark/network/server/RpcHandler.java → ...ache/spark/network/server/RpcHandler.java
diff --git a/...e/spark/network/server/StreamManager.java → ...e/spark/network/server/StreamManager.java b/...e/spark/network/server/StreamManager.java → ...e/spark/network/server/StreamManager.java
diff --git a/...twork/server/TransportChannelHandler.java → ...twork/server/TransportChannelHandler.java b/...twork/server/TransportChannelHandler.java → ...twork/server/TransportChannelHandler.java
diff --git a/...twork/server/TransportRequestHandler.java → ...twork/server/TransportRequestHandler.java b/...twork/server/TransportRequestHandler.java → ...twork/server/TransportRequestHandler.java
diff --git a/...spark/network/server/TransportServer.java → ...spark/network/server/TransportServer.java b/...spark/network/server/TransportServer.java → ...spark/network/server/TransportServer.java
diff --git a/...work/server/TransportServerBootstrap.java → ...work/server/TransportServerBootstrap.java b/...work/server/TransportServerBootstrap.java → ...work/server/TransportServerBootstrap.java
diff --git a/...etwork/util/ByteArrayWritableChannel.java → ...etwork/util/ByteArrayWritableChannel.java b/...etwork/util/ByteArrayWritableChannel.java → ...etwork/util/ByteArrayWritableChannel.java
diff --git a/...g/apache/spark/network/util/ByteUnit.java → ...g/apache/spark/network/util/ByteUnit.java b/...g/apache/spark/network/util/ByteUnit.java → ...g/apache/spark/network/util/ByteUnit.java
diff --git a/...he/spark/network/util/ConfigProvider.java → ...he/spark/network/util/ConfigProvider.java b/...he/spark/network/util/ConfigProvider.java → ...he/spark/network/util/ConfigProvider.java
diff --git a/...org/apache/spark/network/util/IOMode.java → ...org/apache/spark/network/util/IOMode.java b/...org/apache/spark/network/util/IOMode.java → ...org/apache/spark/network/util/IOMode.java
diff --git a/.../apache/spark/network/util/JavaUtils.java → .../apache/spark/network/util/JavaUtils.java b/.../apache/spark/network/util/JavaUtils.java → .../apache/spark/network/util/JavaUtils.java
diff --git a/...park/network/util/LimitedInputStream.java → ...park/network/util/LimitedInputStream.java b/...park/network/util/LimitedInputStream.java → ...park/network/util/LimitedInputStream.java
diff --git a/...spark/network/util/MapConfigProvider.java → ...spark/network/util/MapConfigProvider.java b/...spark/network/util/MapConfigProvider.java → ...spark/network/util/MapConfigProvider.java
diff --git a/...apache/spark/network/util/NettyUtils.java → ...apache/spark/network/util/NettyUtils.java b/...apache/spark/network/util/NettyUtils.java → ...apache/spark/network/util/NettyUtils.java
diff --git a/...rk/util/SystemPropertyConfigProvider.java → ...rk/util/SystemPropertyConfigProvider.java b/...rk/util/SystemPropertyConfigProvider.java → ...rk/util/SystemPropertyConfigProvider.java
diff --git a/...che/spark/network/util/TransportConf.java → ...che/spark/network/util/TransportConf.java b/...che/spark/network/util/TransportConf.java → ...che/spark/network/util/TransportConf.java
diff --git a/...k/network/util/TransportFrameDecoder.java → ...k/network/util/TransportFrameDecoder.java b/...k/network/util/TransportFrameDecoder.java → ...k/network/util/TransportFrameDecoder.java
diff --git a/...k/network/ChunkFetchIntegrationSuite.java → ...k/network/ChunkFetchIntegrationSuite.java b/...k/network/ChunkFetchIntegrationSuite.java → ...k/network/ChunkFetchIntegrationSuite.java
diff --git a/...g/apache/spark/network/ProtocolSuite.java → ...g/apache/spark/network/ProtocolSuite.java b/...g/apache/spark/network/ProtocolSuite.java → ...g/apache/spark/network/ProtocolSuite.java
diff --git a/...twork/RequestTimeoutIntegrationSuite.java → ...twork/RequestTimeoutIntegrationSuite.java b/...twork/RequestTimeoutIntegrationSuite.java → ...twork/RequestTimeoutIntegrationSuite.java
diff --git a/...he/spark/network/RpcIntegrationSuite.java → ...he/spark/network/RpcIntegrationSuite.java b/...he/spark/network/RpcIntegrationSuite.java → ...he/spark/network/RpcIntegrationSuite.java
diff --git a/...org/apache/spark/network/StreamSuite.java → ...org/apache/spark/network/StreamSuite.java b/...org/apache/spark/network/StreamSuite.java → ...org/apache/spark/network/StreamSuite.java
diff --git a/...ache/spark/network/TestManagedBuffer.java → ...ache/spark/network/TestManagedBuffer.java b/...ache/spark/network/TestManagedBuffer.java → ...ache/spark/network/TestManagedBuffer.java
diff --git a/...a/org/apache/spark/network/TestUtils.java → ...a/org/apache/spark/network/TestUtils.java b/...a/org/apache/spark/network/TestUtils.java → ...a/org/apache/spark/network/TestUtils.java
diff --git a/.../network/TransportClientFactorySuite.java → .../network/TransportClientFactorySuite.java b/.../network/TransportClientFactorySuite.java → .../network/TransportClientFactorySuite.java
diff --git a/...etwork/TransportResponseHandlerSuite.java → ...etwork/TransportResponseHandlerSuite.java b/...etwork/TransportResponseHandlerSuite.java → ...etwork/TransportResponseHandlerSuite.java
diff --git a/...work/protocol/MessageWithHeaderSuite.java → ...work/protocol/MessageWithHeaderSuite.java b/...work/protocol/MessageWithHeaderSuite.java → ...work/protocol/MessageWithHeaderSuite.java
diff --git a/...he/spark/network/sasl/SparkSaslSuite.java → ...he/spark/network/sasl/SparkSaslSuite.java b/...he/spark/network/sasl/SparkSaslSuite.java → ...he/spark/network/sasl/SparkSaslSuite.java
diff --git a/...k/server/OneForOneStreamManagerSuite.java → ...k/server/OneForOneStreamManagerSuite.java b/...k/server/OneForOneStreamManagerSuite.java → ...k/server/OneForOneStreamManagerSuite.java
diff --git a/...work/util/TransportFrameDecoderSuite.java → ...work/util/TransportFrameDecoderSuite.java b/...work/util/TransportFrameDecoderSuite.java → ...work/util/TransportFrameDecoderSuite.java
diff --git a/...ommon/src/test/resources/log4j.properties → ...ommon/src/test/resources/log4j.properties b/...ommon/src/test/resources/log4j.properties → ...ommon/src/test/resources/log4j.properties
diff --git a/network/shuffle/pom.xml → common/network-shuffle/pom.xml b/network/shuffle/pom.xml → common/network-shuffle/pom.xml
diff --git a/...rk/network/sasl/ShuffleSecretManager.java → ...rk/network/sasl/ShuffleSecretManager.java b/...rk/network/sasl/ShuffleSecretManager.java → ...rk/network/sasl/ShuffleSecretManager.java
diff --git a/...etwork/shuffle/BlockFetchingListener.java → ...etwork/shuffle/BlockFetchingListener.java b/...etwork/shuffle/BlockFetchingListener.java → ...etwork/shuffle/BlockFetchingListener.java
diff --git a/.../shuffle/ExternalShuffleBlockHandler.java → .../shuffle/ExternalShuffleBlockHandler.java b/.../shuffle/ExternalShuffleBlockHandler.java → .../shuffle/ExternalShuffleBlockHandler.java
diff --git a/...shuffle/ExternalShuffleBlockResolver.java → ...shuffle/ExternalShuffleBlockResolver.java b/...shuffle/ExternalShuffleBlockResolver.java → ...shuffle/ExternalShuffleBlockResolver.java
diff --git a/...etwork/shuffle/ExternalShuffleClient.java → ...etwork/shuffle/ExternalShuffleClient.java b/...etwork/shuffle/ExternalShuffleClient.java → ...etwork/shuffle/ExternalShuffleClient.java
diff --git a/...etwork/shuffle/OneForOneBlockFetcher.java → ...etwork/shuffle/OneForOneBlockFetcher.java b/...etwork/shuffle/OneForOneBlockFetcher.java → ...etwork/shuffle/OneForOneBlockFetcher.java
diff --git a/...network/shuffle/RetryingBlockFetcher.java → ...network/shuffle/RetryingBlockFetcher.java b/...network/shuffle/RetryingBlockFetcher.java → ...network/shuffle/RetryingBlockFetcher.java
diff --git a/.../spark/network/shuffle/ShuffleClient.java → .../spark/network/shuffle/ShuffleClient.java b/.../spark/network/shuffle/ShuffleClient.java → .../spark/network/shuffle/ShuffleClient.java
diff --git a/...fle/mesos/MesosExternalShuffleClient.java → ...fle/mesos/MesosExternalShuffleClient.java b/...fle/mesos/MesosExternalShuffleClient.java → ...fle/mesos/MesosExternalShuffleClient.java
diff --git a/...huffle/protocol/BlockTransferMessage.java → ...huffle/protocol/BlockTransferMessage.java b/...huffle/protocol/BlockTransferMessage.java → ...huffle/protocol/BlockTransferMessage.java
diff --git a/...shuffle/protocol/ExecutorShuffleInfo.java → ...shuffle/protocol/ExecutorShuffleInfo.java b/...shuffle/protocol/ExecutorShuffleInfo.java → ...shuffle/protocol/ExecutorShuffleInfo.java
diff --git a/.../network/shuffle/protocol/OpenBlocks.java → .../network/shuffle/protocol/OpenBlocks.java b/.../network/shuffle/protocol/OpenBlocks.java → .../network/shuffle/protocol/OpenBlocks.java
diff --git a/...rk/shuffle/protocol/RegisterExecutor.java → ...rk/shuffle/protocol/RegisterExecutor.java b/...rk/shuffle/protocol/RegisterExecutor.java → ...rk/shuffle/protocol/RegisterExecutor.java
diff --git a/...etwork/shuffle/protocol/StreamHandle.java → ...etwork/shuffle/protocol/StreamHandle.java b/...etwork/shuffle/protocol/StreamHandle.java → ...etwork/shuffle/protocol/StreamHandle.java
diff --git a/...network/shuffle/protocol/UploadBlock.java → ...network/shuffle/protocol/UploadBlock.java b/...network/shuffle/protocol/UploadBlock.java → ...network/shuffle/protocol/UploadBlock.java
diff --git a/...huffle/protocol/mesos/RegisterDriver.java → ...huffle/protocol/mesos/RegisterDriver.java b/...huffle/protocol/mesos/RegisterDriver.java → ...huffle/protocol/mesos/RegisterDriver.java
diff --git a/...rk/network/sasl/SaslIntegrationSuite.java → ...rk/network/sasl/SaslIntegrationSuite.java b/...rk/network/sasl/SaslIntegrationSuite.java → ...rk/network/sasl/SaslIntegrationSuite.java
diff --git a/...k/shuffle/BlockTransferMessagesSuite.java → ...k/shuffle/BlockTransferMessagesSuite.java b/...k/shuffle/BlockTransferMessagesSuite.java → ...k/shuffle/BlockTransferMessagesSuite.java
diff --git a/...fle/ExternalShuffleBlockHandlerSuite.java → ...fle/ExternalShuffleBlockHandlerSuite.java b/...fle/ExternalShuffleBlockHandlerSuite.java → ...fle/ExternalShuffleBlockHandlerSuite.java
diff --git a/...le/ExternalShuffleBlockResolverSuite.java → ...le/ExternalShuffleBlockResolverSuite.java b/...le/ExternalShuffleBlockResolverSuite.java → ...le/ExternalShuffleBlockResolverSuite.java
diff --git a/.../shuffle/ExternalShuffleCleanupSuite.java → .../shuffle/ExternalShuffleCleanupSuite.java b/.../shuffle/ExternalShuffleCleanupSuite.java → .../shuffle/ExternalShuffleCleanupSuite.java
diff --git a/...ffle/ExternalShuffleIntegrationSuite.java → ...ffle/ExternalShuffleIntegrationSuite.java b/...ffle/ExternalShuffleIntegrationSuite.java → ...ffle/ExternalShuffleIntegrationSuite.java
diff --git a/...shuffle/ExternalShuffleSecuritySuite.java → ...shuffle/ExternalShuffleSecuritySuite.java b/...shuffle/ExternalShuffleSecuritySuite.java → ...shuffle/ExternalShuffleSecuritySuite.java
diff --git a/...k/shuffle/OneForOneBlockFetcherSuite.java → ...k/shuffle/OneForOneBlockFetcherSuite.java b/...k/shuffle/OneForOneBlockFetcherSuite.java → ...k/shuffle/OneForOneBlockFetcherSuite.java
diff --git a/...rk/shuffle/RetryingBlockFetcherSuite.java → ...rk/shuffle/RetryingBlockFetcherSuite.java b/...rk/shuffle/RetryingBlockFetcherSuite.java → ...rk/shuffle/RetryingBlockFetcherSuite.java
diff --git a/...twork/shuffle/TestShuffleDataContext.java → ...twork/shuffle/TestShuffleDataContext.java b/...twork/shuffle/TestShuffleDataContext.java → ...twork/shuffle/TestShuffleDataContext.java
diff --git a/network/yarn/pom.xml → common/network-yarn/pom.xml b/network/yarn/pom.xml → common/network-yarn/pom.xml
diff --git a/...park/network/yarn/YarnShuffleService.java → ...park/network/yarn/YarnShuffleService.java b/...park/network/yarn/YarnShuffleService.java → ...park/network/yarn/YarnShuffleService.java
diff --git a/...twork/yarn/util/HadoopConfigProvider.java → ...twork/yarn/util/HadoopConfigProvider.java b/...twork/yarn/util/HadoopConfigProvider.java → ...twork/yarn/util/HadoopConfigProvider.java
diff --git a/dev/sparktestsupport/modules.py b/dev/sparktestsupport/modules.py
@@ -473,11 +473,11 @@ def __hash__(self):
     dependencies=[],
     source_file_regexes=[
         "yarn/",
-        "network/yarn/",
+        "common/network-yarn/",
     ],
     sbt_test_goals=[
         "yarn/test",
-        "network-yarn/test",
+        "common/network-yarn/test",
     ],
     test_tags=[
         "org.apache.spark.tags.ExtendedYarnTest"

diff --git a/docs/job-scheduling.md b/docs/job-scheduling.md
@@ -88,7 +88,7 @@ In YARN mode, start the shuffle service on each `NodeManager` as follows:
 1. Build Spark with the [YARN profile](building-spark.html). Skip this step if you are using a
 pre-packaged distribution.
 2. Locate the `spark-<version>-yarn-shuffle.jar`. This should be under
-`$SPARK_HOME/network/yarn/target/scala-<version>` if you are building Spark yourself, and under
+`$SPARK_HOME/common/network-yarn/target/scala-<version>` if you are building Spark yourself, and under
 `lib` if you are using a distribution.
 2. Add this jar to the classpath of all `NodeManager`s in your cluster.
 3. In the `yarn-site.xml` on each node, add `spark_shuffle` to `yarn.nodemanager.aux-services`,

diff --git a/launcher/src/main/java/org/apache/spark/launcher/AbstractCommandBuilder.java b/launcher/src/main/java/org/apache/spark/launcher/AbstractCommandBuilder.java
@@ -148,7 +148,8 @@ List<String> buildClassPath(String appClassPath) throws IOException {
       String scala = getScalaVersion();
       List<String> projects = Arrays.asList("core", "repl", "mllib", "graphx",
         "streaming", "tools", "sql/catalyst", "sql/core", "sql/hive", "sql/hive-thriftserver",
-        "yarn", "launcher", "network/common", "network/shuffle", "network/yarn");
+        "yarn", "launcher",
+        "common/network-common", "common/network-shuffle", "common/network-yarn");
       if (prependClasses) {
         if (!isTesting) {
           System.err.println(

diff --git a/make-distribution.sh b/make-distribution.sh
@@ -169,7 +169,7 @@ cp "$SPARK_HOME"/assembly/target/scala*/*assembly*hadoop*.jar "$DISTDIR/lib/"
 cp "$SPARK_HOME"/examples/target/scala*/spark-examples*.jar "$DISTDIR/lib/"
 # This will fail if the -Pyarn profile is not provided
 # In this case, silence the error and ignore the return code of this command
-cp "$SPARK_HOME"/network/yarn/target/scala*/spark-*-yarn-shuffle.jar "$DISTDIR/lib/" &> /dev/null || :
+cp "$SPARK_HOME"/common/network-yarn/target/scala*/spark-*-yarn-shuffle.jar "$DISTDIR/lib/" &> /dev/null || :
 
 # Copy example sources (needed for python and SQL)
 mkdir -p "$DISTDIR/examples/src/main"

diff --git a/pom.xml b/pom.xml
@@ -87,13 +87,13 @@
 
   <modules>
     <module>common/sketch</module>
+    <module>common/network-common</module>
+    <module>common/network-shuffle</module>
     <module>tags</module>
     <module>core</module>
     <module>graphx</module>
     <module>mllib</module>
     <module>tools</module>
-    <module>network/common</module>
-    <module>network/shuffle</module>
     <module>streaming</module>
     <module>sql/catalyst</module>
     <module>sql/core</module>
@@ -2442,7 +2442,7 @@
       <id>yarn</id>
       <modules>
         <module>yarn</module>
-        <module>network/yarn</module>
+        <module>common/network-yarn</module>
       </modules>
     </profile>