From d9644eb705b6b396699d124f1218758b9e54ae45 Mon Sep 17 00:00:00 2001 From: Juan Carlos Luciani Date: Thu, 3 Aug 2006 15:27:33 +0000 Subject: [PATCH] Changes to be compatible with new identity-abstraction package. --- .../java/package/linux/CASA_auth_token_svc.spec.in | 2 +- CASA-auth-token/java/server/Svc/Makefile.am | 11 ++++------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/CASA-auth-token/java/package/linux/CASA_auth_token_svc.spec.in b/CASA-auth-token/java/package/linux/CASA_auth_token_svc.spec.in index 16d1c95e..9b1fa437 100644 --- a/CASA-auth-token/java/package/linux/CASA_auth_token_svc.spec.in +++ b/CASA-auth-token/java/package/linux/CASA_auth_token_svc.spec.in @@ -17,7 +17,7 @@ Name: @PACKAGE@ URL: http://www.novell.com/products -BuildRequires: libstdc++ libgcc gcc-c++ glib2-devel libstdc++-devel pkgconfig java-1_5_0-ibm-devel update-alternatives mono-devel servletapi5 identity-abstraction +BuildRequires: libstdc++ gcc-c++ glib2-devel libstdc++-devel pkgconfig java-1_5_0-ibm-devel update-alternatives mono-devel servletapi5 identity-abstraction %define prefix /usr License: LGPL Group: Applications/System diff --git a/CASA-auth-token/java/server/Svc/Makefile.am b/CASA-auth-token/java/server/Svc/Makefile.am index 57fd41d1..3e1b345a 100644 --- a/CASA-auth-token/java/server/Svc/Makefile.am +++ b/CASA-auth-token/java/server/Svc/Makefile.am @@ -33,10 +33,7 @@ ROOT = ../.. LIBDIR = $(ROOT)/$(LIB) -#IDENT_ABSTRACTION_DIR = /usr/share/java/identity-abstraction -#IDENT_ABSTRACTION_DEPENDANCIES_DIR = /usr/share/java/identity-abstraction/dependancies -IDENT_ABSTRACTION_DIR = /usr/share/java/identity-abstraction-0.1.145 -IDENT_ABSTRACTION_DEPENDANCIES_DIR = /usr/share/java/identity-abstraction-0.1.145 +IDENT_ABSTRACTION_DIR = /usr/share/java/identity-abstraction JAVAROOT = . JAVAC= javac @@ -81,8 +78,7 @@ AUTHTOKEN_FILES = -C $(BUILDDIR)/webapp/WEB-INF/classes com CLASSES = $(addprefix $(BUILDDIR)/, $(JAVAFILES:%.java=%.class)) LIBS = /usr/share/java/servletapi5.jar -#CLASSPATH = $(IDENT_ABSTRACTION_DIR)/identity-abstraction.jar:$(LIBS) -CLASSPATH = $(IDENT_ABSTRACTION_DIR)/identity-abstraction-0.1.145.jar:$(LIBS) +CLASSPATH = $(IDENT_ABSTRACTION_DIR)/identity-abstraction.jar:$(LIBS) CUR_DIR := $(shell pwd) @@ -101,7 +97,8 @@ $(BUILDDIR)/$(WEBAPP): $(BUILDDIR) $(CLASSES) cp src/com/novell/casa/authtoksvc/Krb5_mechanism.settings $(BUILDDIR)/webapp/WEB-INF/conf/installed_auth_mechanisms/Krb5Authenticate/mechanism.settings cp src/com/novell/casa/authtoksvc/Pwd_mechanism.settings $(BUILDDIR)/webapp/WEB-INF/conf/installed_auth_mechanisms/PwdAuthenticate/mechanism.settings cp $(IDENT_ABSTRACTION_DIR)/*.jar $(BUILDDIR)/webapp/WEB-INF/lib/ - cp $(IDENT_ABSTRACTION_DEPENDANCIES_DIR)/*.jar $(BUILDDIR)/webapp/WEB-INF/lib/ + rm $(BUILDDIR)/webapp/WEB-INF/lib/identity-abstraction.jar + ls $(BUILDDIR)/webapp/WEB-INF/lib/ jar cvf $(BUILDDIR)/$(WEBAPP) -C $(BUILDDIR)/webapp . cp $(BUILDDIR)/$(WEBAPP) $(LIBDIR)/java/