Add tomcat starter and tweak spring CLI

This commit is contained in:
Dave Syer 2013-06-12 04:37:14 +01:00
parent 20cce0c69c
commit b761fa8ede
4 changed files with 56 additions and 17 deletions

View File

@ -62,22 +62,15 @@ TARGETDIR=target/classes
if [ -f build.gradle ]; then
TARGETDIR=build/classes/main
fi
if [ -f ${TARGETDIR} ]; then
if [ "${CLASSPATH}" == "" ]; then
CLASSPATH="${TARGETDIR}"
else
CLASSPATH="${CLASSPATH}":"${TARGETDIR}"
for f in "${TARGETDIR}" "${SPRING_HOME}"/classes "${SPRING_BIN}" "${SPRING_HOME}"/*.jar "${SPRING_HOME}"/lib/*.jar; do
if [ -f $f -o -d $f ]; then
if [ "${CLASSPATH}" == "" ]; then
CLASSPATH="${f}"
else
CLASSPATH="${CLASSPATH}":"${f}"
fi
fi
fi
if [ "${CLASSPATH}" == "" ]; then
CLASSPATH="${SPRING_BIN}"
else
CLASSPATH="${CLASSPATH}":"${SPRING_BIN}"
fi
for f in "${SPRING_HOME}"/classes "${SPRING_HOME}"/*.jar "${SPRING_HOME}"/lib/*.jar; do
[ -f $f ] && CLASSPATH="${CLASSPATH}":$f
done
if $cygwin; then

View File

@ -1,4 +1,5 @@
@Grab("org.springframework.bootstrap:spring-bootstrap-service:0.0.1-SNAPSHOT")
@Grab("org.springframework.bootstrap:spring-bootstrap-web-application:0.0.1-SNAPSHOT")
@Grab("org.springframework.bootstrap:spring-bootstrap-actuator:0.5.0.BUILD-SNAPSHOT")
@Grab("org.springframework.bootstrap:spring-bootstrap-web-starter:0.5.0.BUILD-SNAPSHOT")
@ComponentScan("org.springframework.bootstrap.sample.service")
class Start {
}

View File

@ -20,6 +20,7 @@
<module>spring-bootstrap-batch-starter</module>
<module>spring-bootstrap-integration-starter</module>
<module>spring-bootstrap-jpa-starter</module>
<module>spring-bootstrap-tomcat-starter</module>
<module>spring-bootstrap-web-starter</module>
</modules>
<dependencyManagement>
@ -49,6 +50,11 @@
<artifactId>spring-bootstrap-web-starter</artifactId>
<version>${spring.bootstrap.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.bootstrap</groupId>
<artifactId>spring-bootstrap-tomcat-starter</artifactId>
<version>${spring.bootstrap.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.bootstrap</groupId>
<artifactId>spring-bootstrap-jpa-starter</artifactId>

View File

@ -0,0 +1,39 @@
<?xml version="1.0" encoding="UTF-8"?>
<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">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.springframework.bootstrap</groupId>
<artifactId>spring-bootstrap-starters</artifactId>
<version>0.5.0.BUILD-SNAPSHOT</version>
</parent>
<artifactId>spring-bootstrap-tomcat-starter</artifactId>
<dependencies>
<dependency>
<groupId>org.springframework.bootstrap</groupId>
<artifactId>spring-bootstrap-starter</artifactId>
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-logging-juli</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
</dependency>
</dependencies>
</project>