Author: rareddy Date: 2009-07-28 17:30:25 -0400 (Tue, 28 Jul 2009) New Revision: 1201 Modified: trunk/build/kit-runtime/deploy.properties trunk/engine/src/main/java/com/metamatrix/dqp/service/AuthorizationService.java Log: TEIID-665 Modified: trunk/build/kit-runtime/deploy.properties =================================================================== --- trunk/build/kit-runtime/deploy.properties 2009-07-28 21:07:33 UTC (rev 1200) +++ trunk/build/kit-runtime/deploy.properties 2009-07-28 21:30:25 UTC (rev 1201) @@ -105,13 +105,11 @@ # -# Authorization Service Settings +# Authorization Service Settings (membership must be enabled to check any authorizations) # +auth.check_entitlements=false +auth.adminRolesFile=./deploy/admin-roles.properties -# Enable entitlements (data, admin) -entitlements.enabled=false -entitlements.adminRolesFile=./deploy/admin-roles.properties - # # Socket transport # Modified: trunk/engine/src/main/java/com/metamatrix/dqp/service/AuthorizationService.java =================================================================== --- trunk/engine/src/main/java/com/metamatrix/dqp/service/AuthorizationService.java 2009-07-28 21:07:33 UTC (rev 1200) +++ trunk/engine/src/main/java/com/metamatrix/dqp/service/AuthorizationService.java 2009-07-28 21:30:25 UTC (rev 1201) @@ -57,8 +57,8 @@ public static final String DEFAULT_WSDL_USERNAME = CoreConstants.DEFAULT_ANON_USERNAME; - public static final String ENTITELEMENTS_ENABLED = "entitlements.enabled"; //$NON-NLS-1$ - public static final String ADMIN_ROLES_FILE = "entitlements.adminRolesFile"; //$NON-NLS-1$ + public static final String ENTITELEMENTS_ENABLED = "auth.check_entitlements"; //$NON-NLS-1$ + public static final String ADMIN_ROLES_FILE = "auth.adminRolesFile"; //$NON-NLS-1$ /** * Determine which of a set of resources a connection does not have permission to