Repository: hadoop Updated Branches: refs/heads/branch-2 1b91a6d01 -> ba0969fb0
Revert HADOOP-11356 in branch-2. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/ba0969fb Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/ba0969fb Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/ba0969fb Branch: refs/heads/branch-2 Commit: ba0969fb0e9a733aa0fc07fa62d90fa0f6a669c2 Parents: 1b91a6d Author: Haohui Mai <[email protected]> Authored: Tue Dec 16 13:21:58 2014 -0800 Committer: Haohui Mai <[email protected]> Committed: Tue Dec 16 13:21:58 2014 -0800 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 3 - .../fs/permission/AccessControlException.java | 66 ++++++++++++++++++++ .../hadoop/security/AccessControlException.java | 4 +- 3 files changed, 68 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/ba0969fb/hadoop-common-project/hadoop-common/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 6bee10c..21f1619 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -46,9 +46,6 @@ Release 2.7.0 - UNRELEASED HADOOP-11301. [optionally] update jmx cache to drop old metrics (Maysam Yabandeh via stack) - HADOOP-11356. Removed deprecated o.a.h.fs.permission.AccessControlException. - (Li Lu via wheat9) - HADOOP-11313. Adding a document about NativeLibraryChecker. (Tsuyoshi OZAWA via cnauroth) http://git-wip-us.apache.org/repos/asf/hadoop/blob/ba0969fb/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/permission/AccessControlException.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/permission/AccessControlException.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/permission/AccessControlException.java new file mode 100644 index 0000000..1cd6395 --- /dev/null +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/permission/AccessControlException.java @@ -0,0 +1,66 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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 org.apache.hadoop.fs.permission; + +import java.io.IOException; + +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; + +/** + * An exception class for access control related issues. + * @deprecated Use {@link org.apache.hadoop.security.AccessControlException} + * instead. + */ +@Deprecated [email protected] [email protected] +public class AccessControlException extends IOException { + //Required by {@link java.io.Serializable}. + private static final long serialVersionUID = 1L; + + /** + * Default constructor is needed for unwrapping from + * {@link org.apache.hadoop.ipc.RemoteException}. + */ + public AccessControlException() { + super("Permission denied."); + } + + /** + * Constructs an {@link AccessControlException} + * with the specified detail message. + * @param s the detail message. + */ + public AccessControlException(String s) { + super(s); + } + + /** + * Constructs a new exception with the specified cause and a detail + * message of <tt>(cause==null ? null : cause.toString())</tt> (which + * typically contains the class and detail message of <tt>cause</tt>). + * @param cause the cause (which is saved for later retrieval by the + * {@link #getCause()} method). (A <tt>null</tt> value is + * permitted, and indicates that the cause is nonexistent or + * unknown.) + */ + public AccessControlException(Throwable cause) { + super(cause); + } +} http://git-wip-us.apache.org/repos/asf/hadoop/blob/ba0969fb/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/AccessControlException.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/AccessControlException.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/AccessControlException.java index b1ab829..5f0faa6 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/AccessControlException.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/AccessControlException.java @@ -17,7 +17,6 @@ */ package org.apache.hadoop.security; -import java.io.IOException; import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.classification.InterfaceStability; @@ -26,7 +25,8 @@ import org.apache.hadoop.classification.InterfaceStability; */ @InterfaceAudience.LimitedPrivate({"HDFS", "MapReduce"}) @InterfaceStability.Evolving -public class AccessControlException extends IOException { +public class AccessControlException + extends org.apache.hadoop.fs.permission.AccessControlException { //Required by {@link java.io.Serializable}. private static final long serialVersionUID = 1L;
