From 587f50d184494597bbb2d1c6b0832bb837b2a1cb Mon Sep 17 00:00:00 2001
From: Abraham Elmahrek <abe@apache.org>
Date: Mon, 23 Mar 2015 15:23:34 -0700
Subject: [PATCH] SQOOP-2249: Sqoop2: ErrorCodes: Move SecurityError to core
 module

(Jarek Jarcec Cecho via Abraham Elmahrek)
---
 .../src/main/java/org/apache/sqoop/security}/SecurityError.java | 2 +-
 .../main/java/org/apache/sqoop/security/SecurityFactory.java    | 1 -
 .../security/Authentication/KerberosAuthenticationHandler.java  | 2 +-
 .../security/Authorization/DefaultAuthenticationProvider.java   | 2 +-
 .../java/org/apache/sqoop/filter/SqoopAuthenticationFilter.java | 2 +-
 .../org/apache/sqoop/handler/AuthorizationRequestHandler.java   | 2 +-
 6 files changed, 5 insertions(+), 6 deletions(-)
 rename {common/src/main/java/org/apache/sqoop/error/code => core/src/main/java/org/apache/sqoop/security}/SecurityError.java (98%)

diff --git a/common/src/main/java/org/apache/sqoop/error/code/SecurityError.java b/core/src/main/java/org/apache/sqoop/security/SecurityError.java
similarity index 98%
rename from common/src/main/java/org/apache/sqoop/error/code/SecurityError.java
rename to core/src/main/java/org/apache/sqoop/security/SecurityError.java
index dee745d8..9f85b9e1 100644
--- a/common/src/main/java/org/apache/sqoop/error/code/SecurityError.java
+++ b/core/src/main/java/org/apache/sqoop/security/SecurityError.java
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sqoop.error.code;
+package org.apache.sqoop.security;
 
 import org.apache.sqoop.common.ErrorCode;
 
diff --git a/core/src/main/java/org/apache/sqoop/security/SecurityFactory.java b/core/src/main/java/org/apache/sqoop/security/SecurityFactory.java
index 9fdf5f8c..727d3be2 100644
--- a/core/src/main/java/org/apache/sqoop/security/SecurityFactory.java
+++ b/core/src/main/java/org/apache/sqoop/security/SecurityFactory.java
@@ -18,7 +18,6 @@
 package org.apache.sqoop.security;
 
 import org.apache.sqoop.common.SqoopException;
-import org.apache.sqoop.error.code.SecurityError;
 import org.apache.sqoop.utils.ClassUtils;
 
 /**
diff --git a/security/src/main/java/org/apache/sqoop/security/Authentication/KerberosAuthenticationHandler.java b/security/src/main/java/org/apache/sqoop/security/Authentication/KerberosAuthenticationHandler.java
index 3515b81a..db89a2d5 100644
--- a/security/src/main/java/org/apache/sqoop/security/Authentication/KerberosAuthenticationHandler.java
+++ b/security/src/main/java/org/apache/sqoop/security/Authentication/KerberosAuthenticationHandler.java
@@ -26,7 +26,7 @@
 import org.apache.sqoop.core.SqoopConfiguration;
 import org.apache.sqoop.security.AuthenticationHandler;
 import org.apache.sqoop.security.SecurityConstants;
-import org.apache.sqoop.error.code.SecurityError;
+import org.apache.sqoop.security.SecurityError;
 
 import java.io.IOException;
 
diff --git a/security/src/main/java/org/apache/sqoop/security/Authorization/DefaultAuthenticationProvider.java b/security/src/main/java/org/apache/sqoop/security/Authorization/DefaultAuthenticationProvider.java
index e05f1deb..547040b3 100644
--- a/security/src/main/java/org/apache/sqoop/security/Authorization/DefaultAuthenticationProvider.java
+++ b/security/src/main/java/org/apache/sqoop/security/Authorization/DefaultAuthenticationProvider.java
@@ -22,7 +22,7 @@
 import org.apache.hadoop.security.token.delegation.web.HttpUserGroupInformation;
 import org.apache.sqoop.common.SqoopException;
 import org.apache.sqoop.security.AuthenticationProvider;
-import org.apache.sqoop.error.code.SecurityError;
+import org.apache.sqoop.security.SecurityError;
 
 public class DefaultAuthenticationProvider extends AuthenticationProvider {
 
diff --git a/server/src/main/java/org/apache/sqoop/filter/SqoopAuthenticationFilter.java b/server/src/main/java/org/apache/sqoop/filter/SqoopAuthenticationFilter.java
index 20d43e46..ddca9d4e 100644
--- a/server/src/main/java/org/apache/sqoop/filter/SqoopAuthenticationFilter.java
+++ b/server/src/main/java/org/apache/sqoop/filter/SqoopAuthenticationFilter.java
@@ -29,7 +29,7 @@
 import org.apache.sqoop.common.SqoopException;
 import org.apache.sqoop.core.SqoopConfiguration;
 import org.apache.sqoop.security.SecurityConstants;
-import org.apache.sqoop.error.code.SecurityError;
+import org.apache.sqoop.security.SecurityError;
 
 import javax.servlet.FilterConfig;
 import javax.servlet.ServletException;
diff --git a/server/src/main/java/org/apache/sqoop/handler/AuthorizationRequestHandler.java b/server/src/main/java/org/apache/sqoop/handler/AuthorizationRequestHandler.java
index 1d2af8d9..00f4b52f 100644
--- a/server/src/main/java/org/apache/sqoop/handler/AuthorizationRequestHandler.java
+++ b/server/src/main/java/org/apache/sqoop/handler/AuthorizationRequestHandler.java
@@ -28,7 +28,7 @@
 import org.apache.sqoop.model.MRole;
 import org.apache.sqoop.security.AuthorizationHandler;
 import org.apache.sqoop.security.AuthorizationManager;
-import org.apache.sqoop.error.code.SecurityError;
+import org.apache.sqoop.security.SecurityError;
 import org.apache.sqoop.server.RequestContext;
 import org.apache.sqoop.server.RequestHandler;
 import org.json.simple.JSONObject;