Removed the identity-abstraction files from the CasaAuthTokenSvc war
file to allow for the files to be deployed and updated separatedly.
This commit is contained in:
		| @@ -94,6 +94,10 @@ $(BUILDDIR)/%.class: %.java | ||||
| 	@echo [======== Compiling $@ ========] | ||||
| 	$(JAVAC) -g -sourcepath src -classpath $(CLASSPATH) -d $(BUILDDIR)/webapp/WEB-INF/classes $< | ||||
|  | ||||
| # The following two lines may need to be added below before we jar-up the war for builds where there is no identity-abstraction install | ||||
| #	cp $(IDENT_ABSTRACTION_DIR)/*.jar $(BUILDDIR)/webapp/WEB-INF/lib/ | ||||
| #	rm $(BUILDDIR)/webapp/WEB-INF/lib/identity-abstraction.jar | ||||
|  | ||||
| $(BUILDDIR)/$(WEBAPP): $(BUILDDIR) $(CLASSES) | ||||
| 	@echo [======== Creating Webapp $@ ========] | ||||
| 	cp web.xml $(BUILDDIR)/webapp/WEB-INF/web.xml | ||||
| @@ -103,8 +107,6 @@ $(BUILDDIR)/$(WEBAPP): $(BUILDDIR) $(CLASSES) | ||||
| 	cp linux/crypto.properties $(BUILDDIR)/webapp/WEB-INF/classes/crypto.properties | ||||
| 	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/ | ||||
| 	rm $(BUILDDIR)/webapp/WEB-INF/lib/identity-abstraction.jar | ||||
| 	cp $(AXIS_JARS_DIR)/*.jar $(BUILDDIR)/webapp/WEB-INF/lib/ | ||||
| 	ls $(BUILDDIR)/webapp/WEB-INF/lib/ | ||||
| 	jar cvf $(BUILDDIR)/$(WEBAPP) -C $(BUILDDIR)/webapp . | ||||
|   | ||||
| @@ -54,4 +54,4 @@ server.loader=${catalina.home}/server/classes,${catalina.home}/server/lib/*.jar | ||||
| #     "foo/*.jar": Add all the JARs of the specified folder as class  | ||||
| #                  repositories | ||||
| #     "foo/bar.jar": Add bar.jar as a class repository  | ||||
| shared.loader=${catalina.base}/shared/classes,${catalina.base}/shared/lib/*.jar | ||||
| shared.loader=${catalina.base}/shared/classes,${catalina.base}/shared/lib/*.jar,/usr/share/java/identity-abstraction/*.jar | ||||
|   | ||||
		Reference in New Issue
	
	Block a user