diff --git a/core/src/main/java/org/apache/sqoop/audit/AuditLoggerError.java b/common/src/main/java/org/apache/sqoop/error/code/AuditLoggerError.java similarity index 97% rename from core/src/main/java/org/apache/sqoop/audit/AuditLoggerError.java rename to common/src/main/java/org/apache/sqoop/error/code/AuditLoggerError.java index 5999e1c5..1af8d7dc 100644 --- a/core/src/main/java/org/apache/sqoop/audit/AuditLoggerError.java +++ b/common/src/main/java/org/apache/sqoop/error/code/AuditLoggerError.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sqoop.audit; +package org.apache.sqoop.error.code; import org.apache.sqoop.common.ErrorCode; diff --git a/core/src/main/java/org/apache/sqoop/connector/ConnectorError.java b/common/src/main/java/org/apache/sqoop/error/code/ConnectorError.java similarity index 98% rename from core/src/main/java/org/apache/sqoop/connector/ConnectorError.java rename to common/src/main/java/org/apache/sqoop/error/code/ConnectorError.java index d544fb13..2f17d95c 100644 --- a/core/src/main/java/org/apache/sqoop/connector/ConnectorError.java +++ b/common/src/main/java/org/apache/sqoop/error/code/ConnectorError.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sqoop.connector; +package org.apache.sqoop.error.code; import org.apache.sqoop.common.ErrorCode; diff --git a/core/src/main/java/org/apache/sqoop/core/CoreError.java b/common/src/main/java/org/apache/sqoop/error/code/CoreError.java similarity index 98% rename from core/src/main/java/org/apache/sqoop/core/CoreError.java rename to common/src/main/java/org/apache/sqoop/error/code/CoreError.java index eb7c1dc5..24e73c38 100644 --- a/core/src/main/java/org/apache/sqoop/core/CoreError.java +++ b/common/src/main/java/org/apache/sqoop/error/code/CoreError.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sqoop.core; +package org.apache.sqoop.error.code; import org.apache.sqoop.common.ErrorCode; diff --git a/core/src/main/java/org/apache/sqoop/driver/DriverError.java b/common/src/main/java/org/apache/sqoop/error/code/DriverError.java similarity index 98% rename from core/src/main/java/org/apache/sqoop/driver/DriverError.java rename to common/src/main/java/org/apache/sqoop/error/code/DriverError.java index 25a1b70f..0ec93104 100644 --- a/core/src/main/java/org/apache/sqoop/driver/DriverError.java +++ b/common/src/main/java/org/apache/sqoop/error/code/DriverError.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sqoop.driver; +package org.apache.sqoop.error.code; import org.apache.sqoop.common.ErrorCode; diff --git a/core/src/main/java/org/apache/sqoop/repository/RepositoryError.java b/common/src/main/java/org/apache/sqoop/error/code/RepositoryError.java similarity index 99% rename from core/src/main/java/org/apache/sqoop/repository/RepositoryError.java rename to common/src/main/java/org/apache/sqoop/error/code/RepositoryError.java index f684e85f..fb8d9c51 100644 --- a/core/src/main/java/org/apache/sqoop/repository/RepositoryError.java +++ b/common/src/main/java/org/apache/sqoop/error/code/RepositoryError.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sqoop.repository; +package org.apache.sqoop.error.code; import org.apache.sqoop.common.ErrorCode; diff --git a/core/src/main/java/org/apache/sqoop/security/SecurityError.java b/common/src/main/java/org/apache/sqoop/error/code/SecurityError.java similarity index 98% rename from core/src/main/java/org/apache/sqoop/security/SecurityError.java rename to common/src/main/java/org/apache/sqoop/error/code/SecurityError.java index 9f85b9e1..dee745d8 100644 --- a/core/src/main/java/org/apache/sqoop/security/SecurityError.java +++ b/common/src/main/java/org/apache/sqoop/error/code/SecurityError.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sqoop.security; +package org.apache.sqoop.error.code; import org.apache.sqoop.common.ErrorCode; diff --git a/core/src/main/java/org/apache/sqoop/audit/AuditLoggerManager.java b/core/src/main/java/org/apache/sqoop/audit/AuditLoggerManager.java index 17a996f5..728127bd 100644 --- a/core/src/main/java/org/apache/sqoop/audit/AuditLoggerManager.java +++ b/core/src/main/java/org/apache/sqoop/audit/AuditLoggerManager.java @@ -23,6 +23,7 @@ import org.apache.sqoop.core.Reconfigurable; import org.apache.sqoop.core.SqoopConfiguration; import org.apache.sqoop.core.SqoopConfiguration.CoreConfigurationListener; +import org.apache.sqoop.error.code.AuditLoggerError; import org.apache.sqoop.utils.ClassUtils; import java.util.ArrayList; diff --git a/core/src/main/java/org/apache/sqoop/audit/FileAuditLogger.java b/core/src/main/java/org/apache/sqoop/audit/FileAuditLogger.java index ca932665..42cb330a 100644 --- a/core/src/main/java/org/apache/sqoop/audit/FileAuditLogger.java +++ b/core/src/main/java/org/apache/sqoop/audit/FileAuditLogger.java @@ -23,6 +23,7 @@ import org.apache.log4j.Logger; import org.apache.log4j.PropertyConfigurator; import org.apache.sqoop.common.SqoopException; +import org.apache.sqoop.error.code.AuditLoggerError; public class FileAuditLogger extends AuditLogger { diff --git a/core/src/main/java/org/apache/sqoop/connector/ConnectorHandler.java b/core/src/main/java/org/apache/sqoop/connector/ConnectorHandler.java index bfdb7b34..716a5b13 100644 --- a/core/src/main/java/org/apache/sqoop/connector/ConnectorHandler.java +++ b/core/src/main/java/org/apache/sqoop/connector/ConnectorHandler.java @@ -26,6 +26,7 @@ import org.apache.sqoop.common.SqoopException; import org.apache.sqoop.connector.spi.SqoopConnector; import org.apache.sqoop.core.ConfigurationConstants; +import org.apache.sqoop.error.code.ConnectorError; import org.apache.sqoop.model.ConfigUtils; import org.apache.sqoop.model.MConnector; import org.apache.sqoop.model.MFromConfig; diff --git a/core/src/main/java/org/apache/sqoop/connector/ConnectorManager.java b/core/src/main/java/org/apache/sqoop/connector/ConnectorManager.java index 0907efb3..0b150468 100644 --- a/core/src/main/java/org/apache/sqoop/connector/ConnectorManager.java +++ b/core/src/main/java/org/apache/sqoop/connector/ConnectorManager.java @@ -35,6 +35,7 @@ import org.apache.sqoop.core.Reconfigurable; import org.apache.sqoop.core.SqoopConfiguration; import org.apache.sqoop.core.SqoopConfiguration.CoreConfigurationListener; +import org.apache.sqoop.error.code.ConnectorError; import org.apache.sqoop.model.MConnector; import org.apache.sqoop.repository.Repository; import org.apache.sqoop.repository.RepositoryManager; diff --git a/core/src/main/java/org/apache/sqoop/connector/ConnectorManagerUtils.java b/core/src/main/java/org/apache/sqoop/connector/ConnectorManagerUtils.java index bd85e997..99736c6a 100644 --- a/core/src/main/java/org/apache/sqoop/connector/ConnectorManagerUtils.java +++ b/core/src/main/java/org/apache/sqoop/connector/ConnectorManagerUtils.java @@ -20,6 +20,7 @@ import org.apache.commons.lang.StringUtils; import org.apache.sqoop.common.SqoopException; import org.apache.sqoop.core.ConfigurationConstants; +import org.apache.sqoop.error.code.ConnectorError; import java.io.File; import java.io.IOException; diff --git a/core/src/main/java/org/apache/sqoop/core/PropertiesConfigurationProvider.java b/core/src/main/java/org/apache/sqoop/core/PropertiesConfigurationProvider.java index 023fabce..f1c48207 100644 --- a/core/src/main/java/org/apache/sqoop/core/PropertiesConfigurationProvider.java +++ b/core/src/main/java/org/apache/sqoop/core/PropertiesConfigurationProvider.java @@ -31,6 +31,8 @@ import org.apache.log4j.Logger; import org.apache.sqoop.common.SqoopException; +import org.apache.sqoop.error.code.CoreError; + import static org.apache.sqoop.core.ConfigurationConstants.PROPERTIES_PROVIDER_SLEEP; public class PropertiesConfigurationProvider implements ConfigurationProvider { diff --git a/core/src/main/java/org/apache/sqoop/core/SqoopConfiguration.java b/core/src/main/java/org/apache/sqoop/core/SqoopConfiguration.java index 13bbfc2c..383a8c04 100644 --- a/core/src/main/java/org/apache/sqoop/core/SqoopConfiguration.java +++ b/core/src/main/java/org/apache/sqoop/core/SqoopConfiguration.java @@ -28,6 +28,7 @@ import org.apache.log4j.PropertyConfigurator; import org.apache.sqoop.common.MapContext; import org.apache.sqoop.common.SqoopException; +import org.apache.sqoop.error.code.CoreError; /** * Configuration manager that loads Sqoop configuration. diff --git a/core/src/main/java/org/apache/sqoop/driver/JobManager.java b/core/src/main/java/org/apache/sqoop/driver/JobManager.java index dc441bc2..d64c1481 100644 --- a/core/src/main/java/org/apache/sqoop/driver/JobManager.java +++ b/core/src/main/java/org/apache/sqoop/driver/JobManager.java @@ -31,6 +31,7 @@ import org.apache.sqoop.core.SqoopConfiguration; import org.apache.sqoop.core.SqoopConfiguration.CoreConfigurationListener; import org.apache.sqoop.driver.configuration.JobConfiguration; +import org.apache.sqoop.error.code.DriverError; import org.apache.sqoop.job.etl.Destroyer; import org.apache.sqoop.job.etl.DestroyerContext; import org.apache.sqoop.job.etl.Initializer; diff --git a/core/src/main/java/org/apache/sqoop/repository/JdbcRepository.java b/core/src/main/java/org/apache/sqoop/repository/JdbcRepository.java index 9c5e15e6..052adba4 100644 --- a/core/src/main/java/org/apache/sqoop/repository/JdbcRepository.java +++ b/core/src/main/java/org/apache/sqoop/repository/JdbcRepository.java @@ -23,6 +23,7 @@ import org.apache.log4j.Logger; import org.apache.sqoop.common.SqoopException; +import org.apache.sqoop.error.code.RepositoryError; import org.apache.sqoop.model.MConfig; import org.apache.sqoop.model.MConfigUpdateEntityType; import org.apache.sqoop.model.MConnector; diff --git a/core/src/main/java/org/apache/sqoop/repository/JdbcRepositoryContext.java b/core/src/main/java/org/apache/sqoop/repository/JdbcRepositoryContext.java index 0a8139aa..99cd4ee3 100644 --- a/core/src/main/java/org/apache/sqoop/repository/JdbcRepositoryContext.java +++ b/core/src/main/java/org/apache/sqoop/repository/JdbcRepositoryContext.java @@ -25,6 +25,7 @@ import org.apache.log4j.Logger; import org.apache.sqoop.common.SqoopException; import org.apache.sqoop.common.MapContext; +import org.apache.sqoop.error.code.RepositoryError; public final class JdbcRepositoryContext { diff --git a/core/src/main/java/org/apache/sqoop/repository/JdbcRepositoryProvider.java b/core/src/main/java/org/apache/sqoop/repository/JdbcRepositoryProvider.java index 011527f3..56b859e1 100644 --- a/core/src/main/java/org/apache/sqoop/repository/JdbcRepositoryProvider.java +++ b/core/src/main/java/org/apache/sqoop/repository/JdbcRepositoryProvider.java @@ -35,6 +35,7 @@ import org.apache.sqoop.common.SqoopException; import org.apache.sqoop.common.MapContext; import org.apache.sqoop.core.SqoopConfiguration; +import org.apache.sqoop.error.code.RepositoryError; import org.apache.sqoop.utils.ClassUtils; diff --git a/core/src/main/java/org/apache/sqoop/repository/JdbcRepositoryTransaction.java b/core/src/main/java/org/apache/sqoop/repository/JdbcRepositoryTransaction.java index 86be30ff..bc7c3168 100644 --- a/core/src/main/java/org/apache/sqoop/repository/JdbcRepositoryTransaction.java +++ b/core/src/main/java/org/apache/sqoop/repository/JdbcRepositoryTransaction.java @@ -26,6 +26,7 @@ import org.apache.log4j.LogManager; import org.apache.log4j.Logger; import org.apache.sqoop.common.SqoopException; +import org.apache.sqoop.error.code.RepositoryError; public class JdbcRepositoryTransaction implements RepositoryTransaction { diff --git a/core/src/main/java/org/apache/sqoop/repository/Repository.java b/core/src/main/java/org/apache/sqoop/repository/Repository.java index aa91661f..ceedc5d5 100644 --- a/core/src/main/java/org/apache/sqoop/repository/Repository.java +++ b/core/src/main/java/org/apache/sqoop/repository/Repository.java @@ -30,6 +30,7 @@ import org.apache.sqoop.connector.spi.SqoopConnector; import org.apache.sqoop.driver.Driver; import org.apache.sqoop.driver.DriverUpgrader; +import org.apache.sqoop.error.code.RepositoryError; import org.apache.sqoop.json.DriverBean; import org.apache.sqoop.model.ConfigUtils; import org.apache.sqoop.model.MConfig; diff --git a/core/src/main/java/org/apache/sqoop/repository/RepositoryManager.java b/core/src/main/java/org/apache/sqoop/repository/RepositoryManager.java index 121f388d..8015216a 100644 --- a/core/src/main/java/org/apache/sqoop/repository/RepositoryManager.java +++ b/core/src/main/java/org/apache/sqoop/repository/RepositoryManager.java @@ -25,6 +25,7 @@ import org.apache.sqoop.core.Reconfigurable; import org.apache.sqoop.core.SqoopConfiguration; import org.apache.sqoop.core.SqoopConfiguration.CoreConfigurationListener; +import org.apache.sqoop.error.code.RepositoryError; import org.apache.sqoop.utils.ClassUtils; public class RepositoryManager implements Reconfigurable { 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 727d3be2..9fdf5f8c 100644 --- a/core/src/main/java/org/apache/sqoop/security/SecurityFactory.java +++ b/core/src/main/java/org/apache/sqoop/security/SecurityFactory.java @@ -18,6 +18,7 @@ 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/core/src/test/java/org/apache/sqoop/core/TestSqoopConfiguration.java b/core/src/test/java/org/apache/sqoop/core/TestSqoopConfiguration.java index 956e6abb..b11587c5 100644 --- a/core/src/test/java/org/apache/sqoop/core/TestSqoopConfiguration.java +++ b/core/src/test/java/org/apache/sqoop/core/TestSqoopConfiguration.java @@ -20,6 +20,7 @@ import java.util.Properties; import org.apache.sqoop.common.SqoopException; +import org.apache.sqoop.error.code.CoreError; import org.testng.Assert; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; diff --git a/core/src/test/java/org/apache/sqoop/driver/TestJobManager.java b/core/src/test/java/org/apache/sqoop/driver/TestJobManager.java index baca35f9..2a14ff28 100644 --- a/core/src/test/java/org/apache/sqoop/driver/TestJobManager.java +++ b/core/src/test/java/org/apache/sqoop/driver/TestJobManager.java @@ -31,6 +31,7 @@ import org.apache.sqoop.common.SqoopException; import org.apache.sqoop.connector.ConnectorManager; import org.apache.sqoop.connector.spi.SqoopConnector; +import org.apache.sqoop.error.code.DriverError; import org.apache.sqoop.model.MJob; import org.apache.sqoop.model.MLink; import org.apache.sqoop.model.MSubmission; diff --git a/core/src/test/java/org/apache/sqoop/repository/TestJdbcRepository.java b/core/src/test/java/org/apache/sqoop/repository/TestJdbcRepository.java index 9b153fc5..1c97c321 100644 --- a/core/src/test/java/org/apache/sqoop/repository/TestJdbcRepository.java +++ b/core/src/test/java/org/apache/sqoop/repository/TestJdbcRepository.java @@ -47,6 +47,7 @@ import org.apache.sqoop.connector.spi.SqoopConnector; import org.apache.sqoop.driver.Driver; import org.apache.sqoop.driver.DriverUpgrader; +import org.apache.sqoop.error.code.RepositoryError; import org.apache.sqoop.json.DriverBean; import org.apache.sqoop.model.ConfigUtils; import org.apache.sqoop.model.ConfigurationClass; diff --git a/core/src/test/java/org/apache/sqoop/repository/TestRepositoryManager.java b/core/src/test/java/org/apache/sqoop/repository/TestRepositoryManager.java index 95b868a9..ba535529 100644 --- a/core/src/test/java/org/apache/sqoop/repository/TestRepositoryManager.java +++ b/core/src/test/java/org/apache/sqoop/repository/TestRepositoryManager.java @@ -24,6 +24,7 @@ import org.apache.sqoop.core.PropertiesConfigurationProvider; import org.apache.sqoop.core.SqoopConfiguration; import org.apache.sqoop.core.TestUtils; +import org.apache.sqoop.error.code.RepositoryError; import org.testng.Assert; import org.testng.annotations.Test; 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 db89a2d5..3515b81a 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.security.SecurityError; +import org.apache.sqoop.error.code.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 547040b3..e05f1deb 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.security.SecurityError; +import org.apache.sqoop.error.code.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 ddca9d4e..20d43e46 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.security.SecurityError; +import org.apache.sqoop.error.code.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 5562592c..d5e65556 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.security.SecurityError; +import org.apache.sqoop.error.code.SecurityError; import org.apache.sqoop.server.RequestContext; import org.apache.sqoop.server.RequestHandler; import org.json.simple.JSONObject; diff --git a/server/src/main/java/org/apache/sqoop/server/SqoopProtocolServlet.java b/server/src/main/java/org/apache/sqoop/server/SqoopProtocolServlet.java index 896c6050..6b76b0b8 100644 --- a/server/src/main/java/org/apache/sqoop/server/SqoopProtocolServlet.java +++ b/server/src/main/java/org/apache/sqoop/server/SqoopProtocolServlet.java @@ -30,7 +30,7 @@ import org.apache.sqoop.common.SqoopException; import org.apache.sqoop.common.SqoopProtocolConstants; import org.apache.sqoop.common.SqoopResponseCode; -import org.apache.sqoop.core.CoreError; +import org.apache.sqoop.error.code.CoreError; import org.apache.sqoop.json.JsonBean; @SuppressWarnings("serial") diff --git a/test/src/test/java/org/apache/sqoop/integration/server/SubmissionWithDisabledModelObjectsTest.java b/test/src/test/java/org/apache/sqoop/integration/server/SubmissionWithDisabledModelObjectsTest.java index 9b3babd5..38235839 100644 --- a/test/src/test/java/org/apache/sqoop/integration/server/SubmissionWithDisabledModelObjectsTest.java +++ b/test/src/test/java/org/apache/sqoop/integration/server/SubmissionWithDisabledModelObjectsTest.java @@ -21,7 +21,7 @@ import org.apache.sqoop.common.Direction; import org.apache.sqoop.common.SqoopException; import org.apache.sqoop.connector.hdfs.configuration.ToFormat; -import org.apache.sqoop.driver.DriverError; +import org.apache.sqoop.error.code.DriverError; import org.apache.sqoop.model.MLink; import org.apache.sqoop.model.MConfigList; import org.apache.sqoop.model.MJob;