More ordering issues in service apps

* The TraceAutoConfiguration in the service project
was loading too early because it contains a BPP
* It also had a Spring Security dependency without any
@Conditional* configuration
* Fixed by nesting the BPP in a class with @Conditional*
This commit is contained in:
Dave Syer
2013-04-30 17:36:55 +01:00
parent 0a58e560b3
commit ec0e9b17ad
7 changed files with 173 additions and 23 deletions

View File

@@ -1,4 +1,4 @@
#!/bin/bash -x
#!/bin/bash
# OS specific support (must be 'true' or 'false').
cygwin=false;
@@ -48,8 +48,14 @@ fi
if [ "$SPRING_HOME" == "" ]; then
SPRING_HOME=`cd "$(dirname $0)"/.. && pwd`
else
if [ ! -d "${SPRING_HOME}" ]; then
echo "Not a directory: SPRING_HOME=${SPRING_HOME}"
echo "Please rectify and restart."
exit 2
fi
SPRING_HOME=`cd "${SPRING_HOME}" && pwd`
fi
SPRING_HOME=`cd "${SPRING_HOME}" && pwd`
SPRING_BIN=$(dirname $0)
TARGETDIR=target/classes
@@ -60,15 +66,7 @@ mkdir -p "${TARGETDIR%/}"
CLASSPATH="${CLASSPATH}":"${SPRING_BIN}":"${TARGETDIR}"
if [ ! "${SPRING_BIN}" == "${SPRING_HOME}" ]; then
CLASSPATH="${CLASSPATH}":"${SPRING_HOME}"/classes
fi
for f in "${SPRING_HOME}"/lib/*.jar; do
[ -f $f ] && CLASSPATH="${CLASSPATH}":$f
done
for f in "${SPRING_HOME}"/*.jar; do
for f in "${SPRING_HOME}"/*.jar "${SPRING_HOME}"/lib/*.jar "${SPRING_HOME}"/classes; do
[ -f $f ] && CLASSPATH="${CLASSPATH}":$f
done