Browse Source

Move context initializers into subpackage

pull/1/head
Dave Syer 13 years ago
parent
commit
c4028656ef
  1. 2
      spring-bootstrap/src/main/java/org/springframework/bootstrap/context/initializer/ConfigFileApplicationContextInitializer.java
  2. 2
      spring-bootstrap/src/main/java/org/springframework/bootstrap/context/initializer/EnvironmentDelegateApplicationContextInitializer.java
  3. 4
      spring-bootstrap/src/main/resources/META-INF/spring.factories
  4. 3
      spring-bootstrap/src/test/java/org/springframework/bootstrap/context/initializer/ConfigFileApplicationContextInitializerTests.java
  5. 3
      spring-bootstrap/src/test/java/org/springframework/bootstrap/context/initializer/EnvironmentDelegateApplicationContextInitializerTest.java

2
spring-bootstrap/src/main/java/org/springframework/bootstrap/ConfigFileApplicationContextInitializer.java → spring-bootstrap/src/main/java/org/springframework/bootstrap/context/initializer/ConfigFileApplicationContextInitializer.java

@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.bootstrap;
package org.springframework.bootstrap.context.initializer;
import java.io.IOException;
import java.util.ArrayList;

2
spring-bootstrap/src/main/java/org/springframework/bootstrap/EnvironmentDelegateApplicationContextInitializer.java → spring-bootstrap/src/main/java/org/springframework/bootstrap/context/initializer/EnvironmentDelegateApplicationContextInitializer.java

@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.bootstrap;
package org.springframework.bootstrap.context.initializer;
import java.util.ArrayList;
import java.util.Collections;

4
spring-bootstrap/src/main/resources/META-INF/spring.factories

@ -8,5 +8,5 @@ org.springframework.bootstrap.autoconfigure.web.EmbeddedJettyAutoConfiguration,\ @@ -8,5 +8,5 @@ org.springframework.bootstrap.autoconfigure.web.EmbeddedJettyAutoConfiguration,\
org.springframework.bootstrap.autoconfigure.web.EmbeddedTomcatAutoConfiguration,\
org.springframework.bootstrap.autoconfigure.web.WebMvcAutoConfiguration
org.springframework.context.ApplicationContextInitializer=\
org.springframework.bootstrap.ConfigFileApplicationContextInitializer,\
org.springframework.bootstrap.EnvironmentDelegateApplicationContextInitializer
org.springframework.bootstrap.context.initializer.ConfigFileApplicationContextInitializer,\
org.springframework.bootstrap.context.initializer.EnvironmentDelegateApplicationContextInitializer

3
spring-bootstrap/src/test/java/org/springframework/bootstrap/ConfigFileApplicationContextInitializerTests.java → spring-bootstrap/src/test/java/org/springframework/bootstrap/context/initializer/ConfigFileApplicationContextInitializerTests.java

@ -14,12 +14,13 @@ @@ -14,12 +14,13 @@
* limitations under the License.
*/
package org.springframework.bootstrap;
package org.springframework.bootstrap.context.initializer;
import java.util.HashMap;
import java.util.Map;
import org.junit.Test;
import org.springframework.bootstrap.context.initializer.ConfigFileApplicationContextInitializer;
import org.springframework.context.support.StaticApplicationContext;
import org.springframework.core.env.MapPropertySource;
import org.springframework.core.env.SimpleCommandLinePropertySource;

3
spring-bootstrap/src/test/java/org/springframework/bootstrap/EnvironmentDelegateApplicationContextInitializerTest.java → spring-bootstrap/src/test/java/org/springframework/bootstrap/context/initializer/EnvironmentDelegateApplicationContextInitializerTest.java

@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.bootstrap;
package org.springframework.bootstrap.context.initializer;
import java.util.HashMap;
import java.util.Map;
@ -21,6 +21,7 @@ import java.util.Map; @@ -21,6 +21,7 @@ import java.util.Map;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
import org.springframework.bootstrap.context.initializer.EnvironmentDelegateApplicationContextInitializer;
import org.springframework.context.ApplicationContextException;
import org.springframework.context.ApplicationContextInitializer;
import org.springframework.context.ConfigurableApplicationContext;
Loading…
Cancel
Save