github/sqoop
5
0
Fork 0
mirror of https://github.com/apache/sqoop.git synced 2025-05-19 02:10:54 +08:00
Code Issues Projects Releases Wiki Activity

SQOOP-2327: Sqoop2: Change package name from Authorization to authorization

Browse Source 
(Richard via Jarek Jarcec Cecho)
This commit is contained in:
Jarek Jarcec Cecho 2015-04-27 08:51:23 -07:00
parent a59d69f6c4
commit 4e05e61864
16 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/org/apache/sqoop/security/AuthenticationManager.java
View File

@ -31,7 +31,7 @@ public class AuthenticationManager implements Reconfigurable {
/** /**
* Default authentication handler * Default authentication handler
*/ */
public static final String DEFAULT_AUTHENTICATION_HANDLER = "org.apache.sqoop.security.Authentication.SimpleAuthenticationHandler"; public static final String DEFAULT_AUTHENTICATION_HANDLER = "org.apache.sqoop.security.authentication.SimpleAuthenticationHandler";
/** /**

4
core/src/main/java/org/apache/sqoop/security/AuthorizationManager.java
View File

@ -32,12 +32,12 @@ public class AuthorizationManager implements Reconfigurable {
/** /**
* Default authorization handler * Default authorization handler
*/ */
public static final String DEFAULT_AUTHORIZATION_HANDLER = "org.apache.sqoop.security.Authorization.DefaultAuthorizationHandler"; public static final String DEFAULT_AUTHORIZATION_HANDLER = "org.apache.sqoop.security.authorization.DefaultAuthorizationHandler";
/** /**
* Default authentication provider * Default authentication provider
*/ */
public static final String DEFAULT_AUTHENTICATION_PROVIDER = "org.apache.sqoop.security.Authorization.DefaultAuthenticationProvider"; public static final String DEFAULT_AUTHENTICATION_PROVIDER = "org.apache.sqoop.security.authorization.DefaultAuthenticationProvider";
/** /**
* Default authentication provider * Default authentication provider

10
core/src/main/java/org/apache/sqoop/security/SecurityConstants.java
View File

@ -46,7 +46,7 @@ public final class SecurityConstants {
/** /**
* The config specifies the sqoop authentication handler class. * The config specifies the sqoop authentication handler class.
* The default type is org.apache.sqoop.security.Authentication.SimpleAuthenticationHandler * The default type is org.apache.sqoop.security.authentication.SimpleAuthenticationHandler
* <tt>org.apache.sqoop.security.authentication.handler</tt>. * <tt>org.apache.sqoop.security.authentication.handler</tt>.
*/ */
public static final String AUTHENTICATION_HANDLER = public static final String AUTHENTICATION_HANDLER =
@ -110,7 +110,7 @@ public final class SecurityConstants {
/** /**
* The config specifies the sqoop authorization handler class. * The config specifies the sqoop authorization handler class.
* The default type is org.apache.sqoop.security.Authorization.DefaultAuthorizationHandler * The default type is org.apache.sqoop.security.authorization.DefaultAuthorizationHandler
* <tt>org.apache.sqoop.security.authorization.handler</tt>. * <tt>org.apache.sqoop.security.authorization.handler</tt>.
*/ */
public static final String AUTHORIZATION_HANDLER = public static final String AUTHORIZATION_HANDLER =
@ -118,7 +118,7 @@ public final class SecurityConstants {
/** /**
* The config specifies the sqoop authorization access controller class. * The config specifies the sqoop authorization access controller class.
* The default type is org.apache.sqoop.security.Authorization.DefaultAuthorizationAccessController * The default type is org.apache.sqoop.security.authorization.DefaultAuthorizationAccessController
* <tt>org.apache.sqoop.security.authorization.access_controller</tt>. * <tt>org.apache.sqoop.security.authorization.access_controller</tt>.
*/ */
public static final String AUTHORIZATION_ACCESS_CONTROLLER = public static final String AUTHORIZATION_ACCESS_CONTROLLER =
@ -126,7 +126,7 @@ public final class SecurityConstants {
/** /**
* The config specifies the sqoop authorization validator class. * The config specifies the sqoop authorization validator class.
* The default type is org.apache.sqoop.security.Authorization.DefaultAuthorizationValidator * The default type is org.apache.sqoop.security.authorization.DefaultAuthorizationValidator
* <tt>org.apache.sqoop.security.authorization.validator</tt>. * <tt>org.apache.sqoop.security.authorization.validator</tt>.
*/ */
public static final String AUTHORIZATION_VALIDATOR = public static final String AUTHORIZATION_VALIDATOR =
@ -134,7 +134,7 @@ public final class SecurityConstants {
/** /**
* The config specifies the sqoop authentication provider class. * The config specifies the sqoop authentication provider class.
* The default type is org.apache.sqoop.security.Authorization.DefaultAuthenticationProvider * The default type is org.apache.sqoop.security.authorization.DefaultAuthenticationProvider
* <tt>org.apache.sqoop.security.authorization.authentication_provider</tt>. * <tt>org.apache.sqoop.security.authorization.authentication_provider</tt>.
*/ */
public static final String AUTHENTICATION_PROVIDER = public static final String AUTHENTICATION_PROVIDER =

12
dist/src/main/server/conf/sqoop.properties vendored
View File

@ -145,10 +145,10 @@ org.apache.sqoop.execution.engine=org.apache.sqoop.execution.mapreduce.Mapreduce
# Authentication configuration # Authentication configuration
# #
#org.apache.sqoop.security.authentication.type=SIMPLE #org.apache.sqoop.security.authentication.type=SIMPLE
#org.apache.sqoop.security.authentication.handler=org.apache.sqoop.security.Authentication.SimpleAuthenticationHandler #org.apache.sqoop.security.authentication.handler=org.apache.sqoop.security.authentication.SimpleAuthenticationHandler
#org.apache.sqoop.security.authentication.anonymous=true #org.apache.sqoop.security.authentication.anonymous=true
#org.apache.sqoop.security.authentication.type=KERBEROS #org.apache.sqoop.security.authentication.type=KERBEROS
#org.apache.sqoop.security.authentication.handler=org.apache.sqoop.security.Authentication.KerberosAuthenticationHandler #org.apache.sqoop.security.authentication.handler=org.apache.sqoop.security.authentication.KerberosAuthenticationHandler
#org.apache.sqoop.security.authentication.kerberos.principal=sqoop/_HOST@NOVALOCAL #org.apache.sqoop.security.authentication.kerberos.principal=sqoop/_HOST@NOVALOCAL
#org.apache.sqoop.security.authentication.kerberos.keytab=/home/kerberos/sqoop.keytab #org.apache.sqoop.security.authentication.kerberos.keytab=/home/kerberos/sqoop.keytab
#org.apache.sqoop.security.authentication.kerberos.http.principal=HTTP/_HOST@NOVALOCAL #org.apache.sqoop.security.authentication.kerberos.http.principal=HTTP/_HOST@NOVALOCAL
@ -161,10 +161,10 @@ org.apache.sqoop.execution.engine=org.apache.sqoop.execution.mapreduce.Mapreduce
# #
# Authorization configuration # Authorization configuration
# #
#org.apache.sqoop.security.authorization.handler=org.apache.sqoop.security.Authorization.DefaultAuthorizationHandler #org.apache.sqoop.security.authorization.handler=org.apache.sqoop.security.authorization.DefaultAuthorizationHandler
#org.apache.sqoop.security.authorization.access_controller=org.apache.sqoop.security.Authorization.DefaultAuthorizationAccessController #org.apache.sqoop.security.authorization.access_controller=org.apache.sqoop.security.authorization.DefaultAuthorizationAccessController
#org.apache.sqoop.security.authorization.validator=org.apache.sqoop.security.Authorization.DefaultAuthorizationValidator #org.apache.sqoop.security.authorization.validator=org.apache.sqoop.security.authorization.DefaultAuthorizationValidator
#org.apache.sqoop.security.authorization.authentication_provider=org.apache.sqoop.security.Authorization.DefaultAuthenticationProvider #org.apache.sqoop.security.authorization.authentication_provider=org.apache.sqoop.security.authorization.DefaultAuthenticationProvider
#org.apache.sqoop.security.authorization.server_name=SqoopServer1 #org.apache.sqoop.security.authorization.server_name=SqoopServer1
# External connectors load path # External connectors load path

6
docs/src/site/sphinx/SecurityGuideOnSqoop2.rst
View File

@ -30,7 +30,7 @@ Modify Sqoop configuration file, normally in <Sqoop Folder>/server/config/sqoop.
:: ::
org.apache.sqoop.authentication.type=SIMPLE org.apache.sqoop.authentication.type=SIMPLE
org.apache.sqoop.authentication.handler=org.apache.sqoop.security.Authentication.SimpleAuthenticationHandler org.apache.sqoop.authentication.handler=org.apache.sqoop.security.authentication.SimpleAuthenticationHandler
org.apache.sqoop.anonymous=true org.apache.sqoop.anonymous=true
- Simple authentication is used by default. Commenting out authentication configuration will yield the use of simple authentication. - Simple authentication is used by default. Commenting out authentication configuration will yield the use of simple authentication.
@ -88,7 +88,7 @@ Modify Sqoop configuration file, normally in <Sqoop Folder>/server/config/sqoop.
:: ::
org.apache.sqoop.authentication.type=KERBEROS org.apache.sqoop.authentication.type=KERBEROS
org.apache.sqoop.authentication.handler=org.apache.sqoop.security.Authentication.KerberosAuthenticationHandler org.apache.sqoop.authentication.handler=org.apache.sqoop.security.authentication.KerberosAuthenticationHandler
org.apache.sqoop.authentication.kerberos.principal=sqoop/_HOST@<REALM> org.apache.sqoop.authentication.kerberos.principal=sqoop/_HOST@<REALM>
org.apache.sqoop.authentication.kerberos.keytab=/home/kerberos/sqoop.keytab org.apache.sqoop.authentication.kerberos.keytab=/home/kerberos/sqoop.keytab
org.apache.sqoop.authentication.kerberos.http.principal=HTTP/_HOST@<REALM> org.apache.sqoop.authentication.kerberos.http.principal=HTTP/_HOST@<REALM>
@ -132,7 +132,7 @@ If the Sqoop server has started successfully with Kerberos authentication, the f
:: ::
2014-12-04 15:02:58,038 INFO security.KerberosAuthenticationHandler [org.apache.sqoop.security.Authentication.KerberosAuthenticationHandler.secureLogin(KerberosAuthenticationHandler.java:84)] Using Kerberos authentication, principal [sqoop/_HOST@HADOOP.COM] keytab [/home/kerberos/sqoop.keytab] 2014-12-04 15:02:58,038 INFO security.KerberosAuthenticationHandler [org.apache.sqoop.security.authentication.KerberosAuthenticationHandler.secureLogin(KerberosAuthenticationHandler.java:84)] Using Kerberos authentication, principal [sqoop/_HOST@HADOOP.COM] keytab [/home/kerberos/sqoop.keytab]
If the Sqoop client was able to communicate with the Sqoop server, the following will be in <Sqoop Folder>/server/log/catalina.out: If the Sqoop client was able to communicate with the Sqoop server, the following will be in <Sqoop Folder>/server/log/catalina.out:

2
security/src/main/java/org/apache/sqoop/security/Authentication/KerberosAuthenticationHandler.java → security/src/main/java/org/apache/sqoop/security/authentication/KerberosAuthenticationHandler.java
View File

@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.sqoop.security.Authentication; package org.apache.sqoop.security.authentication;
import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.security.SecurityUtil; import org.apache.hadoop.security.SecurityUtil;

2
security/src/main/java/org/apache/sqoop/security/Authentication/SimpleAuthenticationHandler.java → security/src/main/java/org/apache/sqoop/security/authentication/SimpleAuthenticationHandler.java
View File

@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.sqoop.security.Authentication; package org.apache.sqoop.security.authentication;
import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.security.UserGroupInformation; import org.apache.hadoop.security.UserGroupInformation;

2
security/src/main/java/org/apache/sqoop/security/Authorization/AuthorizationEngine.java → security/src/main/java/org/apache/sqoop/security/authorization/AuthorizationEngine.java
View File

@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.sqoop.security.Authorization; package org.apache.sqoop.security.authorization;
import com.beust.jcommander.internal.Lists; import com.beust.jcommander.internal.Lists;
import com.google.common.base.Predicate; import com.google.common.base.Predicate;

2
security/src/main/java/org/apache/sqoop/security/Authorization/DefaultAuthenticationProvider.java → security/src/main/java/org/apache/sqoop/security/authorization/DefaultAuthenticationProvider.java
View File

@ -16,7 +16,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.apache.sqoop.security.Authorization; package org.apache.sqoop.security.authorization;
import org.apache.hadoop.security.UserGroupInformation; import org.apache.hadoop.security.UserGroupInformation;
import org.apache.hadoop.security.token.delegation.web.HttpUserGroupInformation; import org.apache.hadoop.security.token.delegation.web.HttpUserGroupInformation;

2
security/src/main/java/org/apache/sqoop/security/Authorization/DefaultAuthorizationAccessController.java → security/src/main/java/org/apache/sqoop/security/authorization/DefaultAuthorizationAccessController.java
View File

@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.sqoop.security.Authorization; package org.apache.sqoop.security.authorization;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
import org.apache.sqoop.common.SqoopException; import org.apache.sqoop.common.SqoopException;

6
security/src/main/java/org/apache/sqoop/security/Authorization/DefaultAuthorizationHandler.java → security/src/main/java/org/apache/sqoop/security/authorization/DefaultAuthorizationHandler.java
View File

@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.sqoop.security.Authorization; package org.apache.sqoop.security.authorization;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
import org.apache.sqoop.common.MapContext; import org.apache.sqoop.common.MapContext;
@ -34,12 +34,12 @@ public class DefaultAuthorizationHandler extends AuthorizationHandler {
/** /**
* Default authorization access controller * Default authorization access controller
*/ */
public static final String DEFAULT_AUTHORIZATION_ACCESS_CONTROLLER = "org.apache.sqoop.security.Authorization.DefaultAuthorizationAccessController"; public static final String DEFAULT_AUTHORIZATION_ACCESS_CONTROLLER = "org.apache.sqoop.security.authorization.DefaultAuthorizationAccessController";
/** /**
* Default authorization validator * Default authorization validator
*/ */
public static final String DEFAULT_AUTHORIZATION_VALIDATOR = "org.apache.sqoop.security.Authorization.DefaultAuthorizationValidator"; public static final String DEFAULT_AUTHORIZATION_VALIDATOR = "org.apache.sqoop.security.authorization.DefaultAuthorizationValidator";
private static final Logger LOG = Logger.getLogger(DefaultAuthorizationHandler.class); private static final Logger LOG = Logger.getLogger(DefaultAuthorizationHandler.class);

2
security/src/main/java/org/apache/sqoop/security/Authorization/DefaultAuthorizationValidator.java → security/src/main/java/org/apache/sqoop/security/authorization/DefaultAuthorizationValidator.java
View File

@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.sqoop.security.Authorization; package org.apache.sqoop.security.authorization;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
import org.apache.sqoop.common.SqoopException; import org.apache.sqoop.common.SqoopException;

2
server/src/main/java/org/apache/sqoop/handler/ConnectorRequestHandler.java
View File

@ -33,7 +33,7 @@
import org.apache.sqoop.json.JsonBean; import org.apache.sqoop.json.JsonBean;
import org.apache.sqoop.model.MConnector; import org.apache.sqoop.model.MConnector;
import org.apache.sqoop.model.MResource; import org.apache.sqoop.model.MResource;
import org.apache.sqoop.security.Authorization.AuthorizationEngine; import org.apache.sqoop.security.authorization.AuthorizationEngine;
import org.apache.sqoop.server.RequestContext; import org.apache.sqoop.server.RequestContext;
import org.apache.sqoop.server.RequestContext.Method; import org.apache.sqoop.server.RequestContext.Method;
import org.apache.sqoop.server.RequestHandler; import org.apache.sqoop.server.RequestHandler;

2
server/src/main/java/org/apache/sqoop/handler/JobRequestHandler.java
View File

@ -47,7 +47,7 @@
import org.apache.sqoop.repository.Repository; import org.apache.sqoop.repository.Repository;
import org.apache.sqoop.repository.RepositoryManager; import org.apache.sqoop.repository.RepositoryManager;
import org.apache.sqoop.request.HttpEventContext; import org.apache.sqoop.request.HttpEventContext;
import org.apache.sqoop.security.Authorization.AuthorizationEngine; import org.apache.sqoop.security.authorization.AuthorizationEngine;
import org.apache.sqoop.security.AuthorizationManager; import org.apache.sqoop.security.AuthorizationManager;
import org.apache.sqoop.server.RequestContext; import org.apache.sqoop.server.RequestContext;
import org.apache.sqoop.server.RequestHandler; import org.apache.sqoop.server.RequestHandler;

2
server/src/main/java/org/apache/sqoop/handler/LinkRequestHandler.java
View File

@ -39,7 +39,7 @@
import org.apache.sqoop.model.MResource; import org.apache.sqoop.model.MResource;
import org.apache.sqoop.repository.Repository; import org.apache.sqoop.repository.Repository;
import org.apache.sqoop.repository.RepositoryManager; import org.apache.sqoop.repository.RepositoryManager;
import org.apache.sqoop.security.Authorization.AuthorizationEngine; import org.apache.sqoop.security.authorization.AuthorizationEngine;
import org.apache.sqoop.security.AuthorizationManager; import org.apache.sqoop.security.AuthorizationManager;
import org.apache.sqoop.server.RequestContext; import org.apache.sqoop.server.RequestContext;
import org.apache.sqoop.server.RequestHandler; import org.apache.sqoop.server.RequestHandler;

2
server/src/main/java/org/apache/sqoop/handler/SubmissionRequestHandler.java
View File

@ -27,7 +27,7 @@
import org.apache.sqoop.model.MSubmission; import org.apache.sqoop.model.MSubmission;
import org.apache.sqoop.repository.Repository; import org.apache.sqoop.repository.Repository;
import org.apache.sqoop.repository.RepositoryManager; import org.apache.sqoop.repository.RepositoryManager;
import org.apache.sqoop.security.Authorization.AuthorizationEngine; import org.apache.sqoop.security.authorization.AuthorizationEngine;
import org.apache.sqoop.server.RequestContext; import org.apache.sqoop.server.RequestContext;
import org.apache.sqoop.server.RequestContext.Method; import org.apache.sqoop.server.RequestContext.Method;
import org.apache.sqoop.server.RequestHandler; import org.apache.sqoop.server.RequestHandler;