diff --git a/openid-connect-server-webapp/src/main/resources/log4j.xml b/openid-connect-server-webapp/src/main/resources/log4j.xml index fd2dc2bb2..27100bf2e 100644 --- a/openid-connect-server-webapp/src/main/resources/log4j.xml +++ b/openid-connect-server-webapp/src/main/resources/log4j.xml @@ -30,7 +30,22 @@ - + + + + + + + + + + + + + + + + diff --git a/openid-connect-server/src/main/java/org/mitre/oauth2/service/impl/DefaultOAuth2ProviderTokenService.java b/openid-connect-server/src/main/java/org/mitre/oauth2/service/impl/DefaultOAuth2ProviderTokenService.java index 0b7252218..ab62eaf3d 100644 --- a/openid-connect-server/src/main/java/org/mitre/oauth2/service/impl/DefaultOAuth2ProviderTokenService.java +++ b/openid-connect-server/src/main/java/org/mitre/oauth2/service/impl/DefaultOAuth2ProviderTokenService.java @@ -62,7 +62,7 @@ import com.nimbusds.jwt.PlainJWT; * @author jricher * */ -@Service +@Service("defaultOAuth2ProviderTokenService") public class DefaultOAuth2ProviderTokenService implements OAuth2TokenEntityService { private static Logger logger = LoggerFactory.getLogger(DefaultOAuth2ProviderTokenService.class); diff --git a/openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/DefaultApprovedSiteService.java b/openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/DefaultApprovedSiteService.java index c313f9e53..f14b1c806 100644 --- a/openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/DefaultApprovedSiteService.java +++ b/openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/DefaultApprovedSiteService.java @@ -43,8 +43,7 @@ import com.google.common.collect.Collections2; * @author Michael Joseph Walsh, aanganes * */ -@Service -@Transactional +@Service("defaultApprovedSiteService") public class DefaultApprovedSiteService implements ApprovedSiteService { private static Logger logger = LoggerFactory.getLogger(DefaultApprovedSiteService.class); @@ -159,11 +158,13 @@ public class DefaultApprovedSiteService implements ApprovedSiteService { logger.info("Clearing expired approved sites"); Collection expiredSites = getExpired(); + logger.info("Found " + expiredSites.size() + " expired approved sites."); if (expiredSites != null) { for (ApprovedSite expired : expiredSites) { remove(expired); } } + } private Predicate isExpired = new Predicate() {