Split configuration constants into local XConfigUtils classes instead of piling them up in AnnotationConfigUtils

spring-aspects/src/main/java/org/springframework/cache/aspectj/AspectJCachingConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@ package org.springframework.cache.aspectj;
 
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.cache.annotation.AbstractCachingConfiguration;
-import org.springframework.context.annotation.AnnotationConfigUtils;
+import org.springframework.cache.config.CacheManagementConfigUtils;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Role;
@@ -35,7 +35,7 @@ import org.springframework.context.annotation.Role;
 @Configuration
 public class AspectJCachingConfiguration extends AbstractCachingConfiguration {
 
-	@Bean(name=AnnotationConfigUtils.CACHE_ASPECT_BEAN_NAME)
+	@Bean(name = CacheManagementConfigUtils.CACHE_ASPECT_BEAN_NAME)
 	@Role(BeanDefinition.ROLE_INFRASTRUCTURE)
 	public AnnotationCacheAspect cacheAspect() {
 		AnnotationCacheAspect cacheAspect = AnnotationCacheAspect.aspectOf();

spring-aspects/src/main/java/org/springframework/cache/aspectj/AspectJJCacheConfiguration.java

@@ -17,9 +17,8 @@
 package org.springframework.cache.aspectj;
 
 import org.springframework.beans.factory.config.BeanDefinition;
-import org.springframework.cache.annotation.AbstractCachingConfiguration;
+import org.springframework.cache.config.CacheManagementConfigUtils;
 import org.springframework.cache.jcache.config.AbstractJCacheConfiguration;
-import org.springframework.context.annotation.AnnotationConfigUtils;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Role;
@@ -37,7 +36,7 @@ import org.springframework.context.annotation.Role;
 @Configuration
 public class AspectJJCacheConfiguration extends AbstractJCacheConfiguration {
 
-	@Bean(name=AnnotationConfigUtils.JCACHE_ASPECT_BEAN_NAME)
+	@Bean(name = CacheManagementConfigUtils.JCACHE_ASPECT_BEAN_NAME)
 	@Role(BeanDefinition.ROLE_INFRASTRUCTURE)
 	public JCacheCacheAspect cacheAspect() {
 		JCacheCacheAspect cacheAspect = JCacheCacheAspect.aspectOf();

spring-aspects/src/main/java/org/springframework/scheduling/aspectj/AspectJAsyncConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,12 +17,12 @@
 package org.springframework.scheduling.aspectj;
 
 import org.springframework.beans.factory.config.BeanDefinition;
-import org.springframework.context.annotation.AnnotationConfigUtils;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Role;
 import org.springframework.scheduling.annotation.AbstractAsyncConfiguration;
 import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.scheduling.config.TaskManagementConfigUtils;
 
 /**
  * {@code @Configuration} class that registers the Spring infrastructure beans necessary
@@ -37,7 +37,7 @@ import org.springframework.scheduling.annotation.EnableAsync;
 @Configuration
 public class AspectJAsyncConfiguration extends AbstractAsyncConfiguration {
 
-	@Bean(name=AnnotationConfigUtils.ASYNC_EXECUTION_ASPECT_BEAN_NAME)
+	@Bean(name = TaskManagementConfigUtils.ASYNC_EXECUTION_ASPECT_BEAN_NAME)
 	@Role(BeanDefinition.ROLE_INFRASTRUCTURE)
 	public AnnotationAsyncExecutionAspect asyncAdvisor() {
 		AnnotationAsyncExecutionAspect asyncAspect = AnnotationAsyncExecutionAspect.aspectOf();

spring-aspects/src/main/java/org/springframework/transaction/aspectj/AspectJTransactionManagementConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -37,7 +37,7 @@ import org.springframework.transaction.config.TransactionManagementConfigUtils;
 @Configuration
 public class AspectJTransactionManagementConfiguration extends AbstractTransactionManagementConfiguration {
 
-	@Bean(name=TransactionManagementConfigUtils.TRANSACTION_ASPECT_BEAN_NAME)
+	@Bean(name = TransactionManagementConfigUtils.TRANSACTION_ASPECT_BEAN_NAME)
 	@Role(BeanDefinition.ROLE_INFRASTRUCTURE)
 	public AnnotationTransactionAspect transactionAspect() {
 		AnnotationTransactionAspect txAspect = AnnotationTransactionAspect.aspectOf();
@@ -46,4 +46,5 @@ public class AspectJTransactionManagementConfiguration extends AbstractTransacti
 		}
 		return txAspect;
 	}
+
 }

spring-context-support/src/main/java/org/springframework/cache/jcache/config/ProxyJCacheConfiguration.java

@@ -17,9 +17,9 @@
 package org.springframework.cache.jcache.config;
 
 import org.springframework.beans.factory.config.BeanDefinition;
+import org.springframework.cache.config.CacheManagementConfigUtils;
 import org.springframework.cache.jcache.interceptor.BeanFactoryJCacheOperationSourceAdvisor;
 import org.springframework.cache.jcache.interceptor.JCacheInterceptor;
-import org.springframework.context.annotation.AnnotationConfigUtils;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Role;
@@ -38,7 +38,7 @@ import org.springframework.context.annotation.Role;
 @Configuration
 public class ProxyJCacheConfiguration extends AbstractJCacheConfiguration {
 
-	@Bean(name = AnnotationConfigUtils.JCACHE_ADVISOR_BEAN_NAME)
+	@Bean(name = CacheManagementConfigUtils.JCACHE_ADVISOR_BEAN_NAME)
 	@Role(BeanDefinition.ROLE_INFRASTRUCTURE)
 	public BeanFactoryJCacheOperationSourceAdvisor cacheAdvisor() {
 		BeanFactoryJCacheOperationSourceAdvisor advisor =
@@ -49,7 +49,6 @@ public class ProxyJCacheConfiguration extends AbstractJCacheConfiguration {
 		return advisor;
 	}
 
-
 	@Bean(name = "jCacheInterceptor")
 	@Role(BeanDefinition.ROLE_INFRASTRUCTURE)
 	public JCacheInterceptor cacheInterceptor() {

spring-context/src/main/java/org/springframework/cache/annotation/CachingConfigurationSelector.java

@@ -21,7 +21,6 @@ import java.util.List;
 
 import org.springframework.context.annotation.AdviceMode;
 import org.springframework.context.annotation.AdviceModeImportSelector;
-import org.springframework.context.annotation.AnnotationConfigUtils;
 import org.springframework.context.annotation.AutoProxyRegistrar;
 import org.springframework.util.ClassUtils;
 
@@ -36,19 +35,26 @@ import org.springframework.util.ClassUtils;
  * @since 3.1
  * @see EnableCaching
  * @see ProxyCachingConfiguration
- * @see AnnotationConfigUtils#CACHE_ASPECT_CONFIGURATION_CLASS_NAME
- * @see AnnotationConfigUtils#JCACHE_ASPECT_CONFIGURATION_CLASS_NAME
  */
 public class CachingConfigurationSelector extends AdviceModeImportSelector<EnableCaching> {
 
 	private static final String PROXY_JCACHE_CONFIGURATION_CLASS =
 			"org.springframework.cache.jcache.config.ProxyJCacheConfiguration";
 
+	private static final String CACHE_ASPECT_CONFIGURATION_CLASS_NAME =
+			"org.springframework.cache.aspectj.AspectJCachingConfiguration";
+
+	private static final String JCACHE_ASPECT_CONFIGURATION_CLASS_NAME =
+			"org.springframework.cache.aspectj.AspectJJCacheConfiguration";
+
+
 	private static final boolean jsr107Present = ClassUtils.isPresent(
 			"javax.cache.Cache", CachingConfigurationSelector.class.getClassLoader());
+
 	private static final boolean jCacheImplPresent = ClassUtils.isPresent(
 			PROXY_JCACHE_CONFIGURATION_CLASS, CachingConfigurationSelector.class.getClassLoader());
 
+
 	/**
 	 * {@inheritDoc}
 	 * @return {@link ProxyCachingConfiguration} or {@code AspectJCacheConfiguration} for
@@ -74,7 +80,7 @@ public class CachingConfigurationSelector extends AdviceModeImportSelector<Enabl
 		List<String> result = new ArrayList<String>();
 		result.add(AutoProxyRegistrar.class.getName());
 		result.add(ProxyCachingConfiguration.class.getName());
-		if (isJCacheAvailable()) {
+		if (jsr107Present && jCacheImplPresent) {
 			result.add(PROXY_JCACHE_CONFIGURATION_CLASS);
 		}
 		return result.toArray(new String[result.size()]);
@@ -86,19 +92,11 @@ public class CachingConfigurationSelector extends AdviceModeImportSelector<Enabl
 	 */
 	private String[] getAspectJImports() {
 		List<String> result = new ArrayList<String>();
-		result.add(AnnotationConfigUtils.CACHE_ASPECT_CONFIGURATION_CLASS_NAME);
-		if (isJCacheAvailable()) {
-			result.add(AnnotationConfigUtils.JCACHE_ASPECT_CONFIGURATION_CLASS_NAME);
+		result.add(CACHE_ASPECT_CONFIGURATION_CLASS_NAME);
+		if (jsr107Present && jCacheImplPresent) {
+			result.add(JCACHE_ASPECT_CONFIGURATION_CLASS_NAME);
 		}
 		return result.toArray(new String[result.size()]);
 	}
 
-	/**
-	 * Specify if the JSR-107 API and Spring's jCache implementation are available
-	 * in the classpath.
-	 */
-	private boolean isJCacheAvailable() {
-		return jsr107Present && jCacheImplPresent;
-	}
-
 }

spring-context/src/main/java/org/springframework/cache/annotation/ProxyCachingConfiguration.java

@@ -17,10 +17,10 @@
 package org.springframework.cache.annotation;
 
 import org.springframework.beans.factory.config.BeanDefinition;
+import org.springframework.cache.config.CacheManagementConfigUtils;
 import org.springframework.cache.interceptor.BeanFactoryCacheOperationSourceAdvisor;
 import org.springframework.cache.interceptor.CacheInterceptor;
 import org.springframework.cache.interceptor.CacheOperationSource;
-import org.springframework.context.annotation.AnnotationConfigUtils;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Role;
@@ -37,11 +37,11 @@ import org.springframework.context.annotation.Role;
 @Configuration
 public class ProxyCachingConfiguration extends AbstractCachingConfiguration<CachingConfigurer> {
 
-	@Bean(name=AnnotationConfigUtils.CACHE_ADVISOR_BEAN_NAME)
+	@Bean(name = CacheManagementConfigUtils.CACHE_ADVISOR_BEAN_NAME)
 	@Role(BeanDefinition.ROLE_INFRASTRUCTURE)
 	public BeanFactoryCacheOperationSourceAdvisor cacheAdvisor() {
 		BeanFactoryCacheOperationSourceAdvisor advisor =
-			new BeanFactoryCacheOperationSourceAdvisor();
+				new BeanFactoryCacheOperationSourceAdvisor();
 		advisor.setCacheOperationSource(cacheOperationSource());
 		advisor.setAdvice(cacheInterceptor());
 		advisor.setOrder(this.enableCaching.<Integer>getNumber("order"));

spring-context/src/main/java/org/springframework/cache/config/AnnotationDrivenCacheBeanDefinitionParser.java

@@ -16,8 +16,6 @@
 
 package org.springframework.cache.config;
 
-import static org.springframework.context.annotation.AnnotationConfigUtils.*;
-
 import org.w3c.dom.Element;
 
 import org.springframework.aop.config.AopNamespaceUtils;
@@ -28,7 +26,6 @@ import org.springframework.beans.factory.parsing.CompositeComponentDefinition;
 import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.beans.factory.xml.BeanDefinitionParser;
 import org.springframework.beans.factory.xml.ParserContext;
-import org.springframework.cache.annotation.AnnotationCacheOperationSource;
 import org.springframework.cache.interceptor.BeanFactoryCacheOperationSourceAdvisor;
 import org.springframework.cache.interceptor.CacheInterceptor;
 import org.springframework.util.ClassUtils;
@@ -57,11 +54,20 @@ import org.springframework.util.StringUtils;
  */
 class AnnotationDrivenCacheBeanDefinitionParser implements BeanDefinitionParser {
 
+	private static final String CACHE_ASPECT_CLASS_NAME =
+			"org.springframework.cache.aspectj.AnnotationCacheAspect";
+
+	private static final String JCACHE_ASPECT_CLASS_NAME =
+			"org.springframework.cache.aspectj.JCacheCacheAspect";
+
+
 	private static final boolean jsr107Present = ClassUtils.isPresent(
 			"javax.cache.Cache", AnnotationDrivenCacheBeanDefinitionParser.class.getClassLoader());
 
 	private static final boolean jCacheImplPresent = ClassUtils.isPresent(
-			JCACHE_OPERATION_SOURCE_CLASS, AnnotationDrivenCacheBeanDefinitionParser.class.getClassLoader());
+			"org.springframework.cache.jcache.interceptor.DefaultJCacheOperationSource",
+			AnnotationDrivenCacheBeanDefinitionParser.class.getClassLoader());
+
 
 	/**
 	 * Parses the '{@code <cache:annotation-driven>}' tag. Will
@@ -122,17 +128,18 @@ class AnnotationDrivenCacheBeanDefinitionParser implements BeanDefinitionParser
 		return def;
 	}
 
+
 	/**
 	 * Configure the necessary infrastructure to support the Spring's caching annotations.
 	 */
 	private static class SpringCachingConfigurer {
 
 		private static void registerCacheAdvisor(Element element, ParserContext parserContext) {
-			if (!parserContext.getRegistry().containsBeanDefinition(CACHE_ADVISOR_BEAN_NAME)) {
+			if (!parserContext.getRegistry().containsBeanDefinition(CacheManagementConfigUtils.CACHE_ADVISOR_BEAN_NAME)) {
 				Object eleSource = parserContext.extractSource(element);
 
 				// Create the CacheOperationSource definition.
-				RootBeanDefinition sourceDef = new RootBeanDefinition(AnnotationCacheOperationSource.class);
+				RootBeanDefinition sourceDef = new RootBeanDefinition("org.springframework.cache.annotation.AnnotationCacheOperationSource");
 				sourceDef.setSource(eleSource);
 				sourceDef.setRole(BeanDefinition.ROLE_INFRASTRUCTURE);
 				String sourceName = parserContext.getReaderContext().registerWithGeneratedName(sourceDef);
@@ -156,13 +163,12 @@ class AnnotationDrivenCacheBeanDefinitionParser implements BeanDefinitionParser
 				if (element.hasAttribute("order")) {
 					advisorDef.getPropertyValues().add("order", element.getAttribute("order"));
 				}
-				parserContext.getRegistry().registerBeanDefinition(CACHE_ADVISOR_BEAN_NAME, advisorDef);
+				parserContext.getRegistry().registerBeanDefinition(CacheManagementConfigUtils.CACHE_ADVISOR_BEAN_NAME, advisorDef);
 
-				CompositeComponentDefinition compositeDef = new CompositeComponentDefinition(element.getTagName(),
-						eleSource);
+				CompositeComponentDefinition compositeDef = new CompositeComponentDefinition(element.getTagName(), eleSource);
 				compositeDef.addNestedComponent(new BeanComponentDefinition(sourceDef, sourceName));
 				compositeDef.addNestedComponent(new BeanComponentDefinition(interceptorDef, interceptorName));
-				compositeDef.addNestedComponent(new BeanComponentDefinition(advisorDef, CACHE_ADVISOR_BEAN_NAME));
+				compositeDef.addNestedComponent(new BeanComponentDefinition(advisorDef, CacheManagementConfigUtils.CACHE_ADVISOR_BEAN_NAME));
 				parserContext.registerComponent(compositeDef);
 			}
 		}
@@ -177,24 +183,25 @@ class AnnotationDrivenCacheBeanDefinitionParser implements BeanDefinitionParser
 		 * </pre>
 		 */
 		private static void registerCacheAspect(Element element, ParserContext parserContext) {
-			if (!parserContext.getRegistry().containsBeanDefinition(CACHE_ASPECT_BEAN_NAME)) {
+			if (!parserContext.getRegistry().containsBeanDefinition(CacheManagementConfigUtils.CACHE_ASPECT_BEAN_NAME)) {
 				RootBeanDefinition def = new RootBeanDefinition();
 				def.setBeanClassName(CACHE_ASPECT_CLASS_NAME);
 				def.setFactoryMethodName("aspectOf");
 				parseCacheResolution(element, def, false);
 				CacheNamespaceHandler.parseKeyGenerator(element, def);
-				parserContext.registerBeanComponent(new BeanComponentDefinition(def, CACHE_ASPECT_BEAN_NAME));
+				parserContext.registerBeanComponent(new BeanComponentDefinition(def, CacheManagementConfigUtils.CACHE_ASPECT_BEAN_NAME));
 			}
 		}
 	}
 
+
 	/**
 	 * Configure the necessary infrastructure to support the standard JSR-107 caching annotations.
 	 */
 	private static class JCacheCachingConfigurer {
 
 		private static void registerCacheAdvisor(Element element, ParserContext parserContext) {
-			if (!parserContext.getRegistry().containsBeanDefinition(JCACHE_ADVISOR_BEAN_NAME)) {
+			if (!parserContext.getRegistry().containsBeanDefinition(CacheManagementConfigUtils.JCACHE_ADVISOR_BEAN_NAME)) {
 				Object eleSource = parserContext.extractSource(element);
 
 				// Create the CacheOperationSource definition.
@@ -202,7 +209,8 @@ class AnnotationDrivenCacheBeanDefinitionParser implements BeanDefinitionParser
 				String sourceName = parserContext.getReaderContext().registerWithGeneratedName(sourceDef);
 
 				// Create the CacheInterceptor definition.
-				RootBeanDefinition interceptorDef = new RootBeanDefinition(JCACHE_INTERCEPTOR_CLASS);
+				RootBeanDefinition interceptorDef =
+						new RootBeanDefinition("org.springframework.cache.jcache.interceptor.JCacheInterceptor");
 				interceptorDef.setSource(eleSource);
 				interceptorDef.setRole(BeanDefinition.ROLE_INFRASTRUCTURE);
 				interceptorDef.getPropertyValues().add("cacheOperationSource", new RuntimeBeanReference(sourceName));
@@ -210,7 +218,8 @@ class AnnotationDrivenCacheBeanDefinitionParser implements BeanDefinitionParser
 				String interceptorName = parserContext.getReaderContext().registerWithGeneratedName(interceptorDef);
 
 				// Create the CacheAdvisor definition.
-				RootBeanDefinition advisorDef = new RootBeanDefinition(JCACHE_ADVISOR_FACTORY_CLASS);
+				RootBeanDefinition advisorDef = new RootBeanDefinition(
+						"org.springframework.cache.jcache.interceptor.BeanFactoryJCacheOperationSourceAdvisor");
 				advisorDef.setSource(eleSource);
 				advisorDef.setRole(BeanDefinition.ROLE_INFRASTRUCTURE);
 				advisorDef.getPropertyValues().add("cacheOperationSource", new RuntimeBeanReference(sourceName));
@@ -218,19 +227,18 @@ class AnnotationDrivenCacheBeanDefinitionParser implements BeanDefinitionParser
 				if (element.hasAttribute("order")) {
 					advisorDef.getPropertyValues().add("order", element.getAttribute("order"));
 				}
-				parserContext.getRegistry().registerBeanDefinition(JCACHE_ADVISOR_BEAN_NAME, advisorDef);
+				parserContext.getRegistry().registerBeanDefinition(CacheManagementConfigUtils.JCACHE_ADVISOR_BEAN_NAME, advisorDef);
 
-				CompositeComponentDefinition compositeDef = new CompositeComponentDefinition(element.getTagName(),
-						eleSource);
+				CompositeComponentDefinition compositeDef = new CompositeComponentDefinition(element.getTagName(), eleSource);
 				compositeDef.addNestedComponent(new BeanComponentDefinition(sourceDef, sourceName));
 				compositeDef.addNestedComponent(new BeanComponentDefinition(interceptorDef, interceptorName));
-				compositeDef.addNestedComponent(new BeanComponentDefinition(advisorDef, JCACHE_ADVISOR_BEAN_NAME));
+				compositeDef.addNestedComponent(new BeanComponentDefinition(advisorDef, CacheManagementConfigUtils.JCACHE_ADVISOR_BEAN_NAME));
 				parserContext.registerComponent(compositeDef);
 			}
 		}
 
 		private static void registerCacheAspect(Element element, ParserContext parserContext) {
-			if (!parserContext.getRegistry().containsBeanDefinition(JCACHE_ASPECT_BEAN_NAME)) {
+			if (!parserContext.getRegistry().containsBeanDefinition(CacheManagementConfigUtils.JCACHE_ASPECT_BEAN_NAME)) {
 				Object eleSource = parserContext.extractSource(element);
 				RootBeanDefinition def = new RootBeanDefinition();
 				def.setBeanClassName(JCACHE_ASPECT_CLASS_NAME);
@@ -241,13 +249,13 @@ class AnnotationDrivenCacheBeanDefinitionParser implements BeanDefinitionParser
 				def.getPropertyValues().add("cacheOperationSource", new RuntimeBeanReference(sourceName));
 
 				parserContext.registerBeanComponent(new BeanComponentDefinition(sourceDef, sourceName));
-				parserContext.registerBeanComponent(new BeanComponentDefinition(def, JCACHE_ASPECT_BEAN_NAME));
+				parserContext.registerBeanComponent(new BeanComponentDefinition(def, CacheManagementConfigUtils.JCACHE_ASPECT_BEAN_NAME));
 			}
 		}
 
-		private static RootBeanDefinition createJCacheOperationSourceBeanDefinition(
-				Element element, Object eleSource) {
-			RootBeanDefinition sourceDef = new RootBeanDefinition(JCACHE_OPERATION_SOURCE_CLASS);
+		private static RootBeanDefinition createJCacheOperationSourceBeanDefinition(Element element, Object eleSource) {
+			RootBeanDefinition sourceDef =
+					new RootBeanDefinition("org.springframework.cache.jcache.interceptor.DefaultJCacheOperationSource");
 			sourceDef.setSource(eleSource);
 			sourceDef.setRole(BeanDefinition.ROLE_INFRASTRUCTURE);
 			// JSR-107 support should create an exception cache resolver with the cache manager

spring-context/src/main/java/org/springframework/cache/config/CacheAdviceParser.java

@@ -30,7 +30,6 @@ import org.springframework.beans.factory.support.ManagedMap;
 import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
 import org.springframework.beans.factory.xml.ParserContext;
-import org.springframework.cache.annotation.AnnotationCacheOperationSource;
 import org.springframework.cache.interceptor.CacheEvictOperation;
 import org.springframework.cache.interceptor.CacheInterceptor;
 import org.springframework.cache.interceptor.CacheOperation;
@@ -79,8 +78,8 @@ class CacheAdviceParser extends AbstractSingleBeanDefinitionParser {
 		}
 		else {
 			// Assume annotations source.
-			builder.addPropertyValue("cacheOperationSources", new RootBeanDefinition(
-					AnnotationCacheOperationSource.class));
+			builder.addPropertyValue("cacheOperationSources",
+					new RootBeanDefinition("org.springframework.cache.annotation.AnnotationCacheOperationSource"));
 		}
 	}
 

spring-context/src/main/java/org/springframework/cache/config/CacheManagementConfigUtils.java

@@ -0,0 +1,39 @@
+/*
+ * Copyright 2002-2014 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cache.config;
+
+/**
+ * Configuration constants for internal sharing across subpackages.
+ *
+ * @author Juergen Hoeller
+ * @since 4.1
+ */
+public class CacheManagementConfigUtils {
+
+	public static final String CACHE_ADVISOR_BEAN_NAME =
+			"org.springframework.cache.config.internalCacheAdvisor";
+
+	public static final String CACHE_ASPECT_BEAN_NAME =
+			"org.springframework.cache.config.internalCacheAspect";
+
+	public static final String JCACHE_ADVISOR_BEAN_NAME =
+			"org.springframework.cache.config.internalJCacheAdvisor";
+
+	public static final String JCACHE_ASPECT_BEAN_NAME =
+			"org.springframework.cache.config.internalJCacheAspect";
+
+}

spring-context/src/main/java/org/springframework/context/annotation/AnnotationConfigUtils.java

@@ -95,114 +95,6 @@ public class AnnotationConfigUtils {
 	public static final String COMMON_ANNOTATION_PROCESSOR_BEAN_NAME =
 			"org.springframework.context.annotation.internalCommonAnnotationProcessor";
 
-	/**
-	 * The bean name of the internally managed Scheduled annotation processor.
-	 */
-	public static final String SCHEDULED_ANNOTATION_PROCESSOR_BEAN_NAME =
-			"org.springframework.context.annotation.internalScheduledAnnotationProcessor";
-
-	/**
-	 * The bean name of the internally managed Async annotation processor.
-	 */
-	public static final String ASYNC_ANNOTATION_PROCESSOR_BEAN_NAME =
-			"org.springframework.context.annotation.internalAsyncAnnotationProcessor";
-
-	/**
-	 * The bean name of the internally managed AspectJ async execution aspect.
-	 */
-	public static final String ASYNC_EXECUTION_ASPECT_BEAN_NAME =
-			"org.springframework.scheduling.config.internalAsyncExecutionAspect";
-
-	/**
-	 * The class name of the AspectJ async execution aspect.
-	 */
-	public static final String ASYNC_EXECUTION_ASPECT_CLASS_NAME =
-			"org.springframework.scheduling.aspectj.AnnotationAsyncExecutionAspect";
-
-	/**
-	 * The name of the AspectJ async execution aspect @{@code Configuration} class.
-	 */
-	public static final String ASYNC_EXECUTION_ASPECT_CONFIGURATION_CLASS_NAME =
-			"org.springframework.scheduling.aspectj.AspectJAsyncConfiguration";
-
-	/**
-	 * The bean name of the internally managed cache advisor.
-	 */
-	public static final String CACHE_ADVISOR_BEAN_NAME =
-			"org.springframework.cache.config.internalCacheAdvisor";
-
-	/**
-	 * The bean name of the internally managed cache aspect.
-	 */
-	public static final String CACHE_ASPECT_BEAN_NAME =
-			"org.springframework.cache.config.internalCacheAspect";
-
-	/**
-	 * The class name of the AspectJ caching aspect.
-	 */
-	public static final String CACHE_ASPECT_CLASS_NAME =
-			"org.springframework.cache.aspectj.AnnotationCacheAspect";
-
-	/**
-	 * The name of the AspectJ caching aspect @{@code Configuration} class.
-	 */
-	public static final String CACHE_ASPECT_CONFIGURATION_CLASS_NAME =
-			"org.springframework.cache.aspectj.AspectJCachingConfiguration";
-
-	/**
-	 * The bean name of the internally managed JSR-107 cache advisor.
-	 */
-	public static final String JCACHE_ADVISOR_BEAN_NAME =
-			"org.springframework.cache.config.internalJCacheAdvisor";
-
-	/**
-	 * The class name of the JSR-107 cache operation source.
-	 */
-	public static final String JCACHE_OPERATION_SOURCE_CLASS
-			= "org.springframework.cache.jcache.interceptor.DefaultJCacheOperationSource";
-
-	/**
-	 * The class name of the JSR-107 cache interceptor.
-	 */
-	public static final String JCACHE_INTERCEPTOR_CLASS =
-			"org.springframework.cache.jcache.interceptor.JCacheInterceptor";
-
-	/**
-	 * The class name of the JSR-107 cache advisor factory.
-	 */
-	public static final String JCACHE_ADVISOR_FACTORY_CLASS =
-			"org.springframework.cache.jcache.interceptor.BeanFactoryJCacheOperationSourceAdvisor";
-
-	/**
-	 * The bean name of the internally managed JSR-107 cache aspect.
-	 */
-	public static final String JCACHE_ASPECT_BEAN_NAME =
-			"org.springframework.cache.config.internalJCacheAspect";
-
-	/**
-	 * The class name of the AspectJ JSR-107 cache aspect.
-	 */
-	public static final String JCACHE_ASPECT_CLASS_NAME =
-			"org.springframework.cache.aspectj.JCacheCacheAspect";
-
-	/**
-	 * The name of the AspectJ JSR-107 cache aspect @{@code Configuration} class.
-	 */
-	public static final String JCACHE_ASPECT_CONFIGURATION_CLASS_NAME =
-			"org.springframework.cache.aspectj.AspectJJCacheConfiguration";
-
-	/**
-	 * The bean name of the internally managed jms listener annotation processor.
-	 */
-	public static final String JMS_LISTENER_ANNOTATION_PROCESSOR_BEAN_NAME =
-			"org.springframework.jms.config.internalJmsListenerAnnotationProcessor";
-
-	/**
-	 * The bean name of the internally managed jms listener endpoint registry.
-	 */
-	public static final String JMS_LISTENER_ENDPOINT_REGISTRY_BEAN_NAME =
-			"org.springframework.jms.config.internalJmsListenerEndpointRegistry";
-
 	/**
 	 * The bean name of the internally managed JPA annotation processor.
 	 */

spring-context/src/main/java/org/springframework/scheduling/annotation/AsyncConfigurationSelector.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,10 +28,12 @@ import org.springframework.context.annotation.AnnotationConfigUtils;
  * @since 3.1
  * @see EnableAsync
  * @see ProxyAsyncConfiguration
- * @see AnnotationConfigUtils#ASYNC_EXECUTION_ASPECT_CONFIGURATION_CLASS_NAME
  */
 public class AsyncConfigurationSelector extends AdviceModeImportSelector<EnableAsync> {
 
+	private static final String ASYNC_EXECUTION_ASPECT_CONFIGURATION_CLASS_NAME =
+			"org.springframework.scheduling.aspectj.AspectJAsyncConfiguration";
+
 	/**
 	 * {@inheritDoc}
 	 * @return {@link ProxyAsyncConfiguration} or {@code AspectJAsyncConfiguration} for
@@ -43,7 +45,7 @@ public class AsyncConfigurationSelector extends AdviceModeImportSelector<EnableA
 			case PROXY:
 				return new String[] { ProxyAsyncConfiguration.class.getName() };
 			case ASPECTJ:
-				return new String[] { AnnotationConfigUtils.ASYNC_EXECUTION_ASPECT_CONFIGURATION_CLASS_NAME };
+				return new String[] { ASYNC_EXECUTION_ASPECT_CONFIGURATION_CLASS_NAME };
 			default:
 				return null;
 		}

spring-context/src/main/java/org/springframework/scheduling/annotation/ProxyAsyncConfiguration.java

@@ -19,11 +19,11 @@ package org.springframework.scheduling.annotation;
 import java.lang.annotation.Annotation;
 
 import org.springframework.beans.factory.config.BeanDefinition;
-import org.springframework.context.annotation.AnnotationConfigUtils;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Role;
 import org.springframework.core.annotation.AnnotationUtils;
+import org.springframework.scheduling.config.TaskManagementConfigUtils;
 import org.springframework.util.Assert;
 
 /**
@@ -39,7 +39,7 @@ import org.springframework.util.Assert;
 @Configuration
 public class ProxyAsyncConfiguration extends AbstractAsyncConfiguration {
 
-	@Bean(name=AnnotationConfigUtils.ASYNC_ANNOTATION_PROCESSOR_BEAN_NAME)
+	@Bean(name = TaskManagementConfigUtils.ASYNC_ANNOTATION_PROCESSOR_BEAN_NAME)
 	@Role(BeanDefinition.ROLE_INFRASTRUCTURE)
 	public AsyncAnnotationBeanPostProcessor asyncAdvisor() {
 		Assert.notNull(this.enableAsync, "@EnableAsync annotation metadata was not injected");

spring-context/src/main/java/org/springframework/scheduling/annotation/SchedulingConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,10 +17,10 @@
 package org.springframework.scheduling.annotation;
 
 import org.springframework.beans.factory.config.BeanDefinition;
-import org.springframework.context.annotation.AnnotationConfigUtils;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Role;
+import org.springframework.scheduling.config.TaskManagementConfigUtils;
 
 /**
  * {@code @Configuration} class that registers a {@link
@@ -39,7 +39,7 @@ import org.springframework.context.annotation.Role;
 @Configuration
 public class SchedulingConfiguration {
 
-	@Bean(name=AnnotationConfigUtils.SCHEDULED_ANNOTATION_PROCESSOR_BEAN_NAME)
+	@Bean(name = TaskManagementConfigUtils.SCHEDULED_ANNOTATION_PROCESSOR_BEAN_NAME)
 	@Role(BeanDefinition.ROLE_INFRASTRUCTURE)
 	public ScheduledAnnotationBeanPostProcessor scheduledAnnotationProcessor() {
 		return new ScheduledAnnotationBeanPostProcessor();

spring-context/src/main/java/org/springframework/scheduling/config/AnnotationDrivenBeanDefinitionParser.java

@@ -27,7 +27,6 @@ import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
 import org.springframework.beans.factory.xml.BeanDefinitionParser;
 import org.springframework.beans.factory.xml.ParserContext;
-import org.springframework.context.annotation.AnnotationConfigUtils;
 import org.springframework.util.StringUtils;
 
 /**
@@ -42,32 +41,8 @@ import org.springframework.util.StringUtils;
  */
 public class AnnotationDrivenBeanDefinitionParser implements BeanDefinitionParser {
 
-	/**
-	 * The bean name of the internally managed async annotation processor (mode="proxy").
-	 * @deprecated as of Spring 3.1 in favor of
-	 * {@link AnnotationConfigUtils#ASYNC_ANNOTATION_PROCESSOR_BEAN_NAME}
-	 */
-	@Deprecated
-	public static final String ASYNC_ANNOTATION_PROCESSOR_BEAN_NAME =
-			AnnotationConfigUtils.ASYNC_ANNOTATION_PROCESSOR_BEAN_NAME;
-
-	/**
-	 * The bean name of the internally managed transaction aspect (mode="aspectj").
-	 * @deprecated as of Spring 3.1 in favor of
-	 * {@link AnnotationConfigUtils#ASYNC_EXECUTION_ASPECT_BEAN_NAME}
-	 */
-	@Deprecated
-	public static final String ASYNC_EXECUTION_ASPECT_BEAN_NAME =
-			AnnotationConfigUtils.ASYNC_EXECUTION_ASPECT_BEAN_NAME;
-
-	/**
-	 * The bean name of the internally managed scheduled annotation processor.
-	 * @deprecated as of Spring 3.1 in favor of
-	 * {@link AnnotationConfigUtils#SCHEDULED_ANNOTATION_PROCESSOR_BEAN_NAME}
-	 */
-	@Deprecated
-	public static final String SCHEDULED_ANNOTATION_PROCESSOR_BEAN_NAME =
-			AnnotationConfigUtils.SCHEDULED_ANNOTATION_PROCESSOR_BEAN_NAME;
+	private static final String ASYNC_EXECUTION_ASPECT_CLASS_NAME =
+			"org.springframework.scheduling.aspectj.AnnotationAsyncExecutionAspect";
 
 
 	@Override
@@ -88,7 +63,7 @@ public class AnnotationDrivenBeanDefinitionParser implements BeanDefinitionParse
 		}
 		else {
 			// mode="proxy"
-			if (registry.containsBeanDefinition(AnnotationConfigUtils.ASYNC_ANNOTATION_PROCESSOR_BEAN_NAME)) {
+			if (registry.containsBeanDefinition(TaskManagementConfigUtils.ASYNC_ANNOTATION_PROCESSOR_BEAN_NAME)) {
 				parserContext.getReaderContext().error(
 						"Only one AsyncAnnotationBeanPostProcessor may exist within the context.", source);
 			}
@@ -107,11 +82,11 @@ public class AnnotationDrivenBeanDefinitionParser implements BeanDefinitionParse
 				if (Boolean.valueOf(element.getAttribute(AopNamespaceUtils.PROXY_TARGET_CLASS_ATTRIBUTE))) {
 					builder.addPropertyValue("proxyTargetClass", true);
 				}
-				registerPostProcessor(parserContext, builder, AnnotationConfigUtils.ASYNC_ANNOTATION_PROCESSOR_BEAN_NAME);
+				registerPostProcessor(parserContext, builder, TaskManagementConfigUtils.ASYNC_ANNOTATION_PROCESSOR_BEAN_NAME);
 			}
 		}
 
-		if (registry.containsBeanDefinition(AnnotationConfigUtils.SCHEDULED_ANNOTATION_PROCESSOR_BEAN_NAME)) {
+		if (registry.containsBeanDefinition(TaskManagementConfigUtils.SCHEDULED_ANNOTATION_PROCESSOR_BEAN_NAME)) {
 			parserContext.getReaderContext().error(
 					"Only one ScheduledAnnotationBeanPostProcessor may exist within the context.", source);
 		}
@@ -123,7 +98,7 @@ public class AnnotationDrivenBeanDefinitionParser implements BeanDefinitionParse
 			if (StringUtils.hasText(scheduler)) {
 				builder.addPropertyReference("scheduler", scheduler);
 			}
-			registerPostProcessor(parserContext, builder, AnnotationConfigUtils.SCHEDULED_ANNOTATION_PROCESSOR_BEAN_NAME);
+			registerPostProcessor(parserContext, builder, TaskManagementConfigUtils.SCHEDULED_ANNOTATION_PROCESSOR_BEAN_NAME);
 		}
 
 		// Finally register the composite component.
@@ -133,17 +108,15 @@ public class AnnotationDrivenBeanDefinitionParser implements BeanDefinitionParse
 	}
 
 	private void registerAsyncExecutionAspect(Element element, ParserContext parserContext) {
-		if (!parserContext.getRegistry().containsBeanDefinition(AnnotationConfigUtils.ASYNC_EXECUTION_ASPECT_BEAN_NAME)) {
-			BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(
-					AnnotationConfigUtils.ASYNC_EXECUTION_ASPECT_CLASS_NAME);
+		if (!parserContext.getRegistry().containsBeanDefinition(TaskManagementConfigUtils.ASYNC_EXECUTION_ASPECT_BEAN_NAME)) {
+			BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(ASYNC_EXECUTION_ASPECT_CLASS_NAME);
 			builder.setFactoryMethod("aspectOf");
 			String executor = element.getAttribute("executor");
 			if (StringUtils.hasText(executor)) {
 				builder.addPropertyReference("executor", executor);
 			}
-			parserContext.registerBeanComponent(
-					new BeanComponentDefinition(builder.getBeanDefinition(),
-							AnnotationConfigUtils.ASYNC_EXECUTION_ASPECT_BEAN_NAME));
+			parserContext.registerBeanComponent(new BeanComponentDefinition(builder.getBeanDefinition(),
+					TaskManagementConfigUtils.ASYNC_EXECUTION_ASPECT_BEAN_NAME));
 		}
 	}
 

spring-context/src/main/java/org/springframework/scheduling/config/TaskManagementConfigUtils.java

@@ -0,0 +1,45 @@
+/*
+ * Copyright 2002-2014 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.scheduling.config;
+
+/**
+ * Configuration constants for internal sharing across subpackages.
+ *
+ * @author Juergen Hoeller
+ * @since 4.1
+ */
+public class TaskManagementConfigUtils {
+
+	/**
+	 * The bean name of the internally managed Scheduled annotation processor.
+	 */
+	public static final String SCHEDULED_ANNOTATION_PROCESSOR_BEAN_NAME =
+			"org.springframework.context.annotation.internalScheduledAnnotationProcessor";
+
+	/**
+	 * The bean name of the internally managed Async annotation processor.
+	 */
+	public static final String ASYNC_ANNOTATION_PROCESSOR_BEAN_NAME =
+			"org.springframework.context.annotation.internalAsyncAnnotationProcessor";
+
+	/**
+	 * The bean name of the internally managed AspectJ async execution aspect.
+	 */
+	public static final String ASYNC_EXECUTION_ASPECT_BEAN_NAME =
+			"org.springframework.scheduling.config.internalAsyncExecutionAspect";
+
+}

spring-context/src/test/java/org/springframework/scheduling/config/AnnotationDrivenBeanDefinitionParserTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,17 +16,15 @@
 
 package org.springframework.scheduling.config;
 
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-
 import org.junit.Before;
 import org.junit.Test;
 
 import org.springframework.beans.DirectFieldAccessor;
 import org.springframework.context.ApplicationContext;
-import org.springframework.context.annotation.AnnotationConfigUtils;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
+import static org.junit.Assert.*;
+
 /**
  * @author Mark Fisher
  */
@@ -41,28 +39,28 @@ public class AnnotationDrivenBeanDefinitionParserTests {
 				"annotationDrivenContext.xml", AnnotationDrivenBeanDefinitionParserTests.class);
 	}
 
+
 	@Test
 	public void asyncPostProcessorRegistered() {
-		assertTrue(context.containsBean(AnnotationConfigUtils.ASYNC_ANNOTATION_PROCESSOR_BEAN_NAME));
+		assertTrue(context.containsBean(TaskManagementConfigUtils.ASYNC_ANNOTATION_PROCESSOR_BEAN_NAME));
 	}
 
 	@Test
 	public void scheduledPostProcessorRegistered() {
-		assertTrue(context.containsBean(
-				AnnotationConfigUtils.SCHEDULED_ANNOTATION_PROCESSOR_BEAN_NAME));
+		assertTrue(context.containsBean(TaskManagementConfigUtils.SCHEDULED_ANNOTATION_PROCESSOR_BEAN_NAME));
 	}
 
 	@Test
 	public void asyncPostProcessorExecutorReference() {
 		Object executor = context.getBean("testExecutor");
-		Object postProcessor = context.getBean(AnnotationConfigUtils.ASYNC_ANNOTATION_PROCESSOR_BEAN_NAME);
+		Object postProcessor = context.getBean(TaskManagementConfigUtils.ASYNC_ANNOTATION_PROCESSOR_BEAN_NAME);
 		assertSame(executor, new DirectFieldAccessor(postProcessor).getPropertyValue("executor"));
 	}
 
 	@Test
 	public void scheduledPostProcessorSchedulerReference() {
 		Object scheduler = context.getBean("testScheduler");
-		Object postProcessor = context.getBean(AnnotationConfigUtils.SCHEDULED_ANNOTATION_PROCESSOR_BEAN_NAME);
+		Object postProcessor = context.getBean(TaskManagementConfigUtils.SCHEDULED_ANNOTATION_PROCESSOR_BEAN_NAME);
 		assertSame(scheduler, new DirectFieldAccessor(postProcessor).getPropertyValue("scheduler"));
 	}
 

spring-jms/src/main/java/org/springframework/jms/annotation/JmsBootstrapConfiguration.java

@@ -17,10 +17,10 @@
 package org.springframework.jms.annotation;
 
 import org.springframework.beans.factory.config.BeanDefinition;
-import org.springframework.context.annotation.AnnotationConfigUtils;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Role;
+import org.springframework.jms.config.JmsListenerConfigUtils;
 import org.springframework.jms.config.JmsListenerEndpointRegistry;
 
 /**
@@ -40,13 +40,13 @@ import org.springframework.jms.config.JmsListenerEndpointRegistry;
 @Configuration
 public class JmsBootstrapConfiguration {
 
-	@Bean(name = AnnotationConfigUtils.JMS_LISTENER_ANNOTATION_PROCESSOR_BEAN_NAME)
+	@Bean(name = JmsListenerConfigUtils.JMS_LISTENER_ANNOTATION_PROCESSOR_BEAN_NAME)
 	@Role(BeanDefinition.ROLE_INFRASTRUCTURE)
 	public JmsListenerAnnotationBeanPostProcessor jmsListenerAnnotationProcessor() {
 		return new JmsListenerAnnotationBeanPostProcessor();
 	}
 
-	@Bean(name = AnnotationConfigUtils.JMS_LISTENER_ENDPOINT_REGISTRY_BEAN_NAME)
+	@Bean(name = JmsListenerConfigUtils.JMS_LISTENER_ENDPOINT_REGISTRY_BEAN_NAME)
 	public JmsListenerEndpointRegistry defaultJmsListenerEndpointRegistry() {
 		return new JmsListenerEndpointRegistry();
 	}

spring-jms/src/main/java/org/springframework/jms/annotation/JmsListenerAnnotationBeanPostProcessor.java

@@ -29,11 +29,11 @@ import org.springframework.beans.factory.ListableBeanFactory;
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 import org.springframework.beans.factory.SmartInitializingSingleton;
 import org.springframework.beans.factory.config.BeanPostProcessor;
-import org.springframework.context.annotation.AnnotationConfigUtils;
 import org.springframework.core.Ordered;
 import org.springframework.core.annotation.AnnotationUtils;
 import org.springframework.jms.config.DefaultJmsHandlerMethodFactory;
 import org.springframework.jms.config.JmsHandlerMethodFactory;
+import org.springframework.jms.config.JmsListenerConfigUtils;
 import org.springframework.jms.config.JmsListenerContainerFactory;
 import org.springframework.jms.config.JmsListenerEndpointRegistrar;
 import org.springframework.jms.config.JmsListenerEndpointRegistry;
@@ -153,7 +153,7 @@ public class JmsListenerAnnotationBeanPostProcessor
 			if (this.endpointRegistry == null) {
 				Assert.state(this.beanFactory != null, "BeanFactory must be set to find endpoint registry by bean name");
 				this.endpointRegistry = this.beanFactory.getBean(
-						AnnotationConfigUtils.JMS_LISTENER_ENDPOINT_REGISTRY_BEAN_NAME, JmsListenerEndpointRegistry.class);
+						JmsListenerConfigUtils.JMS_LISTENER_ENDPOINT_REGISTRY_BEAN_NAME, JmsListenerEndpointRegistry.class);
 			}
 			this.registrar.setEndpointRegistry(this.endpointRegistry);
 		}

spring-jms/src/main/java/org/springframework/jms/config/AnnotationDrivenJmsBeanDefinitionParser.java

@@ -26,7 +26,6 @@ import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
 import org.springframework.beans.factory.xml.BeanDefinitionParser;
 import org.springframework.beans.factory.xml.ParserContext;
-import org.springframework.context.annotation.AnnotationConfigUtils;
 import org.springframework.util.StringUtils;
 
 /**
@@ -48,7 +47,7 @@ class AnnotationDrivenJmsBeanDefinitionParser implements BeanDefinitionParser {
 		// Nest the concrete post-processor bean in the surrounding component.
 		BeanDefinitionRegistry registry = parserContext.getRegistry();
 
-		if (registry.containsBeanDefinition(AnnotationConfigUtils.JMS_LISTENER_ANNOTATION_PROCESSOR_BEAN_NAME)) {
+		if (registry.containsBeanDefinition(JmsListenerConfigUtils.JMS_LISTENER_ANNOTATION_PROCESSOR_BEAN_NAME)) {
 			parserContext.getReaderContext().error(
 					"Only one JmsListenerAnnotationBeanPostProcessor may exist within the context.", source);
 		}
@@ -75,7 +74,7 @@ class AnnotationDrivenJmsBeanDefinitionParser implements BeanDefinitionParser {
 			}
 
 			registerInfrastructureBean(parserContext, builder,
-					AnnotationConfigUtils.JMS_LISTENER_ANNOTATION_PROCESSOR_BEAN_NAME);
+					JmsListenerConfigUtils.JMS_LISTENER_ANNOTATION_PROCESSOR_BEAN_NAME);
 		}
 
 		// Finally register the composite component.
@@ -88,7 +87,7 @@ class AnnotationDrivenJmsBeanDefinitionParser implements BeanDefinitionParser {
 		BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(
 				"org.springframework.jms.config.JmsListenerEndpointRegistry");
 		builder.getRawBeanDefinition().setSource(source);
-		registerInfrastructureBean(parserContext, builder, AnnotationConfigUtils.JMS_LISTENER_ENDPOINT_REGISTRY_BEAN_NAME);
+		registerInfrastructureBean(parserContext, builder, JmsListenerConfigUtils.JMS_LISTENER_ENDPOINT_REGISTRY_BEAN_NAME);
 	}
 
 	private static void registerInfrastructureBean(

spring-jms/src/main/java/org/springframework/jms/config/JmsListenerConfigUtils.java

@@ -0,0 +1,39 @@
+/*
+ * Copyright 2002-2014 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.jms.config;
+
+/**
+ * Configuration constants for internal sharing across subpackages.
+ *
+ * @author Juergen Hoeller
+ * @since 4.1
+ */
+public abstract class JmsListenerConfigUtils {
+
+	/**
+	 * The bean name of the internally managed JMS listener annotation processor.
+	 */
+	public static final String JMS_LISTENER_ANNOTATION_PROCESSOR_BEAN_NAME =
+			"org.springframework.jms.config.internalJmsListenerAnnotationProcessor";
+
+	/**
+	 * The bean name of the internally managed JMS listener endpoint registry.
+	 */
+	public static final String JMS_LISTENER_ENDPOINT_REGISTRY_BEAN_NAME =
+			"org.springframework.jms.config.internalJmsListenerEndpointRegistry";
+
+}

spring-tx/src/main/java/org/springframework/transaction/config/TransactionManagementConfigUtils.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,6 +17,8 @@
 package org.springframework.transaction.config;
 
 /**
+ * Configuration constants for internal sharing across subpackages.
+ *
  * @author Chris Beams
  * @since 3.1
  */