Merged DEV/TEMPORARY to HEAD

17667: Branch for SpringSurf integration - from HEAD r17665
   17668: Fix to ensure included scripts files are not loaded from a cached classpath loader.
   17670: Part 1 of SpringSurf integration - changes relating to spring-surf-core-1.0.0.CI-SNAPSHOT.jar
   17674: Part 2 of SpringSurf integration - changes relating to spring-surf-core-configservice-1.0.0.CI-SNAPSHOT.jar

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@17788 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2009-12-14 13:41:05 +00:00
parent eaacdeb2ed
commit b726c4d6db
470 changed files with 572 additions and 577 deletions

View File

@@ -25,7 +25,7 @@
package org.alfresco.repo.security.authentication;
import org.alfresco.repo.tenant.TenantService;
import org.alfresco.util.PropertyCheck;
import org.springframework.extensions.surf.util.PropertyCheck;
import org.apache.commons.lang.RandomStringUtils;
/**

View File

@@ -37,7 +37,7 @@ import javax.security.auth.login.LoginException;
import javax.security.sasl.AuthorizeCallback;
import javax.security.sasl.RealmCallback;
import org.alfresco.i18n.I18NUtil;
import org.springframework.extensions.surf.util.I18NUtil;
import org.alfresco.repo.security.authentication.AbstractAuthenticationComponent;
import org.alfresco.repo.security.authentication.AuthenticationException;