--- build.sh	(revision 372827)
+++ build.sh	(working copy)
@@ -24,18 +24,25 @@ 
 else
   S=':'
 fi
+
+# ----- Cocoon libs
+COCOON_HOME="../cocoon-2.1.x"
+COCOON_HOME_PROP="cocoon.src.dir"
+[ -f build.properties ] && grep -q ${COCOON_HOME_PROP} build.properties && COCOON_HOME="`grep ${COCOON_HOME_PROP}= build.properties | grep -v '#' | sed -e 's/${COCOON_HOME_PROP}=//'`"
+[ -f local.build.properties ] && grep -q ${COCOON_HOME_PROP} local.build.properties && COCOON_HOME="`grep ${COCOON_HOME_PROP}= local.build.properties | grep -v '#' | sed -e 's/${COCOON_HOME_PROP}=//'`"
+COCOON_ENDORESED_DIR="${COCOON_HOME}/lib/endorsed"
                                                                                                                                                              
 # ----- Ignore system CLASSPATH variable
 OLD_CLASSPATH="$CLASSPATH"
 unset CLASSPATH
-CLASSPATH="`echo lib/*.jar | tr ' ' $S`"
+CLASSPATH="`echo lib/*.jar | tr ' ' $S`:`echo ${COCOON_ENDORESED_DIR}*.jar | tr ' ' $S`"
 export CLASSPATH
 
 # ----- Use Ant shipped with Lenya. Ignore installed in the system Ant
 OLD_ANT_HOME="$ANT_HOME"
 ANT_HOME=tools
 OLD_ANT_OPTS="$ANT_OPTS"
-ANT_OPTS="-Xms32M -Xmx512M -Djava.endorsed.dirs=lib/endorsed"
+ANT_OPTS="-Xms32M -Xmx512M -Djava.endorsed.dirs=${COCOON_ENDORESED_DIR}"
 export ANT_HOME ANT_OPTS
 
 "$ANT_HOME/bin/ant" -logger org.apache.tools.ant.NoBannerLogger -emacs  $@