root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Change package names zero->boot 

* actuator -> boot-ops
* cli -> boot-cli
* launcher -> boot-load
* autoconfig -> boot-config
* bootstrap -> boot-strap
* starters -> boot-up

[#54095231] [bs-253] Refactor Zero->Boot
This commit is contained in:
Dave Syer 2013-07-26 11:50:02 +01:00
parent b2873fbc2d
commit 2098e23fca
609 changed files with 1686 additions and 1626 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
README.md
View File

@ -43,7 +43,7 @@ or above.
An `alias` can be used for the Spring Zero command line tool: An `alias` can be used for the Spring Zero command line tool:
$ alias spring="java -jar ~/.m2/repository/org/springframework/zero/spring-cli/0.5.0.BUILD-SNAPSHOT/spring-cli-0.5.0.BUILD-SNAPSHOT.jar" $ alias spring="java -jar ~/.m2/repository/org/springframework/boot/spring-cli/0.5.0.BUILD-SNAPSHOT/spring-cli-0.5.0.BUILD-SNAPSHOT.jar"
_Also see [docs/CONTRIBUTING](docs/CONTRIBUTING.md) if you want to submit pull requests._ _Also see [docs/CONTRIBUTING](docs/CONTRIBUTING.md) if you want to submit pull requests._
@ -167,22 +167,22 @@ Groovy samples for use with the command line application are available in
[spring-cli/samples](spring-cli/samples/#). To run the CLI samples type [spring-cli/samples](spring-cli/samples/#). To run the CLI samples type
`spring run <sample>.groovy` from samples directory. `spring run <sample>.groovy` from samples directory.
Java samples are available in [spring-zero-sample](spring-zero-samples/#) and should Java samples are available in [spring-boot-sample](spring-boot-samples/#) and should
be build with maven and run use `java -jar target/<sample>.jar`. The following java be build with maven and run use `java -jar target/<sample>.jar`. The following java
samples are provided: samples are provided:
* spring-zero-sample-simple - A simple command line application * spring-boot-sample-simple - A simple command line application
* spring-zero-sample-tomcat - Embedded Tomcat * spring-boot-sample-tomcat - Embedded Tomcat
* spring-zero-sample-jetty - Embedded Jetty * spring-boot-sample-jetty - Embedded Jetty
* spring-zero-sample-actuator - Simple REST service with production features * spring-boot-sample-actuator - Simple REST service with production features
* spring-zero-sample-actuator-ui - A web UI example with production features * spring-boot-sample-actuator-ui - A web UI example with production features
* spring-zero-sample-web-ui - A thymeleaf web application * spring-boot-sample-web-ui - A thymeleaf web application
* spring-sample-batch - Define and run a Batch job in a few lines of code * spring-sample-batch - Define and run a Batch job in a few lines of code
* spring-sample-data-jpa - Spring Data JPA + Hibernate + HSQLDB * spring-sample-data-jpa - Spring Data JPA + Hibernate + HSQLDB
* spring-zero-sample-integration - A spring integration application * spring-boot-sample-integration - A spring integration application
* spring-zero-sample-profile - example showing Spring's `@profile` support * spring-boot-sample-profile - example showing Spring's `@profile` support
* spring-zero-sample-traditional - shows Spring Zero with more traditional WAR packaging * spring-boot-sample-traditional - shows Spring Zero with more traditional WAR packaging
(but also executable using `java -jar`) (but also executable using `java -jar`)
* spring-zero-sample-xml - Example show how Spring Zero can be mixed with trditional XML * spring-boot-sample-xml - Example show how Spring Zero can be mixed with trditional XML
configuration configuration

2
docs/CONTRIBUTING.md
View File

@ -45,7 +45,7 @@ changes just won't be automatically formatted._
With the requisite eclipse plugins installed you can select With the requisite eclipse plugins installed you can select
`import existing maven projects` from the `file` menu to import the code. You will `import existing maven projects` from the `file` menu to import the code. You will
need to import the root `spring-zero` pom and the `spring-zero-samples` pom separately. need to import the root `spring-boot` pom and the `spring-boot-samples` pom separately.
### Importing into eclipse without m2eclipse ### Importing into eclipse without m2eclipse

28
pom.xml
View File

@ -2,8 +2,8 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.zero</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-zero</artifactId> <artifactId>spring-boot</artifactId>
<version>0.5.0.BUILD-SNAPSHOT</version> <version>0.5.0.BUILD-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<prerequisites> <prerequisites>
@ -25,9 +25,9 @@
<reactor.version>1.0.0.M1</reactor.version> <reactor.version>1.0.0.M1</reactor.version>
</properties> </properties>
<scm> <scm>
<url>http://github.com/SpringSource/spring-bootstrap</url> <url>http://github.com/SpringSource/spring-boot</url>
<connection>scm:git:git://github.com/SpringSource/spring-bootstrap.git</connection> <connection>scm:git:git://github.com/SpringSource/spring-boot.git</connection>
<developerConnection>scm:git:ssh://git@github.com/SpringSource/spring-bootstrap.git</developerConnection> <developerConnection>scm:git:ssh://git@github.com/SpringSource/spring-boot.git</developerConnection>
</scm> </scm>
<developers> <developers>
<developer> <developer>
@ -37,14 +37,14 @@
</developer> </developer>
</developers> </developers>
<modules> <modules>
<module>spring-bootstrap</module> <module>spring-boot-strap</module>
<module>spring-autoconfigure</module> <module>spring-boot-config</module>
<module>spring-starters</module> <module>spring-boot-ops</module>
<module>spring-actuator</module> <module>spring-boot-load</module>
<module>spring-launcher</module> <module>spring-boot-maven-plugin</module>
<module>spring-package-maven-plugin</module> <module>spring-boot-ups</module>
<module>spring-cli</module> <module>spring-boot-cli</module>
<module>spring-zero-integration-tests</module> <module>spring-boot-integration-tests</module>
</modules> </modules>
<build> <build>
<pluginManagement> <pluginManagement>
@ -663,7 +663,7 @@
<downloadUrl>http://www.springsource.com/download/community</downloadUrl> <downloadUrl>http://www.springsource.com/download/community</downloadUrl>
<site> <site>
<id>spring-docs</id> <id>spring-docs</id>
<url>scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-bootstrap/docs/${project.version}</url> <url>scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-boot/docs/${project.version}</url>
</site> </site>
<repository> <repository>
<id>spring-repo-release</id> <id>spring-repo-release</id>

11
spring-actuator/src/main/resources/META-INF/spring.factories
View File

@ -1,11 +0,0 @@
org.springframework.autoconfigure.EnableAutoConfiguration=\
org.springframework.actuate.autoconfigure.AuditAutoConfiguration,\
org.springframework.actuate.autoconfigure.EndpointAutoConfiguration,\
org.springframework.actuate.autoconfigure.EndpointWebMvcAutoConfiguration,\
org.springframework.actuate.autoconfigure.ErrorMvcAutoConfiguration,\
org.springframework.actuate.autoconfigure.ManagementServerPropertiesAutoConfiguration,\
org.springframework.actuate.autoconfigure.MetricFilterAutoConfiguration,\
org.springframework.actuate.autoconfigure.MetricRepositoryAutoConfiguration,\
org.springframework.actuate.autoconfigure.SecurityAutoConfiguration,\
org.springframework.actuate.autoconfigure.TraceRepositoryAutoConfiguration,\
org.springframework.actuate.autoconfigure.TraceWebFilterAutoConfiguration

15
spring-autoconfigure/src/main/resources/META-INF/spring.factories
View File

@ -1,15 +0,0 @@
# Auto Configure
org.springframework.autoconfigure.EnableAutoConfiguration=\
org.springframework.autoconfigure.MessageSourceAutoConfiguration,\
org.springframework.autoconfigure.PropertyPlaceholderAutoConfiguration,\
org.springframework.autoconfigure.batch.BatchAutoConfiguration,\
org.springframework.autoconfigure.data.JpaRepositoriesAutoConfiguration,\
org.springframework.autoconfigure.jdbc.DataSourceAutoConfiguration,\
org.springframework.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration,\
org.springframework.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration,\
org.springframework.autoconfigure.reactor.ReactorAutoConfiguration,\
org.springframework.autoconfigure.thymeleaf.ThymeleafAutoConfiguration,\
org.springframework.autoconfigure.web.EmbeddedServletContainerAutoConfiguration,\
org.springframework.autoconfigure.web.ServerPropertiesAutoConfiguration,\
org.springframework.autoconfigure.web.MultipartAutoConfiguration,\
org.springframework.autoconfigure.web.WebMvcAutoConfiguration

0
spring-cli/README.md → spring-boot-cli/README.md
View File

8
spring-cli/pom.xml → spring-boot-cli/pom.xml
View File

@ -3,15 +3,15 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>org.springframework.zero</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-zero</artifactId> <artifactId>spring-boot</artifactId>
<version>0.5.0.BUILD-SNAPSHOT</version> <version>0.5.0.BUILD-SNAPSHOT</version>
</parent> </parent>
<artifactId>spring-cli</artifactId> <artifactId>spring-boot-cli</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<properties> <properties>
<main.basedir>${basedir}/..</main.basedir> <main.basedir>${basedir}/..</main.basedir>
<start-class>org.springframework.cli.SpringCli</start-class> <start-class>org.springframework.boot.cli.SpringCli</start-class>
</properties> </properties>
<dependencies> <dependencies>
<!-- Compile --> <!-- Compile -->

0
spring-cli/samples/app.groovy → spring-boot-cli/samples/app.groovy
View File

0
spring-cli/samples/integration.groovy → spring-boot-cli/samples/integration.groovy
View File

0
spring-cli/samples/job.groovy → spring-boot-cli/samples/job.groovy
View File

2
spring-cli/samples/actuator.groovy → spring-boot-cli/samples/ops.groovy
View File

@ -1,6 +1,6 @@
package org.test package org.test
@Grab("org.springframework.zero:spring-actuator:0.5.0.BUILD-SNAPSHOT") @Grab("org.springframework.boot:spring-boot-up-ops:0.5.0.BUILD-SNAPSHOT")
@Controller @Controller
class SampleController { class SampleController {

0
spring-cli/samples/reactor.groovy → spring-boot-cli/samples/reactor.groovy
View File

0
spring-cli/samples/runner.groovy → spring-boot-cli/samples/runner.groovy
View File

0
spring-cli/samples/runner.xml → spring-boot-cli/samples/runner.xml
View File

2
spring-cli/samples/template.groovy → spring-boot-cli/samples/template.groovy
View File

@ -1,6 +1,6 @@
package org.test package org.test
import static org.springframework.cli.template.GroovyTemplate.template; import static org.springframework.boot.cli.template.GroovyTemplate.template;
@Component @Component
class Example implements CommandLineRunner { class Example implements CommandLineRunner {

0
spring-cli/samples/ui.groovy → spring-boot-cli/samples/ui.groovy
View File

0
spring-cli/samples/web.groovy → spring-boot-cli/samples/web.groovy
View File

2
spring-cli/src/main/assembly/descriptor.xml → spring-boot-cli/src/main/assembly/descriptor.xml
View File

@ -23,7 +23,7 @@
<dependencySets> <dependencySets>
<dependencySet> <dependencySet>
<includes> <includes>
<include>org.springframework.zero:spring-cli:jar:*</include> <include>org.springframework.boot:spring-cli:jar:*</include>
</includes> </includes>
<outputDirectory>lib</outputDirectory> <outputDirectory>lib</outputDirectory>
</dependencySet> </dependencySet>

2
spring-cli/src/main/java/org/springframework/cli/Command.java → spring-boot-cli/src/main/java/org/springframework/boot/cli/Command.java
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.cli; package org.springframework.boot.cli;
/** /**
* A single command that can be run from the CLI. * A single command that can be run from the CLI.

2
spring-cli/src/main/java/org/springframework/cli/CommandFactory.java → spring-boot-cli/src/main/java/org/springframework/boot/cli/CommandFactory.java
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.cli; package org.springframework.boot.cli;
import java.util.Collection; import java.util.Collection;
import java.util.ServiceLoader; import java.util.ServiceLoader;

2
spring-cli/src/main/java/org/springframework/cli/Log.java → spring-boot-cli/src/main/java/org/springframework/boot/cli/Log.java
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.cli; package org.springframework.boot.cli;
/** /**
* Simple logger used by the CLI. * Simple logger used by the CLI.

2
spring-cli/src/main/java/org/springframework/cli/NoSuchCommandException.java → spring-boot-cli/src/main/java/org/springframework/boot/cli/NoSuchCommandException.java
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.cli; package org.springframework.boot.cli;
/** /**
* Exception thrown when an unknown command is specified. * Exception thrown when an unknown command is specified.

4
spring-cli/src/main/java/org/springframework/cli/SpringCli.java → spring-boot-cli/src/main/java/org/springframework/boot/cli/SpringCli.java
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.cli; package org.springframework.boot.cli;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
@ -76,7 +76,7 @@ public class SpringCli {
/** /**
* Run the CLI and handle and errors. * Run the CLI and handle and errors.
* @param args the input arguments * @param args the input arguments
* @return a return status code (non zero is used to indicate an error) * @return a return status code (non boot is used to indicate an error)
*/ */
public int runAndHandleErrors(String... args) { public int runAndHandleErrors(String... args) {
String[] argsWithoutDebugFlags = removeDebugFlags(args); String[] argsWithoutDebugFlags = removeDebugFlags(args);

2
spring-cli/src/main/java/org/springframework/cli/SpringCliException.java → spring-boot-cli/src/main/java/org/springframework/boot/cli/SpringCliException.java
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.cli; package org.springframework.boot.cli;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections; import java.util.Collections;

4
spring-cli/src/main/java/org/springframework/cli/command/AbstractCommand.java → spring-boot-cli/src/main/java/org/springframework/boot/cli/command/AbstractCommand.java
View File

@ -14,9 +14,9 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.cli.command; package org.springframework.boot.cli.command;
import org.springframework.cli.Command; import org.springframework.boot.cli.Command;
/** /**
* Abstract {@link Command} implementation. * Abstract {@link Command} implementation.

12
spring-cli/src/main/java/org/springframework/cli/command/CleanCommand.java → spring-boot-cli/src/main/java/org/springframework/boot/cli/command/CleanCommand.java
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.cli.command; package org.springframework.boot.cli.command;
import java.io.File; import java.io.File;
import java.util.ArrayList; import java.util.ArrayList;
@ -24,8 +24,8 @@ import joptsimple.OptionSet;
import joptsimple.OptionSpec; import joptsimple.OptionSpec;
import org.apache.ivy.util.FileUtil; import org.apache.ivy.util.FileUtil;
import org.springframework.cli.Command; import org.springframework.boot.cli.Command;
import org.springframework.cli.Log; import org.springframework.boot.cli.Log;
/** /**
* {@link Command} to 'clean' up grapes, removing cached dependencies and forcing a * {@link Command} to 'clean' up grapes, removing cached dependencies and forcing a
@ -80,8 +80,8 @@ public class CleanCommand extends OptionParsingCommand {
return; return;
} }
ArrayList<Object> specs = new ArrayList<Object>(options.nonOptionArguments()); ArrayList<Object> specs = new ArrayList<Object>(options.nonOptionArguments());
if (!specs.contains("org.springframework.zero") && layout == Layout.IVY) { if (!specs.contains("org.springframework.boot") && layout == Layout.IVY) {
specs.add(0, "org.springframework.zero"); specs.add(0, "org.springframework.boot");
} }
for (Object spec : specs) { for (Object spec : specs) {
if (spec instanceof String) { if (spec instanceof String) {
@ -103,7 +103,7 @@ public class CleanCommand extends OptionParsingCommand {
return; return;
} }
if (options.has(this.allOption) || group.equals("org.springframework.zero")) { if (options.has(this.allOption) || group.equals("org.springframework.boot")) {
delete(file); delete(file);
return; return;
} }

4
spring-cli/src/main/java/org/springframework/cli/command/CreateCommand.java → spring-boot-cli/src/main/java/org/springframework/boot/cli/command/CreateCommand.java
View File

@ -14,11 +14,11 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.cli.command; package org.springframework.boot.cli.command;
import joptsimple.OptionSet; import joptsimple.OptionSet;
import org.springframework.cli.Command; import org.springframework.boot.cli.Command;
import static java.util.Arrays.asList; import static java.util.Arrays.asList;

6
spring-cli/src/main/java/org/springframework/cli/command/DefaultCommandFactory.java → spring-boot-cli/src/main/java/org/springframework/boot/cli/command/DefaultCommandFactory.java
View File

@ -14,14 +14,14 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.cli.command; package org.springframework.boot.cli.command;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.List;
import org.springframework.cli.Command; import org.springframework.boot.cli.Command;
import org.springframework.cli.CommandFactory; import org.springframework.boot.cli.CommandFactory;
/** /**
* Default implementation of {@link CommandFactory}. * Default implementation of {@link CommandFactory}.

2
spring-cli/src/main/java/org/springframework/cli/command/OptionHandler.java → spring-boot-cli/src/main/java/org/springframework/boot/cli/command/OptionHandler.java
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.cli.command; package org.springframework.boot.cli.command;
import groovy.lang.Closure; import groovy.lang.Closure;

4
spring-cli/src/main/java/org/springframework/cli/command/OptionParsingCommand.java → spring-boot-cli/src/main/java/org/springframework/boot/cli/command/OptionParsingCommand.java
View File

@ -14,9 +14,9 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.cli.command; package org.springframework.boot.cli.command;
import org.springframework.cli.Command; import org.springframework.boot.cli.Command;
/** /**
* Base class for a {@link Command} that pare options using an {@link OptionHandler}. * Base class for a {@link Command} that pare options using an {@link OptionHandler}.

8
spring-cli/src/main/java/org/springframework/cli/command/RunCommand.java → spring-boot-cli/src/main/java/org/springframework/boot/cli/command/RunCommand.java
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.cli.command; package org.springframework.boot.cli.command;
import java.awt.Desktop; import java.awt.Desktop;
import java.io.File; import java.io.File;
@ -25,9 +25,9 @@ import java.util.logging.Level;
import joptsimple.OptionSet; import joptsimple.OptionSet;
import joptsimple.OptionSpec; import joptsimple.OptionSpec;
import org.springframework.cli.Command; import org.springframework.boot.cli.Command;
import org.springframework.cli.runner.SpringApplicationRunner; import org.springframework.boot.cli.runner.SpringApplicationRunner;
import org.springframework.cli.runner.SpringApplicationRunnerConfiguration; import org.springframework.boot.cli.runner.SpringApplicationRunnerConfiguration;
import static java.util.Arrays.asList; import static java.util.Arrays.asList;

8
spring-cli/src/main/java/org/springframework/cli/command/ScriptCommand.java → spring-boot-cli/src/main/java/org/springframework/boot/cli/command/ScriptCommand.java
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.cli.command; package org.springframework.boot.cli.command;
import groovy.lang.Closure; import groovy.lang.Closure;
import groovy.lang.GroovyObjectSupport; import groovy.lang.GroovyObjectSupport;
@ -30,9 +30,9 @@ import joptsimple.OptionParser;
import org.apache.ivy.util.FileUtil; import org.apache.ivy.util.FileUtil;
import org.codehaus.groovy.control.CompilationFailedException; import org.codehaus.groovy.control.CompilationFailedException;
import org.springframework.cli.Command; import org.springframework.boot.cli.Command;
import org.springframework.cli.compiler.GroovyCompiler; import org.springframework.boot.cli.compiler.GroovyCompiler;
import org.springframework.cli.compiler.GroovyCompilerConfiguration; import org.springframework.boot.cli.compiler.GroovyCompilerConfiguration;
/** /**
* {@link Command} to run a Groovy script. * {@link Command} to run a Groovy script.

4
spring-cli/src/main/java/org/springframework/cli/command/ScriptCompilationCustomizer.java → spring-boot-cli/src/main/java/org/springframework/boot/cli/command/ScriptCompilationCustomizer.java
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.cli.command; package org.springframework.boot.cli.command;
import groovy.lang.Mixin; import groovy.lang.Mixin;
@ -45,7 +45,7 @@ import org.codehaus.groovy.control.SourceUnit;
import org.codehaus.groovy.control.customizers.CompilationCustomizer; import org.codehaus.groovy.control.customizers.CompilationCustomizer;
import org.codehaus.groovy.control.customizers.ImportCustomizer; import org.codehaus.groovy.control.customizers.ImportCustomizer;
import org.objectweb.asm.Opcodes; import org.objectweb.asm.Opcodes;
import org.springframework.cli.Command; import org.springframework.boot.cli.Command;
/** /**
* Customizer for the compilation of CLI commands. * Customizer for the compilation of CLI commands.

4
spring-cli/src/main/java/org/springframework/cli/command/VersionCommand.java → spring-boot-cli/src/main/java/org/springframework/boot/cli/command/VersionCommand.java
View File

@ -14,9 +14,9 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.cli.command; package org.springframework.boot.cli.command;
import org.springframework.cli.Command; import org.springframework.boot.cli.Command;
/** /**
* {@link Command} to display the 'version' number. * {@link Command} to display the 'version' number.

2
spring-cli/src/main/java/org/springframework/cli/compiler/AstUtils.java → spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/AstUtils.java
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.cli.compiler; package org.springframework.boot.cli.compiler;
import org.codehaus.groovy.ast.AnnotatedNode; import org.codehaus.groovy.ast.AnnotatedNode;
import org.codehaus.groovy.ast.AnnotationNode; import org.codehaus.groovy.ast.AnnotationNode;

2
spring-cli/src/main/java/org/springframework/cli/compiler/CompilerAutoConfiguration.java → spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/CompilerAutoConfiguration.java
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.cli.compiler; package org.springframework.boot.cli.compiler;
import groovy.lang.GroovyClassLoader; import groovy.lang.GroovyClassLoader;

2
spring-cli/src/main/java/org/springframework/cli/compiler/DependencyCustomizer.java → spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/DependencyCustomizer.java
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.cli.compiler; package org.springframework.boot.cli.compiler;
import groovy.grape.Grape; import groovy.grape.Grape;
import groovy.lang.Grapes; import groovy.lang.Grapes;

2
spring-cli/src/main/java/org/springframework/cli/compiler/ExtendedGroovyClassLoader.java → spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/ExtendedGroovyClassLoader.java
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.cli.compiler; package org.springframework.boot.cli.compiler;
import groovy.lang.GroovyClassLoader; import groovy.lang.GroovyClassLoader;

4
spring-cli/src/main/java/org/springframework/cli/compiler/GroovyCompiler.java → spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/GroovyCompiler.java
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.cli.compiler; package org.springframework.boot.cli.compiler;
import groovy.grape.Grape; import groovy.grape.Grape;
import groovy.lang.GroovyClassLoader; import groovy.lang.GroovyClassLoader;
@ -45,7 +45,7 @@ import org.codehaus.groovy.control.customizers.ImportCustomizer;
* {@link GroovyClassLoader#parseClass(File)} with the following additional features: * {@link GroovyClassLoader#parseClass(File)} with the following additional features:
* <ul> * <ul>
* <li>{@link CompilerAutoConfiguration} strategies will be read from * <li>{@link CompilerAutoConfiguration} strategies will be read from
* <code>META-INF/services/org.springframework.cli.compiler.CompilerAutoConfiguration</code> * <code>META-INF/services/org.springframework.boot.cli.compiler.CompilerAutoConfiguration</code>
* (per the standard java {@link ServiceLoader} contract) and applied during compilation</li> * (per the standard java {@link ServiceLoader} contract) and applied during compilation</li>
* *
* <li>Multiple classes can be returned if the Groovy source defines more than one Class</li> * <li>Multiple classes can be returned if the Groovy source defines more than one Class</li>

2
spring-cli/src/main/java/org/springframework/cli/compiler/GroovyCompilerConfiguration.java → spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/GroovyCompilerConfiguration.java
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.cli.compiler; package org.springframework.boot.cli.compiler;
/** /**
* Configuration for the {@link GroovyCompiler}. * Configuration for the {@link GroovyCompiler}.

8
spring-cli/src/main/java/org/springframework/cli/compiler/autoconfigure/ReactorCompilerAutoConfiguration.java → spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/ReactorCompilerAutoConfiguration.java
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.cli.compiler.autoconfigure; package org.springframework.boot.cli.compiler.autoconfigure;
import java.lang.annotation.Documented; import java.lang.annotation.Documented;
import java.lang.annotation.ElementType; import java.lang.annotation.ElementType;
@ -24,9 +24,9 @@ import java.lang.annotation.Target;
import org.codehaus.groovy.ast.ClassNode; import org.codehaus.groovy.ast.ClassNode;
import org.codehaus.groovy.control.customizers.ImportCustomizer; import org.codehaus.groovy.control.customizers.ImportCustomizer;
import org.springframework.cli.compiler.AstUtils; import org.springframework.boot.cli.compiler.AstUtils;
import org.springframework.cli.compiler.CompilerAutoConfiguration; import org.springframework.boot.cli.compiler.CompilerAutoConfiguration;
import org.springframework.cli.compiler.DependencyCustomizer; import org.springframework.boot.cli.compiler.DependencyCustomizer;
/** /**
* {@link CompilerAutoConfiguration} for the Recator. * {@link CompilerAutoConfiguration} for the Recator.

8
spring-cli/src/main/java/org/springframework/cli/compiler/autoconfigure/SpringBatchCompilerAutoConfiguration.java → spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringBatchCompilerAutoConfiguration.java
View File

@ -14,13 +14,13 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.cli.compiler.autoconfigure; package org.springframework.boot.cli.compiler.autoconfigure;
import org.codehaus.groovy.ast.ClassNode; import org.codehaus.groovy.ast.ClassNode;
import org.codehaus.groovy.control.customizers.ImportCustomizer; import org.codehaus.groovy.control.customizers.ImportCustomizer;
import org.springframework.cli.compiler.AstUtils; import org.springframework.boot.cli.compiler.AstUtils;
import org.springframework.cli.compiler.CompilerAutoConfiguration; import org.springframework.boot.cli.compiler.CompilerAutoConfiguration;
import org.springframework.cli.compiler.DependencyCustomizer; import org.springframework.boot.cli.compiler.DependencyCustomizer;
/** /**
* {@link CompilerAutoConfiguration} for Spring Batch. * {@link CompilerAutoConfiguration} for Spring Batch.

22
spring-cli/src/main/java/org/springframework/cli/compiler/autoconfigure/SpringCompilerAutoConfiguration.java → spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringBootCompilerAutoConfiguration.java
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.cli.compiler.autoconfigure; package org.springframework.boot.cli.compiler.autoconfigure;
import groovy.lang.GroovyClassLoader; import groovy.lang.GroovyClassLoader;
@ -24,9 +24,9 @@ import org.codehaus.groovy.classgen.GeneratorContext;
import org.codehaus.groovy.control.CompilationFailedException; import org.codehaus.groovy.control.CompilationFailedException;
import org.codehaus.groovy.control.SourceUnit; import org.codehaus.groovy.control.SourceUnit;
import org.codehaus.groovy.control.customizers.ImportCustomizer; import org.codehaus.groovy.control.customizers.ImportCustomizer;
import org.springframework.cli.compiler.CompilerAutoConfiguration; import org.springframework.boot.cli.compiler.CompilerAutoConfiguration;
import org.springframework.cli.compiler.DependencyCustomizer; import org.springframework.boot.cli.compiler.DependencyCustomizer;
import org.springframework.cli.compiler.GroovyCompilerConfiguration; import org.springframework.boot.cli.compiler.GroovyCompilerConfiguration;
/** /**
* {@link CompilerAutoConfiguration} for Spring. * {@link CompilerAutoConfiguration} for Spring.
@ -34,14 +34,14 @@ import org.springframework.cli.compiler.GroovyCompilerConfiguration;
* @author Dave Syer * @author Dave Syer
* @author Phillip Webb * @author Phillip Webb
*/ */
public class SpringCompilerAutoConfiguration extends CompilerAutoConfiguration { public class SpringBootCompilerAutoConfiguration extends CompilerAutoConfiguration {
@Override @Override
public void applyDependencies(DependencyCustomizer dependencies) { public void applyDependencies(DependencyCustomizer dependencies) {
dependencies.ifAnyMissingClasses( dependencies.ifAnyMissingClasses(
"org.springframework.bootstrap.SpringApplication").add( "org.springframework.boot.strap.SpringApplication").add(
"org.springframework.zero", "spring-starter", "org.springframework.boot", "spring-boot-up",
dependencies.getProperty("spring.zero.version")); dependencies.getProperty("spring.boot.version"));
} }
@Override @Override
@ -64,8 +64,8 @@ public class SpringCompilerAutoConfiguration extends CompilerAutoConfiguration {
"org.springframework.context.MessageSource", "org.springframework.context.MessageSource",
"org.springframework.core.annotation.Order", "org.springframework.core.annotation.Order",
"org.springframework.core.io.ResourceLoader", "org.springframework.core.io.ResourceLoader",
"org.springframework.bootstrap.CommandLineRunner", "org.springframework.boot.strap.CommandLineRunner",
"org.springframework.autoconfigure.EnableAutoConfiguration"); "org.springframework.boot.config.EnableAutoConfiguration");
imports.addStarImports("org.springframework.stereotype"); imports.addStarImports("org.springframework.stereotype");
} }
@ -82,7 +82,7 @@ public class SpringCompilerAutoConfiguration extends CompilerAutoConfiguration {
if (!hasEnableAutoConfigureAnnotation(classNode)) { if (!hasEnableAutoConfigureAnnotation(classNode)) {
try { try {
Class<?> annotationClass = source.getClassLoader().loadClass( Class<?> annotationClass = source.getClassLoader().loadClass(
"org.springframework.autoconfigure.EnableAutoConfiguration"); "org.springframework.boot.config.EnableAutoConfiguration");
AnnotationNode annotationNode = new AnnotationNode(new ClassNode( AnnotationNode annotationNode = new AnnotationNode(new ClassNode(
annotationClass)); annotationClass));
classNode.addAnnotation(annotationNode); classNode.addAnnotation(annotationNode);

8
spring-cli/src/main/java/org/springframework/cli/compiler/autoconfigure/SpringIntegrationCompilerAutoConfiguration.java → spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringIntegrationCompilerAutoConfiguration.java
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.cli.compiler.autoconfigure; package org.springframework.boot.cli.compiler.autoconfigure;
import java.lang.annotation.Documented; import java.lang.annotation.Documented;
import java.lang.annotation.ElementType; import java.lang.annotation.ElementType;
@ -24,9 +24,9 @@ import java.lang.annotation.Target;
import org.codehaus.groovy.ast.ClassNode; import org.codehaus.groovy.ast.ClassNode;
import org.codehaus.groovy.control.customizers.ImportCustomizer; import org.codehaus.groovy.control.customizers.ImportCustomizer;
import org.springframework.cli.compiler.AstUtils; import org.springframework.boot.cli.compiler.AstUtils;
import org.springframework.cli.compiler.CompilerAutoConfiguration; import org.springframework.boot.cli.compiler.CompilerAutoConfiguration;
import org.springframework.cli.compiler.DependencyCustomizer; import org.springframework.boot.cli.compiler.DependencyCustomizer;
/** /**
* {@link CompilerAutoConfiguration} for Spring Integration. * {@link CompilerAutoConfiguration} for Spring Integration.

10
spring-cli/src/main/java/org/springframework/cli/compiler/autoconfigure/SpringMvcCompilerAutoConfiguration.java → spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringMvcCompilerAutoConfiguration.java
View File

@ -14,13 +14,13 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.cli.compiler.autoconfigure; package org.springframework.boot.cli.compiler.autoconfigure;
import org.codehaus.groovy.ast.ClassNode; import org.codehaus.groovy.ast.ClassNode;
import org.codehaus.groovy.control.customizers.ImportCustomizer; import org.codehaus.groovy.control.customizers.ImportCustomizer;
import org.springframework.cli.compiler.AstUtils; import org.springframework.boot.cli.compiler.AstUtils;
import org.springframework.cli.compiler.CompilerAutoConfiguration; import org.springframework.boot.cli.compiler.CompilerAutoConfiguration;
import org.springframework.cli.compiler.DependencyCustomizer; import org.springframework.boot.cli.compiler.DependencyCustomizer;
/** /**
* {@link CompilerAutoConfiguration} for Spring MVC. * {@link CompilerAutoConfiguration} for Spring MVC.
@ -62,7 +62,7 @@ public class SpringMvcCompilerAutoConfiguration extends CompilerAutoConfiguratio
"org.springframework.web.servlet.config.annotation", "org.springframework.web.servlet.config.annotation",
"org.springframework.web.servlet", "org.springframework.web.servlet",
"org.springframework.web.servlet.handler", "org.springframework.http"); "org.springframework.web.servlet.handler", "org.springframework.http");
imports.addStaticImport("org.springframework.cli.template.GroovyTemplate", imports.addStaticImport("org.springframework.boot.cli.template.GroovyTemplate",
"template"); "template");
} }

8
spring-cli/src/main/java/org/springframework/cli/compiler/autoconfigure/SpringSecurityCompilerAutoConfiguration.java → spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringSecurityCompilerAutoConfiguration.java
View File

@ -14,13 +14,13 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.cli.compiler.autoconfigure; package org.springframework.boot.cli.compiler.autoconfigure;
import org.codehaus.groovy.ast.ClassNode; import org.codehaus.groovy.ast.ClassNode;
import org.codehaus.groovy.control.customizers.ImportCustomizer; import org.codehaus.groovy.control.customizers.ImportCustomizer;
import org.springframework.cli.compiler.AstUtils; import org.springframework.boot.cli.compiler.AstUtils;
import org.springframework.cli.compiler.CompilerAutoConfiguration; import org.springframework.boot.cli.compiler.CompilerAutoConfiguration;
import org.springframework.cli.compiler.DependencyCustomizer; import org.springframework.boot.cli.compiler.DependencyCustomizer;
/** /**
* {@link CompilerAutoConfiguration} for Spring Security. * {@link CompilerAutoConfiguration} for Spring Security.

6
spring-cli/src/main/java/org/springframework/cli/runner/SpringApplicationRunner.java → spring-boot-cli/src/main/java/org/springframework/boot/cli/runner/SpringApplicationRunner.java
View File

@ -14,14 +14,14 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.cli.runner; package org.springframework.boot.cli.runner;
import java.io.File; import java.io.File;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.logging.Level; import java.util.logging.Level;
import org.springframework.cli.compiler.GroovyCompiler; import org.springframework.boot.cli.compiler.GroovyCompiler;
/** /**
* Compiles Groovy code running the resulting classes using a {@code SpringApplication}. * Compiles Groovy code running the resulting classes using a {@code SpringApplication}.
@ -135,7 +135,7 @@ public class SpringApplicationRunner {
try { try {
// User reflection to load and call Spring // User reflection to load and call Spring
Class<?> application = getContextClassLoader().loadClass( Class<?> application = getContextClassLoader().loadClass(
"org.springframework.bootstrap.SpringApplication"); "org.springframework.boot.strap.SpringApplication");
Method method = application.getMethod("run", Object[].class, Method method = application.getMethod("run", Object[].class,
String[].class); String[].class);
this.applicationContext = method.invoke(null, this.sources, this.applicationContext = method.invoke(null, this.sources,

4
spring-cli/src/main/java/org/springframework/cli/runner/SpringApplicationRunnerConfiguration.java → spring-boot-cli/src/main/java/org/springframework/boot/cli/runner/SpringApplicationRunnerConfiguration.java
View File

@ -14,11 +14,11 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.cli.runner; package org.springframework.boot.cli.runner;
import java.util.logging.Level; import java.util.logging.Level;
import org.springframework.cli.compiler.GroovyCompilerConfiguration; import org.springframework.boot.cli.compiler.GroovyCompilerConfiguration;
/** /**
* Configuration for the {@link SpringApplicationRunner}. * Configuration for the {@link SpringApplicationRunner}.

2
spring-cli/src/main/java/org/springframework/cli/template/GroovyTemplate.java → spring-boot-cli/src/main/java/org/springframework/boot/cli/template/GroovyTemplate.java
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.cli.template; package org.springframework.boot.cli.template;
import groovy.text.GStringTemplateEngine; import groovy.text.GStringTemplateEngine;
import groovy.text.Template; import groovy.text.Template;

1
spring-boot-cli/src/main/resources/META-INF/services/org.springframework.boot.cli.CommandFactory Normal file
View File

@ -0,0 +1 @@
org.springframework.boot.cli.command.DefaultCommandFactory

6
spring-boot-cli/src/main/resources/META-INF/services/org.springframework.boot.cli.compiler.CompilerAutoConfiguration Normal file
View File

@ -0,0 +1,6 @@
org.springframework.boot.cli.compiler.autoconfigure.SpringBootCompilerAutoConfiguration
org.springframework.boot.cli.compiler.autoconfigure.SpringMvcCompilerAutoConfiguration
org.springframework.boot.cli.compiler.autoconfigure.SpringBatchCompilerAutoConfiguration
org.springframework.boot.cli.compiler.autoconfigure.ReactorCompilerAutoConfiguration
org.springframework.boot.cli.compiler.autoconfigure.SpringIntegrationCompilerAutoConfiguration
org.springframework.boot.cli.compiler.autoconfigure.SpringSecurityCompilerAutoConfiguration

2
spring-cli/src/main/resources/META-INF/springcli.properties → spring-boot-cli/src/main/resources/META-INF/springcli.properties
View File

@ -1,4 +1,4 @@
spring.zero.version: ${project.version} spring.boot.version: ${project.version}
spring.version: ${spring.version} spring.version: ${spring.version}
spring.batch.version: ${spring.batch.version} spring.batch.version: ${spring.batch.version}
spring.security.version: ${spring.security.version} spring.security.version: ${spring.security.version}

2
spring-cli/src/main/scripts/spring → spring-boot-cli/src/main/scripts/spring
View File

@ -77,4 +77,4 @@ if $cygwin; then
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
fi fi
${JAVA_HOME}/bin/java ${JAVA_OPTS} -cp "$CLASSPATH" org.springframework.cli.SpringCli $* ${JAVA_HOME}/bin/java ${JAVA_OPTS} -cp "$CLASSPATH" org.springframework.boot.cli.SpringCli $*

14
spring-cli/src/test/java/org/springframework/cli/GrapesCleaner.java → spring-boot-cli/src/test/java/org/springframework/boot/cli/GrapesCleaner.java
View File

@ -14,11 +14,11 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.cli; package org.springframework.boot.cli;
import java.io.File; import java.io.File;
import org.springframework.cli.command.CleanCommand; import org.springframework.boot.cli.command.CleanCommand;
/** /**
* @author Dave Syer * @author Dave Syer
@ -30,11 +30,13 @@ public class GrapesCleaner {
public static void cleanIfNecessary() throws Exception { public static void cleanIfNecessary() throws Exception {
File installedJar = new File(getMavenRepository(), String.format( File installedJar = new File(getMavenRepository(), String.format(
"org/springframework/zero/spring-bootstrap/%s/spring-bootstrap-%s.jar", "org/springframework/boot/spring-boot-strap/%s/spring-boot-strap-%s.jar",
VERSION, VERSION)); VERSION, VERSION));
File grapesJar = new File(getGrapesCache(), String.format( File grapesJar = new File(
"org.springframework.zero/spring-bootstrap/jars/spring-bootstrap-%s.jar", getGrapesCache(),
VERSION)); String.format(
"org.springframework.boot/spring-boot-strap/jars/spring-boot-strap-%s.jar",
VERSION));
if (!VERSION.contains("SNAPSHOT") || installedJar.exists() && grapesJar.exists() if (!VERSION.contains("SNAPSHOT") || installedJar.exists() && grapesJar.exists()
&& installedJar.lastModified() <= grapesJar.lastModified()) { && installedJar.lastModified() <= grapesJar.lastModified()) {
return; return;

8
spring-cli/src/test/java/org/springframework/cli/SampleIntegrationTests.java → spring-boot-cli/src/test/java/org/springframework/boot/cli/SampleIntegrationTests.java
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.cli; package org.springframework.boot.cli;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.io.PrintStream; import java.io.PrintStream;
@ -29,7 +29,7 @@ import org.junit.After;
import org.junit.Before; import org.junit.Before;
import org.junit.BeforeClass; import org.junit.BeforeClass;
import org.junit.Test; import org.junit.Test;
import org.springframework.cli.command.RunCommand; import org.springframework.boot.cli.command.RunCommand;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
@ -160,8 +160,8 @@ public class SampleIntegrationTests {
} }
@Test @Test
public void actuatorSample() throws Exception { public void opsSample() throws Exception {
start("samples/actuator.groovy"); start("samples/ops.groovy");
String result = FileUtil.readEntirely(new URL("http://localhost:8080") String result = FileUtil.readEntirely(new URL("http://localhost:8080")
.openStream()); .openStream());
assertEquals("{\"message\":\"Hello World!\"}", result); assertEquals("{\"message\":\"Hello World!\"}", result);

9
spring-cli/src/test/java/org/springframework/cli/SpringCliTests.java → spring-boot-cli/src/test/java/org/springframework/boot/cli/SpringCliTests.java
View File

@ -1,4 +1,4 @@
package org.springframework.cli; package org.springframework.boot.cli;
import java.util.Arrays; import java.util.Arrays;
import java.util.EnumSet; import java.util.EnumSet;
@ -10,8 +10,11 @@ import org.junit.Test;
import org.junit.rules.ExpectedException; import org.junit.rules.ExpectedException;
import org.mockito.Mock; import org.mockito.Mock;
import org.mockito.MockitoAnnotations; import org.mockito.MockitoAnnotations;
import org.springframework.cli.SpringCli.NoArgumentsException; import org.springframework.boot.cli.Command;
import org.springframework.cli.SpringCli.NoHelpCommandArgumentsException; import org.springframework.boot.cli.NoSuchCommandException;
import org.springframework.boot.cli.SpringCli;
import org.springframework.boot.cli.SpringCli.NoArgumentsException;
import org.springframework.boot.cli.SpringCli.NoHelpCommandArgumentsException;
import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.equalTo;
import static org.junit.Assert.assertThat; import static org.junit.Assert.assertThat;

6
spring-cli/src/test/java/org/springframework/cli/command/ScriptCommandTests.java → spring-boot-cli/src/test/java/org/springframework/boot/cli/command/ScriptCommandTests.java
View File

@ -14,14 +14,16 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.cli.command; package org.springframework.boot.cli.command;
import groovy.lang.GroovyObjectSupport; import groovy.lang.GroovyObjectSupport;
import groovy.lang.Script; import groovy.lang.Script;
import org.junit.BeforeClass; import org.junit.BeforeClass;
import org.junit.Test; import org.junit.Test;
import org.springframework.cli.GrapesCleaner; import org.springframework.boot.cli.GrapesCleaner;
import org.springframework.boot.cli.command.OptionHandler;
import org.springframework.boot.cli.command.ScriptCommand;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotSame; import static org.junit.Assert.assertNotSame;

6
spring-boot-cli/src/test/resources/commands/closure.groovy Normal file
View File

@ -0,0 +1,6 @@
def run = { msg ->
org.springframework.boot.cli.command.ScriptCommandTests.executed = true
println "Hello ${msg}"
}
run

2
spring-cli/src/test/resources/commands/command.groovy → spring-boot-cli/src/test/resources/commands/command.groovy
View File

@ -11,7 +11,7 @@ class TestCommand implements Command {
String usageHelp = "Not very useful" String usageHelp = "Not very useful"
void run(String... args) { void run(String... args) {
org.springframework.cli.command.ScriptCommandTests.executed = true org.springframework.boot.cli.command.ScriptCommandTests.executed = true
println "Hello ${args[0]}" println "Hello ${args[0]}"
} }

2
spring-cli/src/test/resources/commands/handler.groovy → spring-boot-cli/src/test/resources/commands/handler.groovy
View File

@ -12,7 +12,7 @@ class TestCommand extends OptionHandler {
void run(OptionSet options) { void run(OptionSet options) {
// Demonstrate use of Grape.grab to load dependencies before running // Demonstrate use of Grape.grab to load dependencies before running
println "Clean : " + Git.open(".." as File).status().call().isClean() println "Clean : " + Git.open(".." as File).status().call().isClean()
org.springframework.cli.command.ScriptCommandTests.executed = true org.springframework.boot.cli.command.ScriptCommandTests.executed = true
println "Hello ${options.nonOptionArguments()}: ${options.has('foo')}" println "Hello ${options.nonOptionArguments()}: ${options.has('foo')}"
} }

2
spring-cli/src/test/resources/commands/mixin.groovy → spring-boot-cli/src/test/resources/commands/mixin.groovy
View File

@ -2,5 +2,5 @@ void options() {
option "foo", "Foo set" option "foo", "Foo set"
} }
org.springframework.cli.command.ScriptCommandTests.executed = true org.springframework.boot.cli.command.ScriptCommandTests.executed = true
println "Hello ${options.nonOptionArguments()}: ${options.has('foo')}" println "Hello ${options.nonOptionArguments()}: ${options.has('foo')}"

2
spring-cli/src/test/resources/commands/runnable.groovy → spring-boot-cli/src/test/resources/commands/runnable.groovy
View File

@ -4,7 +4,7 @@ class TestCommand implements Runnable {
this.msg = msg this.msg = msg
} }
void run() { void run() {
org.springframework.cli.command.ScriptCommandTests.executed = true org.springframework.boot.cli.command.ScriptCommandTests.executed = true
println "Hello ${msg}" println "Hello ${msg}"
} }
} }

0
spring-cli/src/test/resources/commands/script.groovy → spring-boot-cli/src/test/resources/commands/script.groovy
View File

2
spring-cli/src/test/resources/commands/test.groovy → spring-boot-cli/src/test/resources/commands/test.groovy
View File

@ -3,5 +3,5 @@ options {
option "bar", "Bar has an argument of type int" withOptionalArg() ofType Integer option "bar", "Bar has an argument of type int" withOptionalArg() ofType Integer
} }
org.springframework.cli.command.ScriptCommandTests.executed = true org.springframework.boot.cli.command.ScriptCommandTests.executed = true
println "Hello ${options.nonOptionArguments()}: ${options.has('foo')} ${options.valueOf('bar')}" println "Hello ${options.nonOptionArguments()}: ${options.has('foo')} ${options.valueOf('bar')}"

0
spring-cli/src/test/resources/logback.xml → spring-boot-cli/src/test/resources/logback.xml
View File

0
spring-cli/src/test/resources/static/css/bootstrap.min.css → spring-boot-cli/src/test/resources/static/css/bootstrap.min.css vendored
View File

0
spring-cli/src/test/resources/templates/home.html → spring-boot-cli/src/test/resources/templates/home.html
View File

0
spring-cli/src/test/resources/templates/test.txt → spring-boot-cli/src/test/resources/templates/test.txt
View File

0
spring-autoconfigure/README.md → spring-boot-config/README.md
View File

10
spring-autoconfigure/pom.xml → spring-boot-config/pom.xml
View File

@ -3,11 +3,11 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>org.springframework.zero</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-zero</artifactId> <artifactId>spring-boot</artifactId>
<version>0.5.0.BUILD-SNAPSHOT</version> <version>0.5.0.BUILD-SNAPSHOT</version>
</parent> </parent>
<artifactId>spring-autoconfigure</artifactId> <artifactId>spring-boot-config</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<properties> <properties>
<main.basedir>${basedir}/..</main.basedir> <main.basedir>${basedir}/..</main.basedir>
@ -16,7 +16,7 @@
<!-- Compile --> <!-- Compile -->
<dependency> <dependency>
<groupId>${project.groupId}</groupId> <groupId>${project.groupId}</groupId>
<artifactId>spring-bootstrap</artifactId> <artifactId>spring-boot-strap</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<!-- Optional --> <!-- Optional -->
@ -118,7 +118,7 @@
<!-- Test --> <!-- Test -->
<dependency> <dependency>
<groupId>${project.groupId}</groupId> <groupId>${project.groupId}</groupId>
<artifactId>spring-bootstrap</artifactId> <artifactId>spring-boot-strap</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<classifier>tests</classifier> <classifier>tests</classifier>
<scope>test</scope> <scope>test</scope>

2
spring-autoconfigure/src/main/java/org/springframework/autoconfigure/AutoConfigurationSorter.java → spring-boot-config/src/main/java/org/springframework/boot/config/AutoConfigurationSorter.java
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.autoconfigure; package org.springframework.boot.config;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;

2
spring-autoconfigure/src/main/java/org/springframework/autoconfigure/AutoConfigurationUtils.java → spring-boot-config/src/main/java/org/springframework/boot/config/AutoConfigurationUtils.java
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.autoconfigure; package org.springframework.boot.config;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;

2
spring-autoconfigure/src/main/java/org/springframework/autoconfigure/AutoConfigureAfter.java → spring-boot-config/src/main/java/org/springframework/boot/config/AutoConfigureAfter.java
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.autoconfigure; package org.springframework.boot.config;
import java.lang.annotation.ElementType; import java.lang.annotation.ElementType;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;

2
spring-autoconfigure/src/main/java/org/springframework/autoconfigure/ComponentScanDetector.java → spring-boot-config/src/main/java/org/springframework/boot/config/ComponentScanDetector.java
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.autoconfigure; package org.springframework.boot.config;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;

12
spring-autoconfigure/src/main/java/org/springframework/autoconfigure/EnableAutoConfiguration.java → spring-boot-config/src/main/java/org/springframework/boot/config/EnableAutoConfiguration.java
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.autoconfigure; package org.springframework.boot.config;
import java.lang.annotation.Documented; import java.lang.annotation.Documented;
import java.lang.annotation.ElementType; import java.lang.annotation.ElementType;
@ -22,11 +22,11 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target; import java.lang.annotation.Target;
import org.springframework.bootstrap.context.condition.ConditionalOnBean; import org.springframework.boot.strap.context.condition.ConditionalOnBean;
import org.springframework.bootstrap.context.condition.ConditionalOnClass; import org.springframework.boot.strap.context.condition.ConditionalOnClass;
import org.springframework.bootstrap.context.condition.ConditionalOnMissingBean; import org.springframework.boot.strap.context.condition.ConditionalOnMissingBean;
import org.springframework.bootstrap.context.embedded.EmbeddedServletContainerFactory; import org.springframework.boot.strap.context.embedded.EmbeddedServletContainerFactory;
import org.springframework.bootstrap.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory; import org.springframework.boot.strap.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory;
import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Conditional;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import; import org.springframework.context.annotation.Import;

2
spring-autoconfigure/src/main/java/org/springframework/autoconfigure/EnableAutoConfigurationImportSelector.java → spring-boot-config/src/main/java/org/springframework/boot/config/EnableAutoConfigurationImportSelector.java
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.autoconfigure; package org.springframework.boot.config;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;

4
spring-autoconfigure/src/main/java/org/springframework/autoconfigure/MessageSourceAutoConfiguration.java → spring-boot-config/src/main/java/org/springframework/boot/config/MessageSourceAutoConfiguration.java
View File

@ -14,10 +14,10 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.autoconfigure; package org.springframework.boot.config;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.bootstrap.context.condition.ConditionalOnMissingBean; import org.springframework.boot.strap.context.condition.ConditionalOnMissingBean;
import org.springframework.context.MessageSource; import org.springframework.context.MessageSource;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;

4
spring-autoconfigure/src/main/java/org/springframework/autoconfigure/PropertyPlaceholderAutoConfiguration.java → spring-boot-config/src/main/java/org/springframework/boot/config/PropertyPlaceholderAutoConfiguration.java
View File

@ -14,9 +14,9 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.autoconfigure; package org.springframework.boot.config;
import org.springframework.bootstrap.context.condition.ConditionalOnMissingBean; import org.springframework.boot.strap.context.condition.ConditionalOnMissingBean;
import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;

14
spring-autoconfigure/src/main/java/org/springframework/autoconfigure/batch/BatchAutoConfiguration.java → spring-boot-config/src/main/java/org/springframework/boot/config/batch/BatchAutoConfiguration.java
View File

@ -14,15 +14,15 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.autoconfigure.batch; package org.springframework.boot.config.batch;
import org.springframework.autoconfigure.EnableAutoConfiguration;
import org.springframework.batch.core.launch.JobLauncher; import org.springframework.batch.core.launch.JobLauncher;
import org.springframework.bootstrap.CommandLineRunner; import org.springframework.boot.config.EnableAutoConfiguration;
import org.springframework.bootstrap.ExitCodeGenerator; import org.springframework.boot.strap.CommandLineRunner;
import org.springframework.bootstrap.context.condition.ConditionalOnBean; import org.springframework.boot.strap.ExitCodeGenerator;
import org.springframework.bootstrap.context.condition.ConditionalOnClass; import org.springframework.boot.strap.context.condition.ConditionalOnBean;
import org.springframework.bootstrap.context.condition.ConditionalOnMissingBean; import org.springframework.boot.strap.context.condition.ConditionalOnClass;
import org.springframework.boot.strap.context.condition.ConditionalOnMissingBean;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;

2
spring-autoconfigure/src/main/java/org/springframework/autoconfigure/batch/BatchDatabaseInitializer.java → spring-boot-config/src/main/java/org/springframework/boot/config/batch/BatchDatabaseInitializer.java
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.autoconfigure.batch; package org.springframework.boot.config.batch;
import javax.annotation.PostConstruct; import javax.annotation.PostConstruct;
import javax.sql.DataSource; import javax.sql.DataSource;

2
spring-autoconfigure/src/main/java/org/springframework/autoconfigure/batch/JobExecutionEvent.java → spring-boot-config/src/main/java/org/springframework/boot/config/batch/JobExecutionEvent.java
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.autoconfigure.batch; package org.springframework.boot.config.batch;
import org.springframework.batch.core.JobExecution; import org.springframework.batch.core.JobExecution;
import org.springframework.context.ApplicationEvent; import org.springframework.context.ApplicationEvent;

4
spring-autoconfigure/src/main/java/org/springframework/autoconfigure/batch/JobExecutionExitCodeGenerator.java → spring-boot-config/src/main/java/org/springframework/boot/config/batch/JobExecutionExitCodeGenerator.java
View File

@ -14,13 +14,13 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.autoconfigure.batch; package org.springframework.boot.config.batch;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.springframework.batch.core.JobExecution; import org.springframework.batch.core.JobExecution;
import org.springframework.bootstrap.ExitCodeGenerator; import org.springframework.boot.strap.ExitCodeGenerator;
import org.springframework.context.ApplicationListener; import org.springframework.context.ApplicationListener;
/** /**

4
spring-autoconfigure/src/main/java/org/springframework/autoconfigure/batch/JobLauncherCommandLineRunner.java → spring-boot-config/src/main/java/org/springframework/boot/config/batch/JobLauncherCommandLineRunner.java
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.autoconfigure.batch; package org.springframework.boot.config.batch;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
@ -30,7 +30,7 @@ import org.springframework.batch.core.converter.DefaultJobParametersConverter;
import org.springframework.batch.core.converter.JobParametersConverter; import org.springframework.batch.core.converter.JobParametersConverter;
import org.springframework.batch.core.launch.JobLauncher; import org.springframework.batch.core.launch.JobLauncher;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.bootstrap.CommandLineRunner; import org.springframework.boot.strap.CommandLineRunner;
import org.springframework.context.ApplicationEventPublisher; import org.springframework.context.ApplicationEventPublisher;
import org.springframework.context.ApplicationEventPublisherAware; import org.springframework.context.ApplicationEventPublisherAware;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;

8
spring-autoconfigure/src/main/java/org/springframework/autoconfigure/data/JpaRepositoriesAutoConfiguration.java → spring-boot-config/src/main/java/org/springframework/boot/config/data/JpaRepositoriesAutoConfiguration.java
View File

@ -14,11 +14,11 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.autoconfigure.data; package org.springframework.boot.config.data;
import org.springframework.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.config.EnableAutoConfiguration;
import org.springframework.bootstrap.context.condition.ConditionalOnClass; import org.springframework.boot.strap.context.condition.ConditionalOnClass;
import org.springframework.bootstrap.context.condition.ConditionalOnMissingBean; import org.springframework.boot.strap.context.condition.ConditionalOnMissingBean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import; import org.springframework.context.annotation.Import;
import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaRepository;

4
spring-autoconfigure/src/main/java/org/springframework/autoconfigure/data/JpaRepositoriesAutoConfigureRegistrar.java → spring-boot-config/src/main/java/org/springframework/boot/config/data/JpaRepositoriesAutoConfigureRegistrar.java
View File

@ -14,18 +14,18 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.autoconfigure.data; package org.springframework.boot.config.data;
import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.List;
import org.springframework.autoconfigure.AutoConfigurationUtils;
import org.springframework.beans.BeansException; import org.springframework.beans.BeansException;
import org.springframework.beans.factory.BeanClassLoaderAware; import org.springframework.beans.factory.BeanClassLoaderAware;
import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.BeanFactoryAware; import org.springframework.beans.factory.BeanFactoryAware;
import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.support.BeanDefinitionRegistry; import org.springframework.beans.factory.support.BeanDefinitionRegistry;
import org.springframework.boot.config.AutoConfigurationUtils;
import org.springframework.context.annotation.ImportBeanDefinitionRegistrar; import org.springframework.context.annotation.ImportBeanDefinitionRegistrar;
import org.springframework.core.io.DefaultResourceLoader; import org.springframework.core.io.DefaultResourceLoader;
import org.springframework.core.io.ResourceLoader; import org.springframework.core.io.ResourceLoader;

2
spring-autoconfigure/src/main/java/org/springframework/autoconfigure/jdbc/AbstractDataSourceConfiguration.java → spring-boot-config/src/main/java/org/springframework/boot/config/jdbc/AbstractDataSourceConfiguration.java
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.autoconfigure.jdbc; package org.springframework.boot.config.jdbc;
import org.springframework.beans.factory.BeanCreationException; import org.springframework.beans.factory.BeanCreationException;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;

2
spring-autoconfigure/src/main/java/org/springframework/autoconfigure/jdbc/BasicDataSourceConfiguration.java → spring-boot-config/src/main/java/org/springframework/boot/config/jdbc/BasicDataSourceConfiguration.java
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.autoconfigure.jdbc; package org.springframework.boot.config.jdbc;
import java.sql.SQLException; import java.sql.SQLException;

10
spring-autoconfigure/src/main/java/org/springframework/autoconfigure/jdbc/DataSourceAutoConfiguration.java → spring-boot-config/src/main/java/org/springframework/boot/config/jdbc/DataSourceAutoConfiguration.java
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.autoconfigure.jdbc; package org.springframework.boot.config.jdbc;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
@ -25,13 +25,13 @@ import javax.sql.DataSource;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.springframework.autoconfigure.EnableAutoConfiguration;
import org.springframework.beans.factory.BeanFactoryUtils; import org.springframework.beans.factory.BeanFactoryUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.bootstrap.context.condition.ConditionLogUtils; import org.springframework.boot.config.EnableAutoConfiguration;
import org.springframework.bootstrap.context.condition.ConditionalOnClass; import org.springframework.boot.strap.context.condition.ConditionLogUtils;
import org.springframework.bootstrap.context.condition.ConditionalOnMissingBean; import org.springframework.boot.strap.context.condition.ConditionalOnClass;
import org.springframework.boot.strap.context.condition.ConditionalOnMissingBean;
import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Condition; import org.springframework.context.annotation.Condition;

10
spring-autoconfigure/src/main/java/org/springframework/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfiguration.java → spring-boot-config/src/main/java/org/springframework/boot/config/jdbc/DataSourceTransactionManagerAutoConfiguration.java
View File

@ -14,15 +14,15 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.autoconfigure.jdbc; package org.springframework.boot.config.jdbc;
import javax.sql.DataSource; import javax.sql.DataSource;
import org.springframework.autoconfigure.EnableAutoConfiguration;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.bootstrap.context.condition.ConditionalOnBean; import org.springframework.boot.config.EnableAutoConfiguration;
import org.springframework.bootstrap.context.condition.ConditionalOnClass; import org.springframework.boot.strap.context.condition.ConditionalOnBean;
import org.springframework.bootstrap.context.condition.ConditionalOnMissingBean; import org.springframework.boot.strap.context.condition.ConditionalOnClass;
import org.springframework.boot.strap.context.condition.ConditionalOnMissingBean;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.core.Ordered; import org.springframework.core.Ordered;

4
spring-autoconfigure/src/main/java/org/springframework/autoconfigure/jdbc/EmbeddedDatabaseConfiguration.java → spring-boot-config/src/main/java/org/springframework/boot/config/jdbc/EmbeddedDatabaseConfiguration.java
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.autoconfigure.jdbc; package org.springframework.boot.config.jdbc;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.Map; import java.util.Map;
@ -22,7 +22,7 @@ import java.util.Map;
import javax.annotation.PreDestroy; import javax.annotation.PreDestroy;
import javax.sql.DataSource; import javax.sql.DataSource;
import org.springframework.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.config.EnableAutoConfiguration;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase;

2
spring-autoconfigure/src/main/java/org/springframework/autoconfigure/jdbc/TomcatDataSourceConfiguration.java → spring-boot-config/src/main/java/org/springframework/boot/config/jdbc/TomcatDataSourceConfiguration.java
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.autoconfigure.jdbc; package org.springframework.boot.config.jdbc;
import javax.annotation.PreDestroy; import javax.annotation.PreDestroy;
import javax.sql.DataSource; import javax.sql.DataSource;

6
spring-autoconfigure/src/main/java/org/springframework/autoconfigure/orm/jpa/HibernateJpaAutoConfiguration.java → spring-boot-config/src/main/java/org/springframework/boot/config/orm/jpa/HibernateJpaAutoConfiguration.java
View File

@ -14,15 +14,15 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.autoconfigure.orm.jpa; package org.springframework.boot.config.orm.jpa;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.Map; import java.util.Map;
import org.hibernate.ejb.HibernateEntityManager; import org.hibernate.ejb.HibernateEntityManager;
import org.springframework.autoconfigure.EnableAutoConfiguration;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.bootstrap.context.condition.ConditionalOnClass; import org.springframework.boot.config.EnableAutoConfiguration;
import org.springframework.boot.strap.context.condition.ConditionalOnClass;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType;

18
spring-autoconfigure/src/main/java/org/springframework/autoconfigure/orm/jpa/JpaBaseConfiguration.java → spring-boot-config/src/main/java/org/springframework/boot/config/orm/jpa/JpaBaseConfiguration.java
View File

@ -14,27 +14,27 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.autoconfigure.orm.jpa; package org.springframework.boot.config.orm.jpa;
import java.util.List; import java.util.List;
import javax.persistence.EntityManager; import javax.persistence.EntityManager;
import javax.sql.DataSource; import javax.sql.DataSource;
import org.springframework.autoconfigure.AutoConfigurationUtils;
import org.springframework.autoconfigure.EnableAutoConfiguration;
import org.springframework.autoconfigure.jdbc.EmbeddedDatabaseConfiguration;
import org.springframework.beans.BeansException; import org.springframework.beans.BeansException;
import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.BeanFactoryAware; import org.springframework.beans.factory.BeanFactoryAware;
import org.springframework.beans.factory.NoSuchBeanDefinitionException; import org.springframework.beans.factory.NoSuchBeanDefinitionException;
import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
import org.springframework.bootstrap.context.condition.ConditionalOnBean; import org.springframework.boot.config.AutoConfigurationUtils;
import org.springframework.bootstrap.context.condition.ConditionalOnClass; import org.springframework.boot.config.EnableAutoConfiguration;
import org.springframework.bootstrap.context.condition.ConditionalOnExpression; import org.springframework.boot.config.jdbc.EmbeddedDatabaseConfiguration;
import org.springframework.bootstrap.context.condition.ConditionalOnMissingBean; import org.springframework.boot.strap.context.condition.ConditionalOnBean;
import org.springframework.bootstrap.context.condition.ConditionalOnWebApplication; import org.springframework.boot.strap.context.condition.ConditionalOnClass;
import org.springframework.boot.strap.context.condition.ConditionalOnExpression;
import org.springframework.boot.strap.context.condition.ConditionalOnMissingBean;
import org.springframework.boot.strap.context.condition.ConditionalOnWebApplication;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.orm.jpa.JpaTransactionManager; import org.springframework.orm.jpa.JpaTransactionManager;

10
spring-autoconfigure/src/main/java/org/springframework/autoconfigure/reactor/ReactorAutoConfiguration.java → spring-boot-config/src/main/java/org/springframework/boot/config/reactor/ReactorAutoConfiguration.java
View File

@ -14,12 +14,12 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.autoconfigure.reactor; package org.springframework.boot.config.reactor;
import org.springframework.autoconfigure.AutoConfigureAfter; import org.springframework.boot.config.AutoConfigureAfter;
import org.springframework.autoconfigure.web.WebMvcAutoConfiguration; import org.springframework.boot.config.web.WebMvcAutoConfiguration;
import org.springframework.bootstrap.context.condition.ConditionalOnClass; import org.springframework.boot.strap.context.condition.ConditionalOnClass;
import org.springframework.bootstrap.context.condition.ConditionalOnMissingBean; import org.springframework.boot.strap.context.condition.ConditionalOnMissingBean;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.core.Ordered; import org.springframework.core.Ordered;

12
spring-autoconfigure/src/main/java/org/springframework/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java → spring-boot-config/src/main/java/org/springframework/boot/config/thymeleaf/ThymeleafAutoConfiguration.java
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.autoconfigure.thymeleaf; package org.springframework.boot.config.thymeleaf;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
@ -25,13 +25,13 @@ import javax.servlet.Servlet;
import nz.net.ultraq.thymeleaf.LayoutDialect; import nz.net.ultraq.thymeleaf.LayoutDialect;
import org.springframework.autoconfigure.AutoConfigureAfter;
import org.springframework.autoconfigure.EnableAutoConfiguration;
import org.springframework.autoconfigure.web.WebMvcAutoConfiguration;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.bootstrap.context.condition.ConditionalOnClass; import org.springframework.boot.config.AutoConfigureAfter;
import org.springframework.bootstrap.context.condition.ConditionalOnMissingBean; import org.springframework.boot.config.EnableAutoConfiguration;
import org.springframework.boot.config.web.WebMvcAutoConfiguration;
import org.springframework.boot.strap.context.condition.ConditionalOnClass;
import org.springframework.boot.strap.context.condition.ConditionalOnMissingBean;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.core.io.DefaultResourceLoader; import org.springframework.core.io.DefaultResourceLoader;

22
spring-autoconfigure/src/main/java/org/springframework/autoconfigure/web/EmbeddedServletContainerAutoConfiguration.java → spring-boot-config/src/main/java/org/springframework/boot/config/web/EmbeddedServletContainerAutoConfiguration.java
View File

@ -14,15 +14,13 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.autoconfigure.web; package org.springframework.boot.config.web;
import javax.servlet.Servlet; import javax.servlet.Servlet;
import org.apache.catalina.startup.Tomcat; import org.apache.catalina.startup.Tomcat;
import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.util.Loader; import org.eclipse.jetty.util.Loader;
import org.springframework.autoconfigure.EnableAutoConfiguration;
import org.springframework.autoconfigure.web.EmbeddedServletContainerAutoConfiguration.EmbeddedServletContainerCustomizerBeanPostProcessorRegistrar;
import org.springframework.beans.BeansException; import org.springframework.beans.BeansException;
import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.BeanFactoryAware; import org.springframework.beans.factory.BeanFactoryAware;
@ -30,14 +28,16 @@ import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
import org.springframework.beans.factory.support.BeanDefinitionRegistry; import org.springframework.beans.factory.support.BeanDefinitionRegistry;
import org.springframework.beans.factory.support.RootBeanDefinition; import org.springframework.beans.factory.support.RootBeanDefinition;
import org.springframework.bootstrap.context.condition.ConditionalOnClass; import org.springframework.boot.config.EnableAutoConfiguration;
import org.springframework.bootstrap.context.condition.ConditionalOnMissingBean; import org.springframework.boot.config.web.EmbeddedServletContainerAutoConfiguration.EmbeddedServletContainerCustomizerBeanPostProcessorRegistrar;
import org.springframework.bootstrap.context.condition.SearchStrategy; import org.springframework.boot.strap.context.condition.ConditionalOnClass;
import org.springframework.bootstrap.context.embedded.EmbeddedServletContainerCustomizerBeanPostProcessor; import org.springframework.boot.strap.context.condition.ConditionalOnMissingBean;
import org.springframework.bootstrap.context.embedded.EmbeddedServletContainerFactory; import org.springframework.boot.strap.context.condition.SearchStrategy;
import org.springframework.bootstrap.context.embedded.ServletContextInitializer; import org.springframework.boot.strap.context.embedded.EmbeddedServletContainerCustomizerBeanPostProcessor;
import org.springframework.bootstrap.context.embedded.jetty.JettyEmbeddedServletContainerFactory; import org.springframework.boot.strap.context.embedded.EmbeddedServletContainerFactory;
import org.springframework.bootstrap.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory; import org.springframework.boot.strap.context.embedded.ServletContextInitializer;
import org.springframework.boot.strap.context.embedded.jetty.JettyEmbeddedServletContainerFactory;
import org.springframework.boot.strap.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import; import org.springframework.context.annotation.Import;

10
spring-autoconfigure/src/main/java/org/springframework/autoconfigure/web/MultipartAutoConfiguration.java → spring-boot-config/src/main/java/org/springframework/boot/config/web/MultipartAutoConfiguration.java
View File

@ -14,15 +14,15 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.autoconfigure.web; package org.springframework.boot.config.web;
import javax.servlet.MultipartConfigElement; import javax.servlet.MultipartConfigElement;
import javax.servlet.Servlet; import javax.servlet.Servlet;
import org.springframework.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.config.EnableAutoConfiguration;
import org.springframework.bootstrap.context.condition.ConditionalOnBean; import org.springframework.boot.strap.context.condition.ConditionalOnBean;
import org.springframework.bootstrap.context.condition.ConditionalOnClass; import org.springframework.boot.strap.context.condition.ConditionalOnClass;
import org.springframework.bootstrap.context.embedded.EmbeddedWebApplicationContext; import org.springframework.boot.strap.context.embedded.EmbeddedWebApplicationContext;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.web.multipart.support.StandardServletMultipartResolver; import org.springframework.web.multipart.support.StandardServletMultipartResolver;

16
spring-autoconfigure/src/main/java/org/springframework/autoconfigure/web/ServerPropertiesAutoConfiguration.java → spring-boot-config/src/main/java/org/springframework/boot/config/web/ServerPropertiesAutoConfiguration.java
View File

@ -14,15 +14,15 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.autoconfigure.web; package org.springframework.boot.config.web;
import org.springframework.autoconfigure.EnableAutoConfiguration;
import org.springframework.beans.BeansException; import org.springframework.beans.BeansException;
import org.springframework.bootstrap.context.condition.ConditionalOnMissingBean; import org.springframework.boot.config.EnableAutoConfiguration;
import org.springframework.bootstrap.context.embedded.ConfigurableEmbeddedServletContainerFactory; import org.springframework.boot.strap.context.condition.ConditionalOnMissingBean;
import org.springframework.bootstrap.context.embedded.EmbeddedServletContainerCustomizer; import org.springframework.boot.strap.context.embedded.ConfigurableEmbeddedServletContainerFactory;
import org.springframework.bootstrap.context.embedded.properties.ServerProperties; import org.springframework.boot.strap.context.embedded.EmbeddedServletContainerCustomizer;
import org.springframework.bootstrap.context.properties.EnableConfigurationProperties; import org.springframework.boot.strap.context.embedded.properties.ServerProperties;
import org.springframework.boot.strap.context.properties.EnableConfigurationProperties;
import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware; import org.springframework.context.ApplicationContextAware;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
@ -44,7 +44,7 @@ public class ServerPropertiesAutoConfiguration implements ApplicationContextAwar
private ApplicationContext applicationContext; private ApplicationContext applicationContext;
@Bean(name = "org.springframework.bootstrap.context.embedded.properties.ServerProperties") @Bean(name = "org.springframework.boot.strap.context.embedded.properties.ServerProperties")
@ConditionalOnMissingBean @ConditionalOnMissingBean
public ServerProperties serverProperties() { public ServerProperties serverProperties() {
return new ServerProperties(); return new ServerProperties();

12
spring-autoconfigure/src/main/java/org/springframework/autoconfigure/web/WebMvcAutoConfiguration.java → spring-boot-config/src/main/java/org/springframework/boot/config/web/WebMvcAutoConfiguration.java
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.autoconfigure.web; package org.springframework.boot.config.web;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
@ -22,14 +22,14 @@ import java.util.Collections;
import javax.servlet.Servlet; import javax.servlet.Servlet;
import org.springframework.autoconfigure.AutoConfigureAfter;
import org.springframework.autoconfigure.EnableAutoConfiguration;
import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.ListableBeanFactory; import org.springframework.beans.factory.ListableBeanFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.bootstrap.context.condition.ConditionalOnBean; import org.springframework.boot.config.AutoConfigureAfter;
import org.springframework.bootstrap.context.condition.ConditionalOnClass; import org.springframework.boot.config.EnableAutoConfiguration;
import org.springframework.bootstrap.context.condition.ConditionalOnMissingBean; import org.springframework.boot.strap.context.condition.ConditionalOnBean;
import org.springframework.boot.strap.context.condition.ConditionalOnClass;
import org.springframework.boot.strap.context.condition.ConditionalOnMissingBean;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.core.Ordered; import org.springframework.core.Ordered;

15
spring-boot-config/src/main/resources/META-INF/spring.factories Normal file
View File

@ -0,0 +1,15 @@
# Auto Configure
org.springframework.boot.config.EnableAutoConfiguration=\
org.springframework.boot.config.MessageSourceAutoConfiguration,\
org.springframework.boot.config.PropertyPlaceholderAutoConfiguration,\
org.springframework.boot.config.batch.BatchAutoConfiguration,\
org.springframework.boot.config.data.JpaRepositoriesAutoConfiguration,\
org.springframework.boot.config.jdbc.DataSourceAutoConfiguration,\
org.springframework.boot.config.jdbc.DataSourceTransactionManagerAutoConfiguration,\
org.springframework.boot.config.orm.jpa.HibernateJpaAutoConfiguration,\
org.springframework.boot.config.reactor.ReactorAutoConfiguration,\
org.springframework.boot.config.thymeleaf.ThymeleafAutoConfiguration,\
org.springframework.boot.config.web.EmbeddedServletContainerAutoConfiguration,\
org.springframework.boot.config.web.ServerPropertiesAutoConfiguration,\
org.springframework.boot.config.web.MultipartAutoConfiguration,\
org.springframework.boot.config.web.WebMvcAutoConfiguration

Some files were not shown because too many files have changed in this diff Show More