Make sure ThymeleafAutoConfiguration works if imported directly

Before this change if Layout dialect not available then the nested class is
loaded and barfs because it depended on the layout dialect (in a
@ConditionalOnClass annotation).
This commit is contained in:
Dave Syer
2013-05-31 16:16:19 +01:00
parent f12b3fbcd7
commit 969c7d6fa1
6 changed files with 73 additions and 3 deletions

View File

@@ -62,9 +62,19 @@ TARGETDIR=target/classes
if [ -f build.gradle ]; then
TARGETDIR=build/classes/main
fi
mkdir -p "${TARGETDIR%/}"
if [ -f ${TARGETDIR} ]; then
if [ "${CLASSPATH}" == "" ]; then
CLASSPATH="${TARGETDIR}"
else
CLASSPATH="${CLASSPATH}":"${TARGETDIR}"
fi
fi
CLASSPATH="${CLASSPATH}":"${SPRING_BIN}":"${TARGETDIR}"
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