+ Further repackaging and consolidation

+ Tested compatibility with @Value (works, but noticed and filed an unrelated-to-javaconfig improvement. See SPR-5530)

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

@@ -5,7 +5,8 @@ import static org.junit.Assert.*;
 
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.config.java.annotation.Configuration;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.config.java.Configuration;
 import org.springframework.config.java.ext.Bean;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
@@ -36,4 +37,26 @@ public class AutowiredConfigurationTests {
 		public @Bean Colour colour() { return Colour.RED; }
 	}
 	
+	
+	
+	public @Test void testValueInjection() {
+		System.setProperty("myProp", "foo");
+		
+		ClassPathXmlApplicationContext factory = new ClassPathXmlApplicationContext(
+				"ValueInjectionTests.xml", AutowiredConfigurationTests.class);
+		
+		TestBean testBean = factory.getBean("testBean", TestBean.class);
+		assertThat(testBean.getName(), equalTo("foo"));
+	}
+	
+	@Configuration
+	static class ValueConfig {
+		
+		@Value("#{systemProperties.myProp}") 
+		private String name = "default";
+		
+		public @Bean TestBean testBean() {
+			return new TestBean(name);
+		}
+	}
 }

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

@@ -9,7 +9,7 @@ import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
-import org.springframework.config.java.annotation.Configuration;
+import org.springframework.config.java.Configuration;
 import org.springframework.config.java.ext.Bean;
 import org.springframework.config.java.process.ConfigurationPostProcessor;
 import org.springframework.config.java.util.DefaultScopes;

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

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd"
+	xmlns:context="http://www.springframework.org/schema/context">
+
+	<context:annotation-config/>
+	
+	<bean class="org.springframework.config.java.process.ConfigurationPostProcessor"/>
+	
+	<bean class="test.basic.AutowiredConfigurationTests$ValueConfig"/>
+</beans>