[bs-92] Add simple main wrapper for SpringApplication

* Added Spring class
* Used in demo project in README
* Also fixed cycle in spring-bootstrap jar

[Fixes #49121565]

spring-bootstrap/src/test/java/org/springframework/bootstrap/SpringApplicationTests.java

@@ -26,7 +26,6 @@ import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
 import org.springframework.beans.factory.support.BeanNameGenerator;
 import org.springframework.beans.factory.support.DefaultBeanNameGenerator;
-import org.springframework.bootstrap.SpringApplication.AutoMain;
 import org.springframework.bootstrap.context.embedded.AnnotationConfigEmbeddedWebApplicationContext;
 import org.springframework.bootstrap.context.embedded.jetty.JettyEmbeddedServletContainerFactory;
 import org.springframework.context.ApplicationContext;
@@ -153,15 +152,6 @@ public class SpringApplicationTests {
 		assertThat(getEnvironment().getProperty("foo"), equalTo("bar"));
 	}
 
-	@Test
-	public void emptytApplicationContext() throws Exception {
-		// This is the class that will be used for main()
-		SpringApplication application = new SpringApplication(AutoMain.class);
-		this.context = application.run();
-		assertThat(this.context,
-				instanceOf(AnnotationConfigEmbeddedWebApplicationContext.class));
-	}
-
 	@Test
 	public void defaultApplicationContext() throws Exception {
 		SpringApplication application = new SpringApplication(ExampleConfig.class);

spring-bootstrap/src/test/java/org/springframework/bootstrap/main/SimpleMainTests.java

@@ -0,0 +1,61 @@
+/*
+ * Copyright 2012-2013 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.bootstrap.main;
+
+import org.junit.After;
+import org.junit.Test;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.util.ClassUtils;
+
+import static org.junit.Assert.assertNotNull;
+
+/**
+ * @author Dave Syer
+ * 
+ */
+public class SimpleMainTests {
+
+	private ApplicationContext context;
+
+	@After
+	public void close() {
+		if (this.context instanceof ConfigurableApplicationContext) {
+			((ConfigurableApplicationContext) this.context).close();
+		}
+	}
+
+	@Test
+	public void emptyApplicationContext() throws Exception {
+		Spring.main(new String[0]);
+		this.context = Spring.getApplicationContext();
+		assertNotNull(this.context);
+	}
+
+	@Test
+	public void basePackageScan() throws Exception {
+		Spring.main(new String[] { ClassUtils.getPackageName(Spring.class) });
+		this.context = Spring.getApplicationContext();
+		assertNotNull(this.context);
+	}
+
+	@Test
+	public void xmlContext() throws Exception {
+		Spring.main(new String[] { Spring.class.getName(),
+				"org/springframework/bootstrap/sample-beans.xml" });
+	}
+
+}