added qualifier name to persistence unit and transaction manager, closes mitreid-connect#883

Author: jricher

openid-connect-server-webapp/src/main/webapp/WEB-INF/jpa-config.xml

@@ -31,6 +31,7 @@
 
 <bean id="transactionManager" class="org.springframework.orm.jpa.JpaTransactionManager">
 <property name="entityManagerFactory" ref="entityManagerFactory" />
+<qualifier value="defaultTransactionManager" />
 </bean>
 
 <bean id="entityManagerFactory" class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean">
@@ -46,6 +47,7 @@
 <entry key="eclipselink.cache.shared.default" value="false" />
 </map>
 </property>
+<property name="persistenceUnitName" value="defaultPersistenceUnit" />
 </bean>
 
 

openid-connect-server/src/main/java/org/mitre/oauth2/repository/impl/JpaAuthenticationHolderRepository.java

@@ -29,12 +29,12 @@
 import org.springframework.transaction.annotation.Transactional;
 
 @Repository
-@Transactional
+@Transactional(value="defaultTransactionManager")
 public class JpaAuthenticationHolderRepository implements AuthenticationHolderRepository {
 
 private static final int MAXEXPIREDRESULTS = 1000;
 
-@PersistenceContext
+@PersistenceContext(unitName="defaultPersistenceUnit")
 private EntityManager manager;
 
 @Override
@@ -49,7 +49,7 @@ public AuthenticationHolderEntity getById(Long id) {
 }
 
 @Override
-@Transactional
+@Transactional(value="defaultTransactionManager")
 public void remove(AuthenticationHolderEntity a) {
 AuthenticationHolderEntity found = getById(a.getId());
 if (found != null) {
@@ -60,13 +60,13 @@ public void remove(AuthenticationHolderEntity a) {
 }
 
 @Override
-@Transactional
+@Transactional(value="defaultTransactionManager")
 public AuthenticationHolderEntity save(AuthenticationHolderEntity a) {
 return JpaUtil.saveOrUpdate(a.getId(), manager, a);
 }
 
 @Override
-@Transactional
+@Transactional(value="defaultTransactionManager")
 public List<AuthenticationHolderEntity> getOrphanedAuthenticationHolders() {
 TypedQuery<AuthenticationHolderEntity> query = manager.createNamedQuery(AuthenticationHolderEntity.QUERY_GET_UNUSED, AuthenticationHolderEntity.class);
 query.setMaxResults(MAXEXPIREDRESULTS);

openid-connect-server/src/main/java/org/mitre/oauth2/repository/impl/JpaAuthorizationCodeRepository.java

@@ -39,17 +39,17 @@
  *
  */
 @Repository
-@Transactional
+@Transactional(value="defaultTransactionManager")
 public class JpaAuthorizationCodeRepository implements AuthorizationCodeRepository {
 
-@PersistenceContext
+@PersistenceContext(unitName="defaultPersistenceUnit")
 EntityManager manager;
 
 /* (non-Javadoc)
  * @see org.mitre.oauth2.repository.AuthorizationCodeRepository#save(org.mitre.oauth2.model.AuthorizationCodeEntity)
  */
 @Override
-@Transactional
+@Transactional(value="defaultTransactionManager")
 public AuthorizationCodeEntity save(AuthorizationCodeEntity authorizationCode) {
 
 return JpaUtil.saveOrUpdate(authorizationCode.getId(), manager, authorizationCode);
@@ -60,7 +60,7 @@ public AuthorizationCodeEntity save(AuthorizationCodeEntity authorizationCode) {
  * @see org.mitre.oauth2.repository.AuthorizationCodeRepository#getByCode(java.lang.String)
  */
 @Override
-@Transactional
+@Transactional(value="defaultTransactionManager")
 public AuthorizationCodeEntity getByCode(String code) {
 TypedQuery<AuthorizationCodeEntity> query = manager.createNamedQuery(AuthorizationCodeEntity.QUERY_BY_VALUE, AuthorizationCodeEntity.class);
 query.setParameter("code", code);

openid-connect-server/src/main/java/org/mitre/oauth2/repository/impl/JpaOAuth2ClientRepository.java

@@ -33,10 +33,10 @@
  *
  */
 @Repository
-@Transactional
+@Transactional(value="defaultTransactionManager")
 public class JpaOAuth2ClientRepository implements OAuth2ClientRepository {
 
-@PersistenceContext
+@PersistenceContext(unitName="defaultPersistenceUnit")
 private EntityManager manager;
 
 public JpaOAuth2ClientRepository() {

openid-connect-server/src/main/java/org/mitre/oauth2/repository/impl/JpaOAuth2TokenRepository.java

@@ -43,7 +43,7 @@ public class JpaOAuth2TokenRepository implements OAuth2TokenRepository {
 
 private static final int MAXEXPIREDRESULTS = 1000;
 
-@PersistenceContext
+@PersistenceContext(unitName="defaultPersistenceUnit")
 private EntityManager manager;
 
 @Override
@@ -77,13 +77,13 @@ public OAuth2AccessTokenEntity getAccessTokenById(Long id) {
 }
 
 @Override
-@Transactional
+@Transactional(value="defaultTransactionManager")
 public OAuth2AccessTokenEntity saveAccessToken(OAuth2AccessTokenEntity token) {
 return JpaUtil.saveOrUpdate(token.getId(), manager, token);
 }
 
 @Override
-@Transactional
+@Transactional(value="defaultTransactionManager")
 public void removeAccessToken(OAuth2AccessTokenEntity accessToken) {
 OAuth2AccessTokenEntity found = getAccessTokenByValue(accessToken.getValue());
 if (found != null) {
@@ -94,7 +94,7 @@ public void removeAccessToken(OAuth2AccessTokenEntity accessToken) {
 }
 
 @Override
-@Transactional
+@Transactional(value="defaultTransactionManager")
 public void clearAccessTokensForRefreshToken(OAuth2RefreshTokenEntity refreshToken) {
 TypedQuery<OAuth2AccessTokenEntity> query = manager.createNamedQuery(OAuth2AccessTokenEntity.QUERY_BY_REFRESH_TOKEN, OAuth2AccessTokenEntity.class);
 query.setParameter(OAuth2AccessTokenEntity.PARAM_REFERSH_TOKEN, refreshToken);
@@ -122,13 +122,13 @@ public OAuth2RefreshTokenEntity getRefreshTokenById(Long id) {
 }
 
 @Override
-@Transactional
+@Transactional(value="defaultTransactionManager")
 public OAuth2RefreshTokenEntity saveRefreshToken(OAuth2RefreshTokenEntity refreshToken) {
 return JpaUtil.saveOrUpdate(refreshToken.getId(), manager, refreshToken);
 }
 
 @Override
-@Transactional
+@Transactional(value="defaultTransactionManager")
 public void removeRefreshToken(OAuth2RefreshTokenEntity refreshToken) {
 OAuth2RefreshTokenEntity found = getRefreshTokenByValue(refreshToken.getValue());
 if (found != null) {
@@ -139,7 +139,7 @@ public void removeRefreshToken(OAuth2RefreshTokenEntity refreshToken) {
 }
 
 @Override
-@Transactional
+@Transactional(value="defaultTransactionManager")
 public void clearTokensForClient(ClientDetailsEntity client) {
 TypedQuery<OAuth2AccessTokenEntity> queryA = manager.createNamedQuery(OAuth2AccessTokenEntity.QUERY_BY_CLIENT, OAuth2AccessTokenEntity.class);
 queryA.setParameter(OAuth2AccessTokenEntity.PARAM_CLIENT, client);

openid-connect-server/src/main/java/org/mitre/oauth2/repository/impl/JpaSystemScopeRepository.java

@@ -41,14 +41,14 @@
 @Repository("jpaSystemScopeRepository")
 public class JpaSystemScopeRepository implements SystemScopeRepository {
 
-@PersistenceContext
+@PersistenceContext(unitName="defaultPersistenceUnit")
 private EntityManager em;
 
 /* (non-Javadoc)
  * @see org.mitre.oauth2.repository.SystemScopeRepository#getAll()
  */
 @Override
-@Transactional
+@Transactional(value="defaultTransactionManager")
 public Set<SystemScope> getAll() {
 TypedQuery<SystemScope> query = em.createNamedQuery(SystemScope.QUERY_ALL, SystemScope.class);
 
@@ -59,7 +59,7 @@ public Set<SystemScope> getAll() {
  * @see org.mitre.oauth2.repository.SystemScopeRepository#getById(java.lang.Long)
  */
 @Override
-@Transactional
+@Transactional(value="defaultTransactionManager")
 public SystemScope getById(Long id) {
 return em.find(SystemScope.class, id);
 }
@@ -68,7 +68,7 @@ public SystemScope getById(Long id) {
  * @see org.mitre.oauth2.repository.SystemScopeRepository#getByValue(java.lang.String)
  */
 @Override
-@Transactional
+@Transactional(value="defaultTransactionManager")
 public SystemScope getByValue(String value) {
 TypedQuery<SystemScope> query = em.createNamedQuery(SystemScope.QUERY_BY_VALUE, SystemScope.class);
 query.setParameter(SystemScope.PARAM_VALUE, value);
@@ -79,7 +79,7 @@ public SystemScope getByValue(String value) {
  * @see org.mitre.oauth2.repository.SystemScopeRepository#remove(org.mitre.oauth2.model.SystemScope)
  */
 @Override
-@Transactional
+@Transactional(value="defaultTransactionManager")
 public void remove(SystemScope scope) {
 SystemScope found = getById(scope.getId());
 
@@ -93,7 +93,7 @@ public void remove(SystemScope scope) {
  * @see org.mitre.oauth2.repository.SystemScopeRepository#save(org.mitre.oauth2.model.SystemScope)
  */
 @Override
-@Transactional
+@Transactional(value="defaultTransactionManager")
 public SystemScope save(SystemScope scope) {
 return saveOrUpdate(scope.getId(), em, scope);
 }

openid-connect-server/src/main/java/org/mitre/oauth2/service/impl/DefaultOAuth2AuthorizationCodeService.java

@@ -112,7 +112,7 @@ public OAuth2Authentication consumeAuthorizationCode(String code) throws Invalid
 /**
  * Find and remove all expired auth codes.
  */
-@Transactional
+@Transactional(value="defaultTransactionManager")
 public void clearExpiredAuthorizationCodes() {
 
 Collection<AuthorizationCodeEntity> codes = repository.getExpiredCodes();

openid-connect-server/src/main/java/org/mitre/openid/connect/repository/impl/JpaAddressRepository.java

@@ -33,11 +33,11 @@
 @Repository
 public class JpaAddressRepository implements AddressRepository {
 
-@PersistenceContext
+@PersistenceContext(unitName="defaultPersistenceUnit")
 private EntityManager manager;
 
 @Override
-@Transactional
+@Transactional(value="defaultTransactionManager")
 public Address getById(Long id) {
 return manager.find(Address.class, id);
 }

openid-connect-server/src/main/java/org/mitre/openid/connect/repository/impl/JpaApprovedSiteRepository.java

@@ -38,24 +38,24 @@
 @Repository
 public class JpaApprovedSiteRepository implements ApprovedSiteRepository {
 
-@PersistenceContext
+@PersistenceContext(unitName="defaultPersistenceUnit")
 private EntityManager manager;
 
 @Override
-@Transactional
+@Transactional(value="defaultTransactionManager")
 public Collection<ApprovedSite> getAll() {
 TypedQuery<ApprovedSite> query = manager.createNamedQuery(ApprovedSite.QUERY_ALL, ApprovedSite.class);
 return query.getResultList();
 }
 
 @Override
-@Transactional
+@Transactional(value="defaultTransactionManager")
 public ApprovedSite getById(Long id) {
 return manager.find(ApprovedSite.class, id);
 }
 
 @Override
-@Transactional
+@Transactional(value="defaultTransactionManager")
 public void remove(ApprovedSite approvedSite) {
 ApprovedSite found = manager.find(ApprovedSite.class, approvedSite.getId());
 
@@ -67,7 +67,7 @@ public void remove(ApprovedSite approvedSite) {
 }
 
 @Override
-@Transactional
+@Transactional(value="defaultTransactionManager")
 public ApprovedSite save(ApprovedSite approvedSite) {
 return saveOrUpdate(approvedSite.getId(), manager, approvedSite);
 }
@@ -83,7 +83,7 @@ public Collection<ApprovedSite> getByClientIdAndUserId(String clientId, String u
 }
 
 @Override
-@Transactional
+@Transactional(value="defaultTransactionManager")
 public Collection<ApprovedSite> getByUserId(String userId) {
 TypedQuery<ApprovedSite> query = manager.createNamedQuery(ApprovedSite.QUERY_BY_USER_ID, ApprovedSite.class);
 query.setParameter(ApprovedSite.PARAM_USER_ID, userId);
@@ -93,7 +93,7 @@ public Collection<ApprovedSite> getByUserId(String userId) {
 }
 
 @Override
-@Transactional
+@Transactional(value="defaultTransactionManager")
 public Collection<ApprovedSite> getByClientId(String clientId) {
 TypedQuery<ApprovedSite> query = manager.createNamedQuery(ApprovedSite.QUERY_BY_CLIENT_ID, ApprovedSite.class);
 query.setParameter(ApprovedSite.PARAM_CLIENT_ID, clientId);

openid-connect-server/src/main/java/org/mitre/openid/connect/repository/impl/JpaBlacklistedSiteRepository.java

@@ -39,14 +39,14 @@
 @Repository
 public class JpaBlacklistedSiteRepository implements BlacklistedSiteRepository {
 
-@PersistenceContext
+@PersistenceContext(unitName="defaultPersistenceUnit")
 private EntityManager manager;
 
 /* (non-Javadoc)
  * @see org.mitre.openid.connect.repository.BlacklistedSiteRepository#getAll()
  */
 @Override
-@Transactional
+@Transactional(value="defaultTransactionManager")
 public Collection<BlacklistedSite> getAll() {
 TypedQuery<BlacklistedSite> query = manager.createNamedQuery(BlacklistedSite.QUERY_ALL, BlacklistedSite.class);
 return query.getResultList();
@@ -56,7 +56,7 @@ public Collection<BlacklistedSite> getAll() {
  * @see org.mitre.openid.connect.repository.BlacklistedSiteRepository#getById(java.lang.Long)
  */
 @Override
-@Transactional
+@Transactional(value="defaultTransactionManager")
 public BlacklistedSite getById(Long id) {
 return manager.find(BlacklistedSite.class, id);
 }
@@ -65,7 +65,7 @@ public BlacklistedSite getById(Long id) {
  * @see org.mitre.openid.connect.repository.BlacklistedSiteRepository#remove(org.mitre.openid.connect.model.BlacklistedSite)
  */
 @Override
-@Transactional
+@Transactional(value="defaultTransactionManager")
 public void remove(BlacklistedSite blacklistedSite) {
 BlacklistedSite found = manager.find(BlacklistedSite.class, blacklistedSite.getId());
 
@@ -81,7 +81,7 @@ public void remove(BlacklistedSite blacklistedSite) {
  * @see org.mitre.openid.connect.repository.BlacklistedSiteRepository#save(org.mitre.openid.connect.model.BlacklistedSite)
  */
 @Override
-@Transactional
+@Transactional(value="defaultTransactionManager")
 public BlacklistedSite save(BlacklistedSite blacklistedSite) {
 return saveOrUpdate(blacklistedSite.getId(), manager, blacklistedSite);
 }
@@ -90,7 +90,7 @@ public BlacklistedSite save(BlacklistedSite blacklistedSite) {
  * @see org.mitre.openid.connect.repository.BlacklistedSiteRepository#update(org.mitre.openid.connect.model.BlacklistedSite, org.mitre.openid.connect.model.BlacklistedSite)
  */
 @Override
-@Transactional
+@Transactional(value="defaultTransactionManager")
 public BlacklistedSite update(BlacklistedSite oldBlacklistedSite, BlacklistedSite blacklistedSite) {
 
 blacklistedSite.setId(oldBlacklistedSite.getId());