Hi,
since I'm using zsh under Linux instead of bash, I'm encountering the same
problem after every update of the .sh-Files that they refuse to run
properly. Therefore I changed them to fit zsh as well as bash or ksh, as
far is I can see from here.
But before I commit I'd like you to test them in your shell (as far as you
using not Windows, of course;-) and post the results. It would be a
painful if it'd be wrong in the repository.
If there's no response I'll check it in in the next couple of days.
3 items have been changed:
1. I replaced many if's like following:
$ cvs diff config/mico.sh
Index: config/mico.sh
===================================================================
RCS file: /opt/cvsroot/xmlBlaster/config/mico.sh,v
retrieving revision 1.8
diff -r1.8 mico.sh
1d0
<
3c2
< if [ ${CORBACPP_HOME:=""} = "" ] || [ ! -d ${CORBACPP_HOME} ] ; then
---
> if [ "${CORBACPP_HOME:=''}" = "" ] || [ ! -d ${CORBACPP_HOME} ] ; then
16c15
< if [ ${CORBACPP_VER:=""} = "" ] ; then
---
> if [ "${CORBACPP_VER:=''}" = "" ] ; then
Changes have been made in .bashrc as well as in config/mico.sh and
config/jacorb.sh.
2. I replaced source by the dot(.)-command.
3. Which has been put in a Variable, since it's aliased to somwhere
sometimes.
regards
Heinrich
--
http://www.xmlBlaster.org
Attachment:
mico.sh
Description: mico.sh
Attachment:
jacorb.sh
Description: jacorb.sh
#-----------------------------------------------------------
# The xmlBlaster.org project
#
# You may use this script to source into your sh, ksh, bash
#
# Example (copy this into your .profile or .bashrc):
# export JAVA_HOME=/opt/local/jdk
# export XMLBLASTER_HOME=${HOME}/xmlBlaster
#
# These are optional:
# export JacORB_HOME=/opt/local/JacORB
# export CORBACPP_HOME=/opt/local/mico
# export JIKES_HOME=/opt/local/jikes
# export USE_ANT=true
#
# . ${XMLBLASTER_HOME}/.bashrc
#
# If you want to use Ant to build xmlBlaster set USE_ANT to true
#
# If you want to access xmlBlaster using cvs, un comment following line:
# export CVSROOT=:pserver:reader at server.xmlBlaster.org:/opt/cvsroot
#
# Tested on Linux, HPUX and Solaris with sh, ksh and bash.
# Thanks to Heinrich Goetzger
#-----------------------------------------------------------
BLACK_LTGREEN="\033[40;46m"
BLACK_RED="\033[30;41m"
BLACK_YELLOW="\033[40;43m"
ESC="\033[0m"
OS="`uname -s`"
#if [ `basename ${SHELL}` = "bash" ]; then
# ECHO="echo -e"
#else
# ECHO="echo"
#fi
if test "`echo -e xxx`" = "xxx"
then
ECHO="echo -e"
else
ECHO=echo
fi
WHICH="/usr/bin/which"
if [ "${CLASSPATH:=''}" = "" ] ; then
CLASSPATH=
export CLASSPATH
fi
#-------- Checking xmlBlaster --------
if [ "${XMLBLASTER_HOME:=''}" = "" ] ; then
${ECHO} "$BLACK_RED Please set the environment variable XMLBLASTER_HOME $ESC"
${ECHO} "$BLACK_RED Example: 'export XMLBLASTER_HOME=`pwd`' $ESC"
return
fi
if [ ! -d ${XMLBLASTER_HOME} ] ; then
${ECHO} "$BLACK_RED The directory XMLBLASTER_HOME=$XMLBLASTER_HOME doesn't exist $ESC"
fi
export XMLBLASTER_HOME
JUTILS_HOME=${XMLBLASTER_HOME}
export JUTILS_HOME
if [ -d ${XMLBLASTER_HOME} ]; then
# OK, know we know where xmlBlaster is installed ...
${ECHO} "${BLACK_LTGREEN}Welcome to xmlBlaster.org ${ESC}"
${ECHO} "${BLACK_LTGREEN} XMLBLASTER_HOME=${XMLBLASTER_HOME} ${ESC}"
#a2Blaster - authentication and authorisation service
CLASSPATH=${XMLBLASTER_HOME}/lib/a2Blaster.jar:${CLASSPATH}
#jdbc
#CLASSPATH=${XMLBLASTER_HOME}/lib/jdbc7.0-1.2.jar:${CLASSPATH}
#CLASSPATH=/home/a2blaster/a2Blaster/lib/a2Blaster.jar:${CLASSPATH}
#CLASSPATH=${XMLBLASTER_HOME}/lib/xerces.jar:${CLASSPATH}
# jutils.jar is now included in xmlBlaster.jar
#if [ -f ${XMLBLASTER_HOME}/lib/jutils.jar ]; then
CLASSPATH=${XMLBLASTER_HOME}/lib/jutils.jar:${CLASSPATH}
#fi
CLASSPATH=${XMLBLASTER_HOME}/lib/xtdash.jar:${CLASSPATH}
CLASSPATH=${XMLBLASTER_HOME}/lib/omquery.jar:${CLASSPATH}
CLASSPATH=${XMLBLASTER_HOME}/lib/test.jar:${CLASSPATH}
CLASSPATH=${XMLBLASTER_HOME}/lib/servlet.jar:${CLASSPATH}
CLASSPATH=${XMLBLASTER_HOME}/lib/gnu-regexp-1.0.8.jar:${CLASSPATH}
CLASSPATH=${XMLBLASTER_HOME}/lib/xmlrpc.jar:${CLASSPATH}
#CLASSPATH=${XMLBLASTER_HOME}/lib/cpptasks.jar:${CLASSPATH}
# Mail support
CLASSPATH=${XMLBLASTER_HOME}/lib/mail.jar:${CLASSPATH}
CLASSPATH=${XMLBLASTER_HOME}/lib/activation.jar:${CLASSPATH}
# EJB connector (J2EE) support:
CLASSPATH=${XMLBLASTER_HOME}/lib/connector.jar:${CLASSPATH}
CLASSPATH=${XMLBLASTER_HOME}/lib/jaas.jar:${CLASSPATH}
CLASSPATH=${XMLBLASTER_HOME}/lib/jta-spec1_0_1.jar:${CLASSPATH}
CLASSPATH=${XMLBLASTER_HOME}/lib/jms.jar:${CLASSPATH}
CLASSPATH=${XMLBLASTER_HOME}/lib/ejb2.0.jar:${CLASSPATH}
# JNDI, only needed for JDK 1.2, not for JDK 1.3
CLASSPATH=${CLASSPATH}:${XMLBLASTER_HOME}/lib/jndi-jdk1_3_1.jar
CLASSPATH=${XMLBLASTER_HOME}/lib/parser.jar:${CLASSPATH}
CLASSPATH=${XMLBLASTER_HOME}/lib/jaxp.jar:${CLASSPATH}
if [ "${USE_ANT:=''}" = "true" ] ; then
${ECHO} "$BLACK_LTGREEN Using Ant to build xmlBlaster $ESC"
CLASSPATH=${XMLBLASTER_HOME}/lib/xmlBlaster.jar:${CLASSPATH}
CLASSPATH=${XMLBLASTER_HOME}/lib/demo.jar:${CLASSPATH}
CLASSPATH=${XMLBLASTER_HOME}/lib/testsuite.jar:${CLASSPATH}
else
if [ -f ${XMLBLASTER_HOME}/lib/xmlBlaster.jar ]; then
CLASSPATH=${XMLBLASTER_HOME}/lib/xmlBlaster.jar:${CLASSPATH}
fi
fi
if [ -d ${XMLBLASTER_HOME}/src/java ]; then
CLASSPATH=${XMLBLASTER_HOME}/src/java:${CLASSPATH}
fi
if [ -d ${XMLBLASTER_HOME}/classes ]; then
CLASSPATH=${XMLBLASTER_HOME}/classes:${CLASSPATH}
fi
if [ -d ${XMLBLASTER_HOME}/demo ]; then
CLASSPATH=${XMLBLASTER_HOME}/demo:${CLASSPATH}
fi
export CLASSPATH
PATH=$PATH:$XMLBLASTER_HOME/bin:$XMLBLASTER_HOME/testsuite/bin
export PATH
alias cdj='cd $JUTILS_HOME/src/java/org/jutils'
alias cdx='cd $XMLBLASTER_HOME'
alias cdxs='cd $XMLBLASTER_HOME/src'
alias cdxi='cd $XMLBLASTER_HOME/src/idl'
alias cdxj='cd $XMLBLASTER_HOME/src/java/org/xmlBlaster'
alias cdxu='cd $XMLBLASTER_HOME/src/java/org/jutils'
alias cdxd='cd $XMLBLASTER_HOME/demo'
alias cdxdj='cd $XMLBLASTER_HOME/demo/javaclients'
alias cdxt='cd $XMLBLASTER_HOME/testsuite'
alias cdxr='cd $XMLBLASTER_HOME/doc/requirements'
alias cdxtj='cd $XMLBLASTER_HOME/testsuite/org/xmlBlaster'
if [ ! -f ${HOME}/xmlBlaster.properties ]; then
cp ${XMLBLASTER_HOME}/config/xmlBlaster.properties.template ${HOME}/xmlBlaster.properties
${ECHO} "$BLACK_RED Please edit and customize ${HOME}/xmlBlaster.properties $ESC"
fi
else
${ECHO} "$BLACK_RED Sorry, xmlBlaster.org not loaded, set your environment manually $ESC"
return 1
fi
#-------- Checking JDK version -
if [ "${JAVA_HOME:=''}" = "" ] ; then
# xmlBlaster release < 0.78 used JDK_HOME, try this variable:
JAVA_HOME=$JDK_HOME
export JAVA_HOME
fi
if [ "${JAVA_HOME:=''}" != "" ] ; then
if [ -d ${JAVA_HOME} ] ; then
if [ -f ${JAVA_HOME}/lib/classes.zip ]; then
# JDK 1.1.x
JDK_1_1=true
export JDK_1_1
CLASSPATH=${XMLBLASTER_HOME}/lib/collections.jar:${CLASSPATH}
#else
## JDK 1.2
#ORB_PROPS=${JAVA_HOME}/jre/lib/orb.properties
#if [ ! -f ${ORB_PROPS} ]; then
# cp ${XMLBLASTER_HOME}/config/orb.properties ${ORB_PROPS}
# RESULT=$?
# if [ ${RESULT} = "0" ]; then
# ${ECHO} "$BLACK_YELLOW Created ${ORB_PROPS} to switch off default JDK-ORB$ESC"
# else
# ${ECHO} "$BLACK_RED Could not copy ${XMLBLASTER_HOME}/config/orb.properties to ${ORB_PROPS} (to switch off default JDK-ORB). Missing permissions?$ESC"
# fi
#fi
## If copy failed (missing permissions?)
## if [ $? -ne 0 ] ; then
#if [ ! -f ${ORB_PROPS} ]; then
# CLASSPATH=${JAVA_HOME}/jre/lib/rt.jar:${CLASSPATH}
# export CLASSPATH
#fi
fi
PATH=${JAVA_HOME}/bin:${PATH}
export PATH
else
${ECHO} "$BLACK_RED The directory JAVA_HOME=$JAVA_HOME doesn't exist $ESC"
fi
else
${ECHO} "$BLACK_RED NOTE: You need JDK 1.2 or 1.3 to compile xmlBlaster $ESC"
${ECHO} "$BLACK_RED and your CLASSPATH setting needs at least $ESC"
${ECHO} "$BLACK_RED export CLASSPATH=\${JAVA_HOME}/jre/lib/rt.jar $ESC"
${ECHO} "$BLACK_RED Or set JAVA_HOME, and we will do the rest for you $ESC"
${ECHO} "$BLACK_RED Example: 'export JAVA_HOME=/opt/local/jdk' $ESC"
return 1
fi
# !!! This needs to be rewritten in an getopt-style and much better commented H.Gö 30.12.01
# !!! Why don't we add jacorb.sh and orbacus.sh and mico.sh as procedures to this shell? It would be less complicated IMHO
if [ ${#} -eq 0 ]; then # at least one Argument is given
if [ "${CORBA_CPP:=''}" != "orbacus" ]; then
. ${XMLBLASTER_HOME}/config/jacorb.sh
else
. ${XMLBLASTER_HOME}/config/orbacus.sh
fi
else # at least one Argument is given
ORB=${1} # Orb is first Argument
if [ "${ORB}" = "orbacus" ]; then
. ${XMLBLASTER_HOME}/config/orbacus.sh
${ECHO} "$BLACK_LTGREEN corba for java: orbacus $ESC"
${ECHO} "$BLACK_LTGREEN corba for c++ : orbacus $ESC"
else
# ${ECHO} "$BLACK_RED The ${1} is an unknown corba $ESC"
. ${XMLBLASTER_HOME}/config/jacorb.sh
${ECHO} "$BLACK_LTGREEN corba for java: jacorb $ESC"
. ${XMLBLASTER_HOME}/config/mico.sh
${ECHO} "$BLACK_LTGREEN corba for c++ : mico $ESC"
fi
fi # end of if [ ${#} -eq 0 ]
# tinySQL, a simple DBase JDBC driver.
# Conflicts with JacORBs idl.jar because both use java_cup
# (tinySQL has modified parser.java)
#CLASSPATH=${XMLBLASTER_HOME}/lib/tinySQL.jar:${CLASSPATH}
# stuff fot the c++ classes
if [ "${USE_CPP:=''}" = '' ] ; then
${ECHO} "$BLACK_LTGREEN C++ classes not activated. To activate set USE_CPP=true$ESC"
export USE_CPP=false
else
if [ "${USE_CPP:=''}" = "true" ] ; then
${ECHO} "$BLACK_LTGREEN USE_CPP =true C++ classes activated $ESC"
else
${ECHO} "$BLACK_LTGREEN USE_CPP is not set to true. C++ not activated $ESC"
export USE_CPP=false
fi
fi
if [ "${USE_CPP:=''}" = "true" ] ; then
CPP_ERROR=false
export PATH=${PATH}:${XMLBLASTER_HOME}/testsuite/c++/bin
#check if xerces is installed and version of xerces is set
if [ "${XMLCPP_VER:=''}" = "" ] ; then
${ECHO} "$BLACK_YELLOW XMLCPP_VER is not set. I will set it to 1_6_0 $ESC"
export XMLCPP_VER="1_6_0"
CPP_ERROR=true
else
${ECHO} "$BLACK_LTGREEN Xerces version set to ${XMLCPP_VER} $ESC"
export LD_LIBRARY_PATH=$XMLCPP_HOME/lib:$LD_LIBRARY_PATH
fi
if [ "${XMLCPP_HOME:=''}" = "" ] ; then
if [ -d /opt/local/xerces-c-src${XMLCPP_VER} ] ; then
export XMLCPP_HOME=/opt/local/xerces-c-src${XMLCPP_VER}
${ECHO} "${BLACK_YELLOW} XMLCPP_HOME =${XMLCPP_HOME}${ESC}"
CPP_ERROR=true
else
${ECHO} "${BLACK_YELLOW} Set XMLCPP_HOME to the directory where the c++ XML is installed $ESC"
fi
else
if [ ! -d ${XMLCPP_HOME} ] ; then
${ECHO} "$BLACK_RED XMLCPP_HOME: ${XMLCPP_HOME} is not a valid directory $ESC"
else
${ECHO} "$BLACK_LTGREEN XMLCPP_HOME set to ${XMLCPP_HOME} $ESC"
fi
fi
#check if the correct corba is installed
if [ "${CORBA_CPP:=''}" = "" ] ; then
export CORBA_CPP=mico
${ECHO} "$BLACK_YELLOW CORBA_CPP is not set. I will set it to ${CORBA_CPP} ('orbacus' is valid as well) $ESC"
CPP_ERROR=true
fi
if [ "${CORBACPP_VER:=''}" = "" ] ; then
export CORBACPP_VER="2.3.6"
${ECHO} "$BLACK_YELLOW CORBACPP_VER is not set. I will set it to ${CORBACPP_VER} $ESC"
CPP_ERROR=true
fi
#home directory of the corba implementation
if [ "${CORBACPP_HOME:=''}" = "" ] ; then
if [ -d /opt/local/mico ] ; then
export CORBACPP_HOME=/opt/local/mico
${ECHO} "$BLACK_YELLOW CORBACPP_HOME is not set. I will set it to ${CORBACPP_HOME}. $ESC"
else
${ECHO} "$BLACK_RED CORBACPP_HOME is not set. Please set it to the directory where corba is installed. $ESC"
CPP_ERROR=true
fi
fi
if [ ! -d ${CORBACPP_HOME} ] ; then
${ECHO} "$BLACK_RED CORBACPP_HOME: ${CORBACPP_HOME} is not a valid directory. $ESC"
CPP_ERROR=true
fi
if [ "${CPP_ERROR:=''}" = "true" ] ; then
${ECHO} "${BLACK_LTGREEN} Please read the file ${XMLBLASTER_HOME}/src/c++/README"
fi
if [ ${CORBA_CPP:=""} = "mico" ] ; then
. ${XMLBLASTER_HOME}/config/mico.sh
fi
fi
# end of stuff for the c++ classes
#-------- Checking jikes version -
# use jikes 1.06 or better
if [ "${JIKES_HOME:=''}" != "" ] ; then
if [ -d ${JIKES_HOME} ] ; then
PATH=${PATH}:${JIKES_HOME}
export PATH
if [ "${JDK_1_1:=''}" != "" ] ; then
JIKESPATH=${CLASSPATH}
export JIKESPATH
else
JIKESPATH=${CLASSPATH}:${JAVA_HOME}/jre/lib/rt.jar
export JIKESPATH
fi
${ECHO} "$BLACK_LTGREEN JIKES_HOME =${JIKES_HOME} $ESC"
${ECHO} "$BLACK_LTGREEN Enhance \$JIKESPATH if you enhance your CLASSPATH$ESC"
else
${ECHO} "$BLACK_RED The directory JIKES_HOME=$JIKES_HOME doesn't exist $ESC"
fi
fi
#-------- Running with TowerJ native compiler -
# See xmlBlaster/bin/Project.tj
# Replace xtdash.jar and jacorb.jar with the original ones.
# Invoke:
# cd $XMLBLASTER_HOME/bin
# tj -b-jdk 2 -verbose -project $XMLBLASTER_HOME/bin/Project.tj
# Run testsuite, invoke again
# tj -b-jdk 2 -verbose -project $XMLBLASTER_HOME/bin/Project.tj
# until Main-xy.tjp shows no Java classes anymore.
# Other 'final' options (increase 4%):
# tj -b-jdk 2 -nofeedback -mode optimize -O-omit-checks
# tj -b-jdk 2 -nofeedback -b-disable-tjlib -mode optimize -O-omit-checks
# ( -O-inline-threshold 100 fails to compile)
# tj -b-jdk 2 -O-closed
TOWERJ=/opt/TowerJ
export TOWERJ
if [ "${TOWERJ:=''}" != "" ] ; then
if [ -d ${TOWERJ} ] ; then
TOWERJ_JAVA_HOME=${JAVA_HOME}
export TOWERJ_JAVA_HOME
PATH=${PATH}:${TOWERJ}/bin/x86-linux
export PATH
LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${TOWERJ}/lib/x86-linux
export LD_LIBRARY_PATH
#TOWERJ_TJLIB_PATH= ???
#export TOWERJ_TJLIB_PATH
${ECHO} "$BLACK_LTGREEN Using TOWERJ=${TOWERJ} $ESC"
fi
fi
return 0