--- tools/bin/schemagen.sh 2011-03-26 20:08:27.000000000 +0100 +++ tools/bin/schemagen.sh-gil 2011-09-03 04:50:41.776546091 +0200 @@ -42,66 +42,18 @@ # # Make sure that JAXB_HOME and JAVA_HOME are set # -if [ -z "$JAXB_HOME" ] -then - # search the installation directory - - PRG=$0 - progname=`basename $0` - saveddir=`pwd` - - cd `dirname $PRG` - - while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '.*/.*' > /dev/null; then - PRG="$link" - else - PRG="`dirname $PRG`/$link" - fi - done - - JAXB_HOME=`dirname "$PRG"`/.. - - # make it fully qualified - cd "$saveddir" - JAXB_HOME=`cd "$JAXB_HOME" && pwd` - - cd $saveddir -fi if [ -n "$CLASSPATH" ] ; then LOCALCLASSPATH="$CLASSPATH" fi # add the api jar file -if [ -z "$LOCALCLASSPATH" ] ; then - LOCALCLASSPATH="$JAXB_HOME"/lib/jaxb-api.jar:"$JAXB_HOME"/lib/jaxb-xjc.jar -else - LOCALCLASSPATH="$JAXB_HOME"/lib/jaxb-api.jar:"$JAXB_HOME"/lib/jaxb-xjc.jar:"$LOCALCLASSPATH" -fi +LOCALCLASSPATH=/usr/share/java/jaxb-api.jar:/usr/share/java/jaxb-xjc.jar:"$LOCALCLASSPATH" -if [ -n "$JAVA_HOME" ] -then - JAVA="$JAVA_HOME"/bin/java - LOCALCLASSPATH="$JAVA_HOME"/lib/tools.jar:"$LOCALCLASSPATH" -else - JAVA=java - JAVACMD=`which $JAVA` - BINDIR=`dirname $JAVACMD` - LOCALCLASSPATH="$BINDIR"/../lib/tools.jar:"$LOCALCLASSPATH" -fi -[ `expr \`uname\` : 'CYGWIN'` -eq 6 ] && -{ - LOCALCLASSPATH=`cygpath -w -p ${LOCALCLASSPATH}` -} - -if [ `expr \`uname\` : 'CYGWIN'` -eq 6 ] -then - JAXB_HOME="`cygpath -w "$JAXB_HOME"`" -fi +JAVA_HOME=@LIB_DIR@/jvm/java +JAVA=@LIB_DIR@/jvm/java/bin/java +LOCALCLASSPATH=@LIB_DIR@/jvm/java/lib/tools.jar:"$LOCALCLASSPATH" exec "$JAVA" $SCHEMAGEN_OPTS -cp "$LOCALCLASSPATH" com.sun.tools.jxc.SchemaGeneratorFacade "$@"