Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[bs-19] Medley of changes supporting integration apps

Browse Source 
* Use file adapters in sample instead of internal flow
* Add Exception to signature of CommandLineRunner for
implementation convenience
* Updates for Security snapshots
This commit is contained in:
Dave Syer
2013-04-29 08:35:01 +01:00
parent 10c333ea10
commit 628a8c79aa
21 changed files with 206 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/CleanCommand.java
View File

@@ -40,6 +40,10 @@ public class CleanCommand extends OptionParsingCommand {
private OptionSpec<Void> allOption;
private OptionSpec<Void> ivyOption;
private OptionSpec<Void> mvnOption;
public CleanCommand() {
super("clean",
"Clean up groovy grapes (useful if snapshots are needed and you need an update)");
@@ -54,13 +58,24 @@ public class CleanCommand extends OptionParsingCommand {
protected OptionParser createOptionParser() {
OptionParser parser = new OptionParser();
this.allOption = parser.accepts("all", "Clean all files (not just snapshots)");
this.ivyOption = parser.accepts("ivy",
"Clean just ivy (grapes) cache. Default is on unless --maven is used.");
this.mvnOption = parser.accepts("maven",
"Clean just maven cache. Default is off.");
return parser;
}
@Override
protected void run(OptionSet options) throws Exception {
clean(options, getGrapesHome(options), Layout.IVY);
clean(options, getMavenHome(options), Layout.MAVEN);
if (!options.has(this.ivyOption)) {
clean(options, getGrapesHome(options), Layout.IVY);
}
if (options.has(this.mvnOption)) {
if (options.has(this.ivyOption)) {
clean(options, getGrapesHome(options), Layout.IVY);
}
clean(options, getMavenHome(options), Layout.MAVEN);
}
}
private void clean(OptionSet options, File root, Layout layout) {

2
spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/compiler/autoconfigure/SpringBootstrapCompilerAutoConfiguration.java
View File

@@ -60,7 +60,7 @@ public class SpringBootstrapCompilerAutoConfiguration extends CompilerAutoConfig
@Override
public void applyImports(ImportCustomizer imports) {
imports.addImports("javax.sql.DataSource", "javax.annotation.PostConstruct",
"javax.annotation.PreDestroy",
"javax.annotation.PreDestroy", "groovy.util.logging.Log",
"org.springframework.stereotype.Controller",
"org.springframework.stereotype.Service",
"org.springframework.stereotype.Component",

1
spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/compiler/autoconfigure/SpringIntegrationCompilerAutoConfiguration.java
View File

@@ -58,6 +58,7 @@ public class SpringIntegrationCompilerAutoConfiguration extends CompilerAutoConf
@Override
public void applyImports(ImportCustomizer imports) {
imports.addImports("org.springframework.integration.Message",
"org.springframework.integration.support.MessageBuilder",
"org.springframework.integration.MessageChannel",
"org.springframework.integration.MessageHeaders",
"org.springframework.integration.annotation.MessageEndpoint",

2
spring-bootstrap-cli/src/main/scripts/spring
View File

@@ -57,7 +57,7 @@ if [ -f build.gradle ]; then
fi
mkdir -p "${TARGETDIR%/}"
CLASSPATH="${SPRING_BIN}":"${TARGETDIR}"
CLASSPATH="${CLASSPATH}":"${SPRING_BIN}":"${TARGETDIR}"
for f in "${SPRING_HOME}"/lib/*.jar; do
CLASSPATH="${CLASSPATH}":$f

2
spring-bootstrap-cli/src/test/resources/log4j.properties
View File

@@ -5,3 +5,5 @@ log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
log4j.appender.stdout.layout.ConversionPattern=%d %p [%c] - <%m>%n
log4j.category.org.springframework.bootstrap=DEBUG
#log4j.category.org.springframework.integration.dsl=DEBUG
#log4j.category.org.springframework.amqp=DEBUG