+ Renamed Scopes -> StandardScopes

+ Renamed ConfigurationPostProcessor -> ConfigurationClassPostProcessor
+ JavaDoc and polish for AbstractConfigurationClassProcessor

org.springframework.config.java/src/test/java/org/springframework/config/java/support/ConfigurationPostProcessorTests.java

@@ -14,17 +14,17 @@ import org.springframework.config.java.ext.Bean;
 import org.springframework.util.ClassUtils;
 
 /**
- * Unit tests for {@link ConfigurationPostProcessor}
+ * Unit tests for {@link ConfigurationClassPostProcessor}
  *
  * @author Chris Beams
  */
 public class ConfigurationPostProcessorTests {
 
-	private static final String ORIG_CGLIB_TEST_CLASS = ConfigurationPostProcessor.CGLIB_TEST_CLASS;
+	private static final String ORIG_CGLIB_TEST_CLASS = ConfigurationClassPostProcessor.CGLIB_TEST_CLASS;
 	private static final String BOGUS_CGLIB_TEST_CLASS = "a.bogus.class";
 
 	/**
-	 * CGLIB is an optional dependency for Core Spring.  If users attempt
+	 * CGLIB is an optional dependency for Spring.  If users attempt
 	 * to use {@link Configuration} classes, they'll need it on the classpath;
 	 * if Configuration classes are present in the bean factory and CGLIB
 	 * is not present, an instructive exception should be thrown.
@@ -39,17 +39,17 @@ public class ConfigurationPostProcessorTests {
 
 		factory.registerBeanDefinition("config1", rootBeanDefinition(Config.class).getBeanDefinition());
 
-		ConfigurationPostProcessor cpp = new ConfigurationPostProcessor();
+		ConfigurationClassPostProcessor cpp = new ConfigurationClassPostProcessor();
 
 		// temporarily set the cglib test class to something bogus
-		ConfigurationPostProcessor.CGLIB_TEST_CLASS = BOGUS_CGLIB_TEST_CLASS;
+		ConfigurationClassPostProcessor.CGLIB_TEST_CLASS = BOGUS_CGLIB_TEST_CLASS;
 
 		try {
 			cpp.postProcessBeanFactory(factory);
 		} catch (RuntimeException ex) {
 			assertTrue(ex.getMessage().contains("CGLIB is required to process @Configuration classes"));
 		} finally {
-			ConfigurationPostProcessor.CGLIB_TEST_CLASS = ORIG_CGLIB_TEST_CLASS;
+			ConfigurationClassPostProcessor.CGLIB_TEST_CLASS = ORIG_CGLIB_TEST_CLASS;
 		}
 	}
 
@@ -59,7 +59,7 @@ public class ConfigurationPostProcessorTests {
 	 * of {@link Configuration} classes.
 	 * 
 	 * This test will fail if any CGLIB classes are classloaded before the call
-	 * to {@link ConfigurationPostProcessor#enhanceConfigurationClasses}
+	 * to {@link ConfigurationClassPostProcessor#enhanceConfigurationClasses}
 	 */
 	@Test
 	public void testCglibClassesAreLoadedJustInTimeForEnhancement() throws Exception {
@@ -93,7 +93,7 @@ public class ConfigurationPostProcessorTests {
 	 * Enhanced {@link Configuration} classes are only necessary for respecting
 	 * certain bean semantics, like singleton-scoping, scoped proxies, etc.
 	 * 
-	 * Technically, {@link ConfigurationPostProcessor} could fail to enhance the
+	 * Technically, {@link ConfigurationClassPostProcessor} could fail to enhance the
 	 * registered Configuration classes, and many use cases would still work.
 	 * Certain cases, however, like inter-bean singleton references would not.
 	 * We test for such a case below, and in doing so prove that enhancement is
@@ -104,7 +104,7 @@ public class ConfigurationPostProcessorTests {
 		DefaultListableBeanFactory beanFactory = new  DefaultListableBeanFactory();
 		beanFactory.registerBeanDefinition("config",
 				rootBeanDefinition(SingletonBeanConfig.class).getBeanDefinition());
-		new ConfigurationPostProcessor().postProcessBeanFactory(beanFactory);
+		new ConfigurationClassPostProcessor().postProcessBeanFactory(beanFactory);
 		Foo foo = (Foo) beanFactory.getBean("foo");
 		Bar bar = (Bar) beanFactory.getBean("bar");
 		assertThat(foo, sameInstance(bar.foo));

org.springframework.config.java/src/test/java/test/basic/AutowiredConfigurationTests.xml

@@ -7,7 +7,7 @@
 
 	<context:annotation-config/>
 	
-	<bean class="org.springframework.config.java.support.ConfigurationPostProcessor"/>
+	<bean class="org.springframework.config.java.support.ConfigurationClassPostProcessor"/>
 	
 	<bean class="test.basic.AutowiredConfigurationTests$AutowiredConfig"/>
 	<bean class="test.basic.AutowiredConfigurationTests$ColorConfig"/>

org.springframework.config.java/src/test/java/test/basic/BasicTests.java

@@ -11,9 +11,9 @@ import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.config.java.Configuration;
 import org.springframework.config.java.MalformedConfigurationException;
-import org.springframework.config.java.Scopes;
+import org.springframework.config.java.StandardScopes;
 import org.springframework.config.java.ext.Bean;
-import org.springframework.config.java.support.ConfigurationPostProcessor;
+import org.springframework.config.java.support.ConfigurationClassPostProcessor;
 
 import test.beans.ITestBean;
 import test.beans.TestBean;
@@ -24,7 +24,7 @@ public class BasicTests {
 	/**
 	 * Creates a new {@link BeanFactory}, populates it with a {@link BeanDefinition} for
 	 * each of the given {@link Configuration} <var>configClasses</var>, and then
-	 * post-processes the factory using JavaConfig's {@link ConfigurationPostProcessor}.
+	 * post-processes the factory using JavaConfig's {@link ConfigurationClassPostProcessor}.
 	 * When complete, the factory is ready to service requests for any {@link Bean} methods
 	 * declared by <var>configClasses</var>.
 	 * 
@@ -42,7 +42,7 @@ public class BasicTests {
 			        .getBeanDefinition());
 		}
 
-		new ConfigurationPostProcessor().postProcessBeanFactory(factory);
+		new ConfigurationClassPostProcessor().postProcessBeanFactory(factory);
 
 		factory.addBeanPostProcessor(new AutowiredAnnotationBeanPostProcessor());
 
@@ -96,7 +96,7 @@ public class BasicTests {
 			return bar;
 		}
 
-		@Bean(scope = Scopes.PROTOTYPE)
+		@Bean(scope = StandardScopes.PROTOTYPE)
 		public TestBean baz() {
 			return new TestBean("bar");
 		}

org.springframework.config.java/src/test/java/test/basic/ValueInjectionTests.xml

@@ -7,7 +7,7 @@
 
 	<context:annotation-config/>
 	
-	<bean class="org.springframework.config.java.support.ConfigurationPostProcessor"/>
+	<bean class="org.springframework.config.java.support.ConfigurationClassPostProcessor"/>
 	
 	<bean class="test.basic.AutowiredConfigurationTests$ValueConfig"/>