You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sqoop.apache.org by bl...@apache.org on 2012/01/25 03:48:48 UTC
svn commit: r1235606 - in /incubator/sqoop/branches/sqoop2:
common/src/main/java/org/apache/sqoop/common/
core/src/main/java/org/apache/sqoop/connector/
core/src/main/java/org/apache/sqoop/core/
core/src/main/java/org/apache/sqoop/repository/ core/src/...
Author: blee
Date: Wed Jan 25 02:48:46 2012
New Revision: 1235606
URL: http://svn.apache.org/viewvc?rev=1235606&view=rev
Log:
SQOOP-365. Move ErrorCode and SqoopException from core to common.
Added:
incubator/sqoop/branches/sqoop2/common/src/main/java/org/apache/sqoop/common/ErrorCode.java (contents, props changed)
- copied, changed from r1231245, incubator/sqoop/branches/sqoop2/core/src/main/java/org/apache/sqoop/core/ErrorCode.java
incubator/sqoop/branches/sqoop2/common/src/main/java/org/apache/sqoop/common/SqoopException.java (contents, props changed)
- copied, changed from r1231245, incubator/sqoop/branches/sqoop2/core/src/main/java/org/apache/sqoop/core/SqoopException.java
Removed:
incubator/sqoop/branches/sqoop2/core/src/main/java/org/apache/sqoop/core/ErrorCode.java
incubator/sqoop/branches/sqoop2/core/src/main/java/org/apache/sqoop/core/SqoopException.java
Modified:
incubator/sqoop/branches/sqoop2/core/src/main/java/org/apache/sqoop/connector/ConnectorError.java
incubator/sqoop/branches/sqoop2/core/src/main/java/org/apache/sqoop/connector/ConnectorHandler.java
incubator/sqoop/branches/sqoop2/core/src/main/java/org/apache/sqoop/connector/ConnectorManager.java
incubator/sqoop/branches/sqoop2/core/src/main/java/org/apache/sqoop/core/CoreError.java
incubator/sqoop/branches/sqoop2/core/src/main/java/org/apache/sqoop/core/PropertiesConfigurationProvider.java
incubator/sqoop/branches/sqoop2/core/src/main/java/org/apache/sqoop/core/SqoopConfiguration.java
incubator/sqoop/branches/sqoop2/core/src/main/java/org/apache/sqoop/repository/JdbcRepository.java
incubator/sqoop/branches/sqoop2/core/src/main/java/org/apache/sqoop/repository/JdbcRepositoryContext.java
incubator/sqoop/branches/sqoop2/core/src/main/java/org/apache/sqoop/repository/JdbcRepositoryProvider.java
incubator/sqoop/branches/sqoop2/core/src/main/java/org/apache/sqoop/repository/JdbcRepositoryTransaction.java
incubator/sqoop/branches/sqoop2/core/src/main/java/org/apache/sqoop/repository/RepositoryError.java
incubator/sqoop/branches/sqoop2/core/src/main/java/org/apache/sqoop/repository/RepositoryManager.java
incubator/sqoop/branches/sqoop2/core/src/test/java/org/apache/sqoop/core/TestConfiguration.java
incubator/sqoop/branches/sqoop2/core/src/test/java/org/apache/sqoop/repository/TestRepositoryManager.java
incubator/sqoop/branches/sqoop2/repository/repository-derby/src/main/java/org/apache/sqoop/repository/derby/DerbyRepoError.java
incubator/sqoop/branches/sqoop2/repository/repository-derby/src/main/java/org/apache/sqoop/repository/derby/DerbyRepositoryHandler.java
incubator/sqoop/branches/sqoop2/server/src/main/java/org/apache/sqoop/handler/VersionRequestHandler.java
incubator/sqoop/branches/sqoop2/server/src/main/java/org/apache/sqoop/server/RequestHandler.java
incubator/sqoop/branches/sqoop2/server/src/main/java/org/apache/sqoop/server/ServerInitializer.java
incubator/sqoop/branches/sqoop2/server/src/main/java/org/apache/sqoop/server/SqoopProtocolServlet.java
Copied: incubator/sqoop/branches/sqoop2/common/src/main/java/org/apache/sqoop/common/ErrorCode.java (from r1231245, incubator/sqoop/branches/sqoop2/core/src/main/java/org/apache/sqoop/core/ErrorCode.java)
URL: http://svn.apache.org/viewvc/incubator/sqoop/branches/sqoop2/common/src/main/java/org/apache/sqoop/common/ErrorCode.java?p2=incubator/sqoop/branches/sqoop2/common/src/main/java/org/apache/sqoop/common/ErrorCode.java&p1=incubator/sqoop/branches/sqoop2/core/src/main/java/org/apache/sqoop/core/ErrorCode.java&r1=1231245&r2=1235606&rev=1235606&view=diff
==============================================================================
--- incubator/sqoop/branches/sqoop2/core/src/main/java/org/apache/sqoop/core/ErrorCode.java (original)
+++ incubator/sqoop/branches/sqoop2/common/src/main/java/org/apache/sqoop/common/ErrorCode.java Wed Jan 25 02:48:46 2012
@@ -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.common;
/**
* Defines an error-code contract. Sqoop exceptions use the error code to
Propchange: incubator/sqoop/branches/sqoop2/common/src/main/java/org/apache/sqoop/common/ErrorCode.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: incubator/sqoop/branches/sqoop2/common/src/main/java/org/apache/sqoop/common/SqoopException.java (from r1231245, incubator/sqoop/branches/sqoop2/core/src/main/java/org/apache/sqoop/core/SqoopException.java)
URL: http://svn.apache.org/viewvc/incubator/sqoop/branches/sqoop2/common/src/main/java/org/apache/sqoop/common/SqoopException.java?p2=incubator/sqoop/branches/sqoop2/common/src/main/java/org/apache/sqoop/common/SqoopException.java&p1=incubator/sqoop/branches/sqoop2/core/src/main/java/org/apache/sqoop/core/SqoopException.java&r1=1231245&r2=1235606&rev=1235606&view=diff
==============================================================================
--- incubator/sqoop/branches/sqoop2/core/src/main/java/org/apache/sqoop/core/SqoopException.java (original)
+++ incubator/sqoop/branches/sqoop2/common/src/main/java/org/apache/sqoop/common/SqoopException.java Wed Jan 25 02:48:46 2012
@@ -15,7 +15,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sqoop.core;
+package org.apache.sqoop.common;
+
/**
* Base exception for Sqoop framework. This exception requires the specification
Propchange: incubator/sqoop/branches/sqoop2/common/src/main/java/org/apache/sqoop/common/SqoopException.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/sqoop/branches/sqoop2/core/src/main/java/org/apache/sqoop/connector/ConnectorError.java
URL: http://svn.apache.org/viewvc/incubator/sqoop/branches/sqoop2/core/src/main/java/org/apache/sqoop/connector/ConnectorError.java?rev=1235606&r1=1235605&r2=1235606&view=diff
==============================================================================
--- incubator/sqoop/branches/sqoop2/core/src/main/java/org/apache/sqoop/connector/ConnectorError.java (original)
+++ incubator/sqoop/branches/sqoop2/core/src/main/java/org/apache/sqoop/connector/ConnectorError.java Wed Jan 25 02:48:46 2012
@@ -17,7 +17,7 @@
*/
package org.apache.sqoop.connector;
-import org.apache.sqoop.core.ErrorCode;
+import org.apache.sqoop.common.ErrorCode;
public enum ConnectorError implements ErrorCode {
Modified: incubator/sqoop/branches/sqoop2/core/src/main/java/org/apache/sqoop/connector/ConnectorHandler.java
URL: http://svn.apache.org/viewvc/incubator/sqoop/branches/sqoop2/core/src/main/java/org/apache/sqoop/connector/ConnectorHandler.java?rev=1235606&r1=1235605&r2=1235606&view=diff
==============================================================================
--- incubator/sqoop/branches/sqoop2/core/src/main/java/org/apache/sqoop/connector/ConnectorHandler.java (original)
+++ incubator/sqoop/branches/sqoop2/core/src/main/java/org/apache/sqoop/connector/ConnectorHandler.java Wed Jan 25 02:48:46 2012
@@ -24,9 +24,9 @@ import java.util.Properties;
import org.apache.log4j.Logger;
import org.apache.sqoop.core.ConfigurationConstants;
-import org.apache.sqoop.core.SqoopException;
import org.apache.sqoop.model.MConnector;
import org.apache.sqoop.model.MForm;
+import org.apache.sqoop.common.SqoopException;
import org.apache.sqoop.connector.spi.SqoopConnector;
public final class ConnectorHandler {
Modified: incubator/sqoop/branches/sqoop2/core/src/main/java/org/apache/sqoop/connector/ConnectorManager.java
URL: http://svn.apache.org/viewvc/incubator/sqoop/branches/sqoop2/core/src/main/java/org/apache/sqoop/connector/ConnectorManager.java?rev=1235606&r1=1235605&r2=1235606&view=diff
==============================================================================
--- incubator/sqoop/branches/sqoop2/core/src/main/java/org/apache/sqoop/connector/ConnectorManager.java (original)
+++ incubator/sqoop/branches/sqoop2/core/src/main/java/org/apache/sqoop/connector/ConnectorManager.java Wed Jan 25 02:48:46 2012
@@ -26,8 +26,8 @@ import java.util.List;
import java.util.Map;
import org.apache.log4j.Logger;
+import org.apache.sqoop.common.SqoopException;
import org.apache.sqoop.core.ConfigurationConstants;
-import org.apache.sqoop.core.SqoopException;
import org.apache.sqoop.repository.Repository;
import org.apache.sqoop.repository.RepositoryManager;
import org.apache.sqoop.repository.RepositoryTransaction;
Modified: incubator/sqoop/branches/sqoop2/core/src/main/java/org/apache/sqoop/core/CoreError.java
URL: http://svn.apache.org/viewvc/incubator/sqoop/branches/sqoop2/core/src/main/java/org/apache/sqoop/core/CoreError.java?rev=1235606&r1=1235605&r2=1235606&view=diff
==============================================================================
--- incubator/sqoop/branches/sqoop2/core/src/main/java/org/apache/sqoop/core/CoreError.java (original)
+++ incubator/sqoop/branches/sqoop2/core/src/main/java/org/apache/sqoop/core/CoreError.java Wed Jan 25 02:48:46 2012
@@ -17,6 +17,8 @@
*/
package org.apache.sqoop.core;
+import org.apache.sqoop.common.ErrorCode;
+
public enum CoreError implements ErrorCode {
/** An unknown error has occurred. */
Modified: incubator/sqoop/branches/sqoop2/core/src/main/java/org/apache/sqoop/core/PropertiesConfigurationProvider.java
URL: http://svn.apache.org/viewvc/incubator/sqoop/branches/sqoop2/core/src/main/java/org/apache/sqoop/core/PropertiesConfigurationProvider.java?rev=1235606&r1=1235605&r2=1235606&view=diff
==============================================================================
--- incubator/sqoop/branches/sqoop2/core/src/main/java/org/apache/sqoop/core/PropertiesConfigurationProvider.java (original)
+++ incubator/sqoop/branches/sqoop2/core/src/main/java/org/apache/sqoop/core/PropertiesConfigurationProvider.java Wed Jan 25 02:48:46 2012
@@ -30,6 +30,7 @@ import java.util.Map;
import java.util.Properties;
import org.apache.log4j.Logger;
+import org.apache.sqoop.common.SqoopException;
public class PropertiesConfigurationProvider implements ConfigurationProvider {
Modified: incubator/sqoop/branches/sqoop2/core/src/main/java/org/apache/sqoop/core/SqoopConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/sqoop/branches/sqoop2/core/src/main/java/org/apache/sqoop/core/SqoopConfiguration.java?rev=1235606&r1=1235605&r2=1235606&view=diff
==============================================================================
--- incubator/sqoop/branches/sqoop2/core/src/main/java/org/apache/sqoop/core/SqoopConfiguration.java (original)
+++ incubator/sqoop/branches/sqoop2/core/src/main/java/org/apache/sqoop/core/SqoopConfiguration.java Wed Jan 25 02:48:46 2012
@@ -27,6 +27,7 @@ import java.util.Properties;
import org.apache.log4j.Logger;
import org.apache.log4j.PropertyConfigurator;
+import org.apache.sqoop.common.SqoopException;
public final class SqoopConfiguration {
Modified: incubator/sqoop/branches/sqoop2/core/src/main/java/org/apache/sqoop/repository/JdbcRepository.java
URL: http://svn.apache.org/viewvc/incubator/sqoop/branches/sqoop2/core/src/main/java/org/apache/sqoop/repository/JdbcRepository.java?rev=1235606&r1=1235605&r2=1235606&view=diff
==============================================================================
--- incubator/sqoop/branches/sqoop2/core/src/main/java/org/apache/sqoop/repository/JdbcRepository.java (original)
+++ incubator/sqoop/branches/sqoop2/core/src/main/java/org/apache/sqoop/repository/JdbcRepository.java Wed Jan 25 02:48:46 2012
@@ -20,8 +20,8 @@ package org.apache.sqoop.repository;
import java.sql.Connection;
import org.apache.log4j.Logger;
+import org.apache.sqoop.common.SqoopException;
import org.apache.sqoop.connector.ConnectorHandler;
-import org.apache.sqoop.core.SqoopException;
import org.apache.sqoop.model.MConnector;
public class JdbcRepository implements Repository {
Modified: incubator/sqoop/branches/sqoop2/core/src/main/java/org/apache/sqoop/repository/JdbcRepositoryContext.java
URL: http://svn.apache.org/viewvc/incubator/sqoop/branches/sqoop2/core/src/main/java/org/apache/sqoop/repository/JdbcRepositoryContext.java?rev=1235606&r1=1235605&r2=1235606&view=diff
==============================================================================
--- incubator/sqoop/branches/sqoop2/core/src/main/java/org/apache/sqoop/repository/JdbcRepositoryContext.java (original)
+++ incubator/sqoop/branches/sqoop2/core/src/main/java/org/apache/sqoop/repository/JdbcRepositoryContext.java Wed Jan 25 02:48:46 2012
@@ -23,8 +23,8 @@ import java.util.Properties;
import javax.sql.DataSource;
import org.apache.log4j.Logger;
+import org.apache.sqoop.common.SqoopException;
import org.apache.sqoop.core.Context;
-import org.apache.sqoop.core.SqoopException;
public final class JdbcRepositoryContext {
Modified: incubator/sqoop/branches/sqoop2/core/src/main/java/org/apache/sqoop/repository/JdbcRepositoryProvider.java
URL: http://svn.apache.org/viewvc/incubator/sqoop/branches/sqoop2/core/src/main/java/org/apache/sqoop/repository/JdbcRepositoryProvider.java?rev=1235606&r1=1235605&r2=1235606&view=diff
==============================================================================
--- incubator/sqoop/branches/sqoop2/core/src/main/java/org/apache/sqoop/repository/JdbcRepositoryProvider.java (original)
+++ incubator/sqoop/branches/sqoop2/core/src/main/java/org/apache/sqoop/repository/JdbcRepositoryProvider.java Wed Jan 25 02:48:46 2012
@@ -32,9 +32,9 @@ import org.apache.commons.pool.KeyedObje
import org.apache.commons.pool.impl.GenericKeyedObjectPoolFactory;
import org.apache.commons.pool.impl.GenericObjectPool;
import org.apache.log4j.Logger;
+import org.apache.sqoop.common.SqoopException;
import org.apache.sqoop.core.Context;
import org.apache.sqoop.core.SqoopConfiguration;
-import org.apache.sqoop.core.SqoopException;
import org.apache.sqoop.utils.ClassLoadingUtils;
Modified: incubator/sqoop/branches/sqoop2/core/src/main/java/org/apache/sqoop/repository/JdbcRepositoryTransaction.java
URL: http://svn.apache.org/viewvc/incubator/sqoop/branches/sqoop2/core/src/main/java/org/apache/sqoop/repository/JdbcRepositoryTransaction.java?rev=1235606&r1=1235605&r2=1235606&view=diff
==============================================================================
--- incubator/sqoop/branches/sqoop2/core/src/main/java/org/apache/sqoop/repository/JdbcRepositoryTransaction.java (original)
+++ incubator/sqoop/branches/sqoop2/core/src/main/java/org/apache/sqoop/repository/JdbcRepositoryTransaction.java Wed Jan 25 02:48:46 2012
@@ -25,7 +25,7 @@ import javax.sql.DataSource;
import org.apache.log4j.LogManager;
import org.apache.log4j.Logger;
-import org.apache.sqoop.core.SqoopException;
+import org.apache.sqoop.common.SqoopException;
public class JdbcRepositoryTransaction implements RepositoryTransaction {
Modified: incubator/sqoop/branches/sqoop2/core/src/main/java/org/apache/sqoop/repository/RepositoryError.java
URL: http://svn.apache.org/viewvc/incubator/sqoop/branches/sqoop2/core/src/main/java/org/apache/sqoop/repository/RepositoryError.java?rev=1235606&r1=1235605&r2=1235606&view=diff
==============================================================================
--- incubator/sqoop/branches/sqoop2/core/src/main/java/org/apache/sqoop/repository/RepositoryError.java (original)
+++ incubator/sqoop/branches/sqoop2/core/src/main/java/org/apache/sqoop/repository/RepositoryError.java Wed Jan 25 02:48:46 2012
@@ -17,7 +17,7 @@
*/
package org.apache.sqoop.repository;
-import org.apache.sqoop.core.ErrorCode;
+import org.apache.sqoop.common.ErrorCode;
public enum RepositoryError implements ErrorCode {
Modified: incubator/sqoop/branches/sqoop2/core/src/main/java/org/apache/sqoop/repository/RepositoryManager.java
URL: http://svn.apache.org/viewvc/incubator/sqoop/branches/sqoop2/core/src/main/java/org/apache/sqoop/repository/RepositoryManager.java?rev=1235606&r1=1235605&r2=1235606&view=diff
==============================================================================
--- incubator/sqoop/branches/sqoop2/core/src/main/java/org/apache/sqoop/repository/RepositoryManager.java (original)
+++ incubator/sqoop/branches/sqoop2/core/src/main/java/org/apache/sqoop/repository/RepositoryManager.java Wed Jan 25 02:48:46 2012
@@ -20,9 +20,9 @@ package org.apache.sqoop.repository;
import java.util.Map;
import org.apache.log4j.Logger;
+import org.apache.sqoop.common.SqoopException;
import org.apache.sqoop.core.Context;
import org.apache.sqoop.core.SqoopConfiguration;
-import org.apache.sqoop.core.SqoopException;
import org.apache.sqoop.utils.ClassLoadingUtils;
public final class RepositoryManager {
Modified: incubator/sqoop/branches/sqoop2/core/src/test/java/org/apache/sqoop/core/TestConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/sqoop/branches/sqoop2/core/src/test/java/org/apache/sqoop/core/TestConfiguration.java?rev=1235606&r1=1235605&r2=1235606&view=diff
==============================================================================
--- incubator/sqoop/branches/sqoop2/core/src/test/java/org/apache/sqoop/core/TestConfiguration.java (original)
+++ incubator/sqoop/branches/sqoop2/core/src/test/java/org/apache/sqoop/core/TestConfiguration.java Wed Jan 25 02:48:46 2012
@@ -19,6 +19,7 @@ package org.apache.sqoop.core;
import java.util.Properties;
+import org.apache.sqoop.common.SqoopException;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
Modified: incubator/sqoop/branches/sqoop2/core/src/test/java/org/apache/sqoop/repository/TestRepositoryManager.java
URL: http://svn.apache.org/viewvc/incubator/sqoop/branches/sqoop2/core/src/test/java/org/apache/sqoop/repository/TestRepositoryManager.java?rev=1235606&r1=1235605&r2=1235606&view=diff
==============================================================================
--- incubator/sqoop/branches/sqoop2/core/src/test/java/org/apache/sqoop/repository/TestRepositoryManager.java (original)
+++ incubator/sqoop/branches/sqoop2/core/src/test/java/org/apache/sqoop/repository/TestRepositoryManager.java Wed Jan 25 02:48:46 2012
@@ -19,10 +19,10 @@ package org.apache.sqoop.repository;
import java.util.Properties;
+import org.apache.sqoop.common.SqoopException;
import org.apache.sqoop.core.ConfigurationConstants;
import org.apache.sqoop.core.PropertiesConfigurationProvider;
import org.apache.sqoop.core.SqoopConfiguration;
-import org.apache.sqoop.core.SqoopException;
import org.apache.sqoop.core.TestUtils;
import org.junit.Assert;
import org.junit.Test;
Modified: incubator/sqoop/branches/sqoop2/repository/repository-derby/src/main/java/org/apache/sqoop/repository/derby/DerbyRepoError.java
URL: http://svn.apache.org/viewvc/incubator/sqoop/branches/sqoop2/repository/repository-derby/src/main/java/org/apache/sqoop/repository/derby/DerbyRepoError.java?rev=1235606&r1=1235605&r2=1235606&view=diff
==============================================================================
--- incubator/sqoop/branches/sqoop2/repository/repository-derby/src/main/java/org/apache/sqoop/repository/derby/DerbyRepoError.java (original)
+++ incubator/sqoop/branches/sqoop2/repository/repository-derby/src/main/java/org/apache/sqoop/repository/derby/DerbyRepoError.java Wed Jan 25 02:48:46 2012
@@ -17,7 +17,7 @@
*/
package org.apache.sqoop.repository.derby;
-import org.apache.sqoop.core.ErrorCode;
+import org.apache.sqoop.common.ErrorCode;
public enum DerbyRepoError implements ErrorCode {
Modified: incubator/sqoop/branches/sqoop2/repository/repository-derby/src/main/java/org/apache/sqoop/repository/derby/DerbyRepositoryHandler.java
URL: http://svn.apache.org/viewvc/incubator/sqoop/branches/sqoop2/repository/repository-derby/src/main/java/org/apache/sqoop/repository/derby/DerbyRepositoryHandler.java?rev=1235606&r1=1235605&r2=1235606&view=diff
==============================================================================
--- incubator/sqoop/branches/sqoop2/repository/repository-derby/src/main/java/org/apache/sqoop/repository/derby/DerbyRepositoryHandler.java (original)
+++ incubator/sqoop/branches/sqoop2/repository/repository-derby/src/main/java/org/apache/sqoop/repository/derby/DerbyRepositoryHandler.java Wed Jan 25 02:48:46 2012
@@ -36,7 +36,7 @@ import java.util.List;
import javax.sql.DataSource;
import org.apache.log4j.Logger;
-import org.apache.sqoop.core.SqoopException;
+import org.apache.sqoop.common.SqoopException;
import org.apache.sqoop.model.MConnector;
import org.apache.sqoop.model.MForm;
import org.apache.sqoop.model.MFormType;
Modified: incubator/sqoop/branches/sqoop2/server/src/main/java/org/apache/sqoop/handler/VersionRequestHandler.java
URL: http://svn.apache.org/viewvc/incubator/sqoop/branches/sqoop2/server/src/main/java/org/apache/sqoop/handler/VersionRequestHandler.java?rev=1235606&r1=1235605&r2=1235606&view=diff
==============================================================================
--- incubator/sqoop/branches/sqoop2/server/src/main/java/org/apache/sqoop/handler/VersionRequestHandler.java (original)
+++ incubator/sqoop/branches/sqoop2/server/src/main/java/org/apache/sqoop/handler/VersionRequestHandler.java Wed Jan 25 02:48:46 2012
@@ -19,8 +19,8 @@ package org.apache.sqoop.handler;
import org.apache.log4j.Logger;
import org.apache.sqoop.common.JsonBean;
+import org.apache.sqoop.common.SqoopException;
import org.apache.sqoop.common.VersionInfo;
-import org.apache.sqoop.core.SqoopException;
import org.apache.sqoop.server.RequestContext;
import org.apache.sqoop.server.RequestHandler;
Modified: incubator/sqoop/branches/sqoop2/server/src/main/java/org/apache/sqoop/server/RequestHandler.java
URL: http://svn.apache.org/viewvc/incubator/sqoop/branches/sqoop2/server/src/main/java/org/apache/sqoop/server/RequestHandler.java?rev=1235606&r1=1235605&r2=1235606&view=diff
==============================================================================
--- incubator/sqoop/branches/sqoop2/server/src/main/java/org/apache/sqoop/server/RequestHandler.java (original)
+++ incubator/sqoop/branches/sqoop2/server/src/main/java/org/apache/sqoop/server/RequestHandler.java Wed Jan 25 02:48:46 2012
@@ -19,7 +19,7 @@ package org.apache.sqoop.server;
import org.apache.sqoop.common.JsonBean;
-import org.apache.sqoop.core.SqoopException;
+import org.apache.sqoop.common.SqoopException;
public interface RequestHandler {
Modified: incubator/sqoop/branches/sqoop2/server/src/main/java/org/apache/sqoop/server/ServerInitializer.java
URL: http://svn.apache.org/viewvc/incubator/sqoop/branches/sqoop2/server/src/main/java/org/apache/sqoop/server/ServerInitializer.java?rev=1235606&r1=1235605&r2=1235606&view=diff
==============================================================================
--- incubator/sqoop/branches/sqoop2/server/src/main/java/org/apache/sqoop/server/ServerInitializer.java (original)
+++ incubator/sqoop/branches/sqoop2/server/src/main/java/org/apache/sqoop/server/ServerInitializer.java Wed Jan 25 02:48:46 2012
@@ -21,9 +21,9 @@ import javax.servlet.ServletContextEvent
import javax.servlet.ServletContextListener;
import org.apache.log4j.Logger;
+import org.apache.sqoop.common.SqoopException;
import org.apache.sqoop.connector.ConnectorManager;
import org.apache.sqoop.core.SqoopConfiguration;
-import org.apache.sqoop.core.SqoopException;
import org.apache.sqoop.repository.RepositoryManager;
Modified: incubator/sqoop/branches/sqoop2/server/src/main/java/org/apache/sqoop/server/SqoopProtocolServlet.java
URL: http://svn.apache.org/viewvc/incubator/sqoop/branches/sqoop2/server/src/main/java/org/apache/sqoop/server/SqoopProtocolServlet.java?rev=1235606&r1=1235605&r2=1235606&view=diff
==============================================================================
--- incubator/sqoop/branches/sqoop2/server/src/main/java/org/apache/sqoop/server/SqoopProtocolServlet.java (original)
+++ incubator/sqoop/branches/sqoop2/server/src/main/java/org/apache/sqoop/server/SqoopProtocolServlet.java Wed Jan 25 02:48:46 2012
@@ -27,13 +27,13 @@ import javax.servlet.http.HttpServletReq
import javax.servlet.http.HttpServletResponse;
import org.apache.log4j.Logger;
+import org.apache.sqoop.common.ErrorCode;
import org.apache.sqoop.common.ExceptionInfo;
import org.apache.sqoop.common.JsonBean;
+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.core.ErrorCode;
-import org.apache.sqoop.core.SqoopException;
@SuppressWarnings("serial")
public class SqoopProtocolServlet extends HttpServlet {