Login | Register
My pages Projects Community openCollabNet

Discussions > cvs > CVS update: joist/conf 30joist.servlets Makefile Makefile.config

Project highlights: Architectural Overview

joist
Discussion topic

Hide all messages in topic

All messages in topic

CVS update: joist/conf 30joist.servlets Makefile Makefile.config

Author edk
Full name Ed Korthof
Date 2001-04-18 20:09:02 PDT
Message User: edk Date: 01/04/18 20:09:02 Modified: conf 30joist.servlets Makefile Makefile.config Log: avoid automatically installing servlets file, for cases in which joist servlets are not actually appropriate. Revision Changes Path 1.5 +3 -0 joist/conf/30joist.servlets Index: 30joist.servlets =================================================================== RCS file: /cvs/joist/conf/30joist.servlets,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- 30joist.servlets 2001/04/19 01:03:25 1.4 +++ 30joist.servlets 2001/04/19 03:09:02 1.5 @@ -1,3 +1,6 @@ +# This file is not installed by default. If you want it, include it +# in your JServ servlets file by hand, or run make install-servlets +# if you're using the sandbox structure. servlet.UserAdminMaint.code=org.joist.account.UserAdminMaint servlet.org.joist.account.UserAdminMaint.initArgs=propertiesFile=org/joist/account/UserAdminMaint.properties servlet.UserAdminMaint.initArgs=propertiesFile=org/joist/account/UserAdminMaint.properties 1.12 +9 -5 joist/conf/Makefile Index: Makefile =================================================================== RCS file: /cvs/joist/conf/Makefile,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- Makefile 2001/03/29 22:15:13 1.11 +++ Makefile 2001/04/19 03:09:02 1.12 @@ -20,8 +20,14 @@ fi; \ cp -f $${f}* $(PROPERTIES_CONF_DIR); \ done + @echo 'Installation of project configuration files complete'; \ + unset registry f ; \ + true + +install-servlets: + @echo 'Installing servlets configuration files to sandbox' @if [ ! -d $(SERVLETS_CONF_DIR) ] ; then \ - mkdir -p $(SERVLETS_CONF_DIR) ; \ + mkdir -p $(SERVLETS_CONF_DIR) ; \ fi @for f in "$(SERVLETS_CONF_FILES)"; do \ echo " servlets conf file : $${f}"; \ @@ -33,10 +39,8 @@ mv $(SERVLETS_CONF_DIR)/$${f} $(SERVLETS_CONF_DIR)/$${f}.orig; \ fi; \ cp -f $${f}* $(SERVLETS_CONF_DIR); \ - done; \ - echo 'Installation of project configuration files complete'; \ - unset registry f ; \ - true + done; + include-trace: @file=$(FILE); \ 1.8 +3 -1 joist/conf/Makefile.config Index: Makefile.config =================================================================== RCS file: /cvs/joist/conf/Makefile.config,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- Makefile.config 2000/08/28 18:03:32 1.7 +++ Makefile.config 2001/04/19 03:09:02 1.8 @@ -7,8 +7,10 @@ # The path to the configuration directory. PROPERTIES_CONF_DIR=$(SANDBOX)/conf/zone.properties.d -SERVLETS_CONF_DIR=$(SANDBOX)/conf/servlets.d # The configuration files to copy to the sandbox configuration directory. PROPERTIES_CONF_FILES=30joist.zone.properties + +# the servlets files are not longer installed automatically +SERVLETS_CONF_DIR=$(SANDBOX)/conf/servlets.d SERVLETS_CONF_FILES=30joist.servlets
Messages per page: