From 1d02f153578319718bbf5a43c2a319b4e446389e Mon Sep 17 00:00:00 2001 From: soochoi Date: Tue, 21 Nov 2006 04:20:15 +0000 Subject: [PATCH] CASA-auth-token: apply changes from german autobuild diff --- CASA-auth-token/server-java/Jaas/make_test.sh | 2 +- CASA-auth-token/server-java/Jaas/run_test.sh | 2 +- .../server-java/package/linux/CASA_auth_token_svc.spec.in | 3 ++- CASA-auth-token/server/AuthTokenValidate/Svc/linux/Makefile.am | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CASA-auth-token/server-java/Jaas/make_test.sh b/CASA-auth-token/server-java/Jaas/make_test.sh index f04aef0a..5992bc78 100755 --- a/CASA-auth-token/server-java/Jaas/make_test.sh +++ b/CASA-auth-token/server-java/Jaas/make_test.sh @@ -1,5 +1,5 @@ #!/bin/bash -JAVA_HOME=/usr/lib/jvm/java-1.5.0-ibm +JAVA_HOME=/usr/lib/jvm/java-1.5.0 if [ ! -d build-test ]; then mkdir build-test mkdir build-test/classes diff --git a/CASA-auth-token/server-java/Jaas/run_test.sh b/CASA-auth-token/server-java/Jaas/run_test.sh index 669f5210..104c79e6 100755 --- a/CASA-auth-token/server-java/Jaas/run_test.sh +++ b/CASA-auth-token/server-java/Jaas/run_test.sh @@ -1,4 +1,4 @@ echo "*** Starting the test application ***" -JAVA_HOME=/usr/lib/jvm/java-1.5.0-ibm +JAVA_HOME=/usr/lib/jvm/java-1.5.0 $JAVA_HOME/bin/java -classpath build-test/classes:/usr/share/java/CASA/authtoken/CasaJaasSupport.jar:/usr/share/java/CASA/authtoken/CasaAuthToken.jar:/usr/share/java/CASA/authtoken/external/axis-ant.jar:/usr/share/java/CASA/authtoken/external/axis.jar:/usr/share/java/CASA/authtoken/external/commons-discovery-0.2.jar:/usr/share/java/CASA/authtoken/external/commons-logging-1.0.4.jar:/usr/share/java/CASA/authtoken/external/commons-logging-api.jar:/usr/share/java/CASA/authtoken/external/jaxrpc.jar:/usr/share/java/CASA/authtoken/external/log4j-1.2.8.jar:/usr/share/java/CASA/authtoken/external/saaj.jar:/usr/share/java/CASA/authtoken/external/wsdl4j-1.5.1.jar:/usr/share/java/CASA/authtoken/external/wss4j-1.5.0.jar:/usr/share/java/CASA/authtoken/external/xalan.jar:/usr/share/java/CASA/authtoken/external/xercesImpl.jar:/usr/share/java/CASA/authtoken/external/xml-apis.jar:/usr/share/java/CASA/authtoken/external/xmlsec-1.2.1.jar:/usr/share/java/xerces-j2.jar:/etc/CASA/authtoken/keys/client -Dorg.xml.sax.driver=org.apache.xerces.parsers.SAXParser -Djava.security.auth.login.config=src/com/novell/casa/jaas/sample/SampleApp.conf -Xrunjdwp:transport=dt_socket,address=5005,server=y,suspend=n com.novell.casa.jaas.sample.SampleApp diff --git a/CASA-auth-token/server-java/package/linux/CASA_auth_token_svc.spec.in b/CASA-auth-token/server-java/package/linux/CASA_auth_token_svc.spec.in index d3a2331b..47acb684 100644 --- a/CASA-auth-token/server-java/package/linux/CASA_auth_token_svc.spec.in +++ b/CASA-auth-token/server-java/package/linux/CASA_auth_token_svc.spec.in @@ -17,7 +17,8 @@ Name: @PACKAGE@ URL: http://www.novell.com/products -BuildRequires: libstdc++ gcc-c++ glib2-devel libstdc++-devel pkgconfig java-sdk-1.5.0 xerces-j2 update-alternatives mono-devel servletapi5 identity-abstraction sysvinit insserv +BuildRequires: gcc-c++ glib2-devel identity-abstraction insserv libstdc++ libstdc++-devel mono-devel pkgconfig servletapi5 sysvinit +BuildRequires: java-sdk-1.5.0 update-alternatives %define prefix /usr License: LGPL Group: Applications/System diff --git a/CASA-auth-token/server/AuthTokenValidate/Svc/linux/Makefile.am b/CASA-auth-token/server/AuthTokenValidate/Svc/linux/Makefile.am index 4d75aa02..807c42f4 100644 --- a/CASA-auth-token/server/AuthTokenValidate/Svc/linux/Makefile.am +++ b/CASA-auth-token/server/AuthTokenValidate/Svc/linux/Makefile.am @@ -66,7 +66,7 @@ CFLAGS += -Wno-format-extra-args -fno-strict-aliasing $(INCLUDES) $(DEFINES) CPPFLAGS += -Wno-format-extra-args -fno-strict-aliasing -fPIC $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS) if IBM_JVM -LIBS += -lpthread -lcasa_s_ipc -ljvm -ljsig -lj9thr23 +LIBS += -lpthread -lcasa_s_ipc -ljvm -ljsig -lj9thr23 -ldl LDFLAGS += -L$(LIBDIR)/$(TARGET_CFG) -L$(IBM_JAVA_LIBDIR) -L$(IBM_JAVA_LIBDIR)/classic else LIBS += -lpthread -lcasa_s_ipc -ljvm -ljsig