From 1675c18ded4ae7a03c2236a773f4f4b6c8057af3 Mon Sep 17 00:00:00 2001 From: Aaron Myers Date: Tue, 17 Apr 2012 16:49:04 +0000 Subject: [PATCH] Revert HADOOP-8280 so it can be recommitted using `svn mv' git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1327179 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-common-project/hadoop-common/CHANGES.txt | 3 --- .../org/apache/hadoop/hdfs/server/datanode/BPServiceActor.java | 2 +- .../apache/hadoop/hdfs/server/namenode/NameNodeRpcServer.java | 2 +- .../main/java/org/apache/hadoop/hdfs}/util/VersionUtil.java | 2 +- .../java/org/apache/hadoop/hdfs}/util/TestVersionUtil.java | 3 +-- .../src/test/java/org/apache/hadoop/test/GenericTestUtils.java | 0 6 files changed, 4 insertions(+), 8 deletions(-) rename {hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop => hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs}/util/VersionUtil.java (99%) rename {hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop => hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs}/util/TestVersionUtil.java (96%) rename {hadoop-common-project/hadoop-common => hadoop-hdfs-project/hadoop-hdfs}/src/test/java/org/apache/hadoop/test/GenericTestUtils.java (100%) diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 51db2e5c32..44a8723459 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -260,9 +260,6 @@ Release 2.0.0 - UNRELEASED HADOOP-8086. KerberosName silently sets defaultRealm to "" if the Kerberos config is not found, it should log a WARN (tucu) - HADOOP-8280. Move VersionUtil/TestVersionUtil and GenericTestUtils from - HDFS into Common. (Ahmed Radwan via atm) - OPTIMIZATIONS BUG FIXES diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BPServiceActor.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BPServiceActor.java index f018f53e73..f5d09b1fef 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BPServiceActor.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BPServiceActor.java @@ -48,11 +48,11 @@ import org.apache.hadoop.hdfs.server.protocol.StorageBlockReport; import org.apache.hadoop.hdfs.server.protocol.StorageReceivedDeletedBlocks; import org.apache.hadoop.hdfs.server.protocol.StorageReport; +import org.apache.hadoop.hdfs.util.VersionUtil; import org.apache.hadoop.io.IOUtils; import org.apache.hadoop.ipc.RemoteException; import org.apache.hadoop.util.StringUtils; import org.apache.hadoop.util.VersionInfo; -import org.apache.hadoop.util.VersionUtil; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.Maps; diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeRpcServer.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeRpcServer.java index af3dd16d76..4c891d3d4d 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeRpcServer.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeRpcServer.java @@ -108,6 +108,7 @@ import org.apache.hadoop.hdfs.server.protocol.StorageReceivedDeletedBlocks; import org.apache.hadoop.hdfs.server.protocol.StorageReport; import org.apache.hadoop.hdfs.server.protocol.UpgradeCommand; +import org.apache.hadoop.hdfs.util.VersionUtil; import org.apache.hadoop.io.EnumSetWritable; import org.apache.hadoop.io.Text; import org.apache.hadoop.ipc.ProtobufRpcEngine; @@ -123,7 +124,6 @@ import org.apache.hadoop.security.token.SecretManager.InvalidToken; import org.apache.hadoop.security.token.Token; import org.apache.hadoop.util.VersionInfo; -import org.apache.hadoop.util.VersionUtil; import com.google.protobuf.BlockingService; diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/VersionUtil.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/util/VersionUtil.java similarity index 99% rename from hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/VersionUtil.java rename to hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/util/VersionUtil.java index dd68c4d74b..59aa5e128e 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/VersionUtil.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/util/VersionUtil.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.hadoop.util; +package org.apache.hadoop.hdfs.util; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestVersionUtil.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/util/TestVersionUtil.java similarity index 96% rename from hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestVersionUtil.java rename to hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/util/TestVersionUtil.java index b5b1ebf3de..c2537fd515 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestVersionUtil.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/util/TestVersionUtil.java @@ -15,12 +15,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.hadoop.util; +package org.apache.hadoop.hdfs.util; import static org.junit.Assert.*; import org.apache.hadoop.test.GenericTestUtils; -import org.apache.hadoop.util.VersionUtil; import org.junit.Test; public class TestVersionUtil { diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/GenericTestUtils.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/test/GenericTestUtils.java similarity index 100% rename from hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/GenericTestUtils.java rename to hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/test/GenericTestUtils.java