geos_one/CASA
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Removed hard dependency on IBM's JVM.

Browse Source
This commit is contained in:
Juan Carlos Luciani
2006-11-18 07:10:14 +00:00
parent ff0b8df96b
commit 0332b6610e
7 changed files with 65 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
CASA-auth-token/server/AuthTokenValidate/Svc/linux/CasaAuthtokenValidateD
View File

@@ -90,7 +90,16 @@ StartDAEMON()
# Start the daemon
echo -n "Starting casa_atvd..."
$START_DAEMON_CMD $START_DAEMON_CMD_FLAG $DAEMON_USER $DAEMON -d
if [ "${JVM_VER}" = "SUN" ]; then
# We need to specify the single-threaded option :-( due to Sun's
# JVM bug (Bug 221420). This will be changed once the issue is
# resolved.
echo "Starting daemon using single threaded mode :-("
$START_DAEMON_CMD $START_DAEMON_CMD_FLAG $DAEMON_USER $DAEMON -d -s
else
$START_DAEMON_CMD $START_DAEMON_CMD_FLAG $DAEMON_USER $DAEMON -d
fi
RVAL=$?
$ECHO
}

18
CASA-auth-token/server/AuthTokenValidate/Svc/linux/Makefile.am
View File

@@ -40,8 +40,10 @@ ROOT = ../../..
LIBDIR = $(ROOT)/$(LIB)
BINDIR = $(ROOT)/$(BIN)
JAVA_LIBDIR = /usr/lib/jvm/java-1.5.0-ibm/jre/bin
JAVA_INCDIR = /usr/lib/jvm/java-1.5.0-ibm/include
IBM_JAVA_LIBDIR = /usr/lib/jvm/jre-1.5.0/bin
SUN_JAVA_LIBDIR = /usr/lib/jvm/jre-1.5.0/lib/$(HOSTTYPE)/server
JAVA_INCDIR = /usr/lib/jvm/java-1.5.0/include
# handle Mono secondary dependencies
export MONO_PATH := $(MONO_PATH)
@@ -53,7 +55,7 @@ CFILES =
CPPFILES = server.cpp
CSFILES_CSC :=
INCLUDES = -I. -I$(ROOT)/include -I$(JAVA_INCDIR)
INCLUDES = -I. -I$(ROOT)/include -I$(JAVA_INCDIR) -I$(JAVA_INCDIR)/linux
RESOURCES =
if LIB64
@@ -62,8 +64,14 @@ endif
CFLAGS += -Wno-format-extra-args -fno-strict-aliasing $(INCLUDES) $(DEFINES)
CPPFLAGS += -Wno-format-extra-args -fno-strict-aliasing -fPIC $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
LIBS = -lpthread -lcasa_s_ipc -ljvm -ljsig -lj9thr23
LDFLAGS = -L$(LIBDIR)/$(TARGET_CFG) -L$(JAVA_LIBDIR) -L$(JAVA_LIBDIR)/classic
if IBM_JVM
LIBS += -lpthread -lcasa_s_ipc -ljvm -ljsig -lj9thr23
LDFLAGS += -L$(LIBDIR)/$(TARGET_CFG) -L$(IBM_JAVA_LIBDIR) -L$(IBM_JAVA_LIBDIR)/classic
else
LIBS += -lpthread -lcasa_s_ipc -ljvm -ljsig
LDFLAGS += -L$(LIBDIR)/$(TARGET_CFG) -L$(SUN_JAVA_LIBDIR)
endif
OBJDIR = ./$(TARGET_CFG)/$(LIB)
OBJS = $(addprefix $(OBJDIR)/, $(CFILES:%.c=%.o)) $(addprefix $(OBJDIR)/, $(CPPFILES:%.cpp=%.o))

11
CASA-auth-token/server/AuthTokenValidate/Svc/linux/envvars
View File

@@ -30,6 +30,15 @@
# /var/novell/xtier folder. #
# #
############################################################
LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}":/usr/lib/jvm/java-1.5.0-ibm/jre/bin:/usr/lib/jvm/java-1.5.0-ibm/jre/bin/classic
TEST_IBM_JVM=$(/usr/lib/jvm/jre-1.5.0/bin/java -version 2>&1 | grep -i ibm)
if [ -z "${TEST_IBM_JVM}" ]; then
# Assume Sun JVM
JVM_VER=SUN
LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}":/usr/lib/jvm/jre-1.5.0/lib/$HOSTTYPE/server
else
JVM_VER=IBM
LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}":/usr/lib/jvm/jre-1.5.0/bin:/usr/lib/jvm/jre-1.5.0/bin/classic
fi
export JVM_VER
export LD_LIBRARY_PATH