Login | Register
My pages Projects Community openCollabNet

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

Project highlights: Architectural Overview

joist
Discussion topic

Back to topic list

CVS update: joist/conf 30joist.servlets.in 30joist.zone.properties.in Makefile Makefile.config servlets.joist.in zone.properties.joist.in

Author ed
Full name Ed Korthof
Date 2000-08-28 11:03:32 PDT
Message User: ed Date: 00/08/28 11:03:32 Modified: conf Makefile Makefile.config Added: conf 30joist.servlets.in 30joist.zone.properties.in Removed: conf servlets.joist.in zone.properties.joist.in Log: switch to using servlets.d and zone.properties.d ; move servlets.joist.in to 30joist.servlets.in and zone.properties.joist.in to 30joist.zone.properties.in Revision Changes Path 1.5 +16 -15 joist/conf/Makefile Index: Makefile =================================================================== RCS file: /cvs/joist/conf/Makefile,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- Makefile 2000/07/04 04:58:28 1.4 +++ Makefile 2000/08/28 18:03:32 1.5 @@ -4,28 +4,29 @@ include Makefile.config +default: build + +# only install the conf files on make install +build: + install: @echo 'Installing project configuration files to sandbox'; \ - for f in $(CONF_FILES); do \ + for f in $(PROPERTIES_CONF_FILES); do \ echo " $${f}"; \ - if [ -f $(CONF_DIR)/$${f} ]; then \ - mv $(CONF_DIR)/$${f} $(CONF_DIR)/$${f}.orig; \ + if [ -f $(PROPERTIES_CONF_DIR)/$${f} ]; then \ + mv $(PROPERTIES_CONF_DIR)/$${f} $(PROPERTIES_CONF_DIR)/$${f}.orig; \ fi; \ - cp -f $${f} $(CONF_DIR); \ - registry=`echo $${f} | perl -pw -e 's/(.+)\.$(PROJECT)/$$1/'`; \ - registry=$(CONF_DIR)/registry.$${registry}; \ - if [ -r "$${registry}" ]; then \ - if [ ! "`grep -v '^#' $${registry} | grep $${f}`" ]; then \ - if [ "`make include-trace FILE=$$f | grep httpd`" ]; then \ - echo "Include conf/$${f}" >> $${registry}; \ - else \ - echo "include=$(CONF_DIR)/$${f}" >> $${registry}; \ - fi; \ - fi; \ + cp -f $${f}* $(PROPERTIES_CONF_DIR); \ + done; \ + for f in $(SERVLETS_CONF_FILES); do \ + echo " $${f}"; \ + if [ -f $(SERVLETS_CONF_DIR)/$${f} ]; then \ + 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 + unset f ; true include-trace: @file=$(FILE); \ 1.7 +4 -2 joist/conf/Makefile.config Index: Makefile.config =================================================================== RCS file: /cvs/joist/conf/Makefile.config,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- Makefile.config 2000/08/12 20:45:57 1.6 +++ Makefile.config 2000/08/28 18:03:32 1.7 @@ -6,7 +6,9 @@ PROJECT=joist # The path to the configuration directory. -CONF_DIR=$(SANDBOX)/conf +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. -CONF_FILES=servlets.joist zone.properties.joist +PROPERTIES_CONF_FILES=30joist.zone.properties +SERVLETS_CONF_FILES=30joist.servlets 1.1 joist/conf/30joist.servlets.in Index: 30joist.servlets.in =================================================================== servlet.UserAdminMaint.code=org.joist.account.UserAdminMaint servlet.org.joist.account.UserAdminMaint.initArgs=propertiesFile=__SANDBOX__/site/java/org/joist/account/UserAdminMaint.properties servlet.UserAdminMaint.initArgs=propertiesFile=__SANDBOX__/site/java/org/joist/account/UserAdminMaint.properties servlet.UserMaintenance.code=org.joist.account.UserMaintenance servlet.org.joist.account.UserMaintenance.initArgs=propertiesFile=__SANDBOX__/site/java/org/joist/account/UserMaintenance.properties servlet.UserMaintenance.initArgs=propertiesFile=__SANDBOX__/site/java/org/joist/account/UserMaintenance.properties servlet.UserRegistration.code=org.joist.account.UserRegistration servlet.org.joist.account.UserRegistration.initArgs=propertiesFile=__SANDBOX__/site/java/org/joist/account/UserRegistration.properties servlet.UserRegistration.initArgs=propertiesFile=__SANDBOX__/site/java/org/joist/account/UserRegistration.properties servlet.UserSelection.code=org.joist.account.UserSelection servlet.org.joist.account.UserSelection.initArgs=propertiesFile=__SANDBOX__/site/java/org/joist/account/UserSelection.properties servlet.UserSelection.initArgs=propertiesFile=__SANDBOX__/site/java/org/joist/account/UserSelection.properties servlet.ActiveSessions.code=org.joist.admin.ActiveSessions servlet.org.joist.admin.ActiveSessions.initArgs=propertiesFile=__SANDBOX__/site/java/org/joist/admin/ActiveSessions.properties servlet.ActiveSessions.initArgs=propertiesFile=__SANDBOX__/site/java/org/joist/admin/ActiveSessions.properties servlet.Broadcast.code=org.joist.admin.Broadcast servlet.org.joist.admin.Broadcast.initArgs=propertiesFile=__SANDBOX__/site/java/org/joist/admin/Broadcast.properties servlet.Broadcast.initArgs=propertiesFile=__SANDBOX__/site/java/org/joist/admin/Broadcast.properties servlet.OneHit.code=org.joist.admin.OneHit servlet.org.joist.admin.OneHit.initArgs=propertiesFile=__SANDBOX__/site/java/org/joist/admin/OneHit.properties servlet.OneHit.initArgs=propertiesFile=__SANDBOX__/site/java/org/joist/admin/OneHit.properties servlet.SiteStatus.code=org.joist.admin.SiteStatus servlet.org.joist.admin.SiteStatus.initArgs=propertiesFile=__SANDBOX__/site/java/org/joist/admin/SiteStatus.properties servlet.SiteStatus.initArgs=propertiesFile=__SANDBOX__/site/java/org/joist/admin/SiteStatus.properties servlet.TimingProfile.code=org.joist.admin.TimingProfile servlet.org.joist.admin.TimingProfile.initArgs=propertiesFile=__SANDBOX__/site/java/org/joist/admin/TimingProfile.properties servlet.TimingProfile.initArgs=propertiesFile=__SANDBOX__/site/java/org/joist/admin/TimingProfile.properties servlet.Help.code=org.joist.help.Help servlet.org.joist.help.Help.initArgs=propertiesFile=__SANDBOX__/site/java/org/joist/help/Help.properties servlet.Help.initArgs=propertiesFile=__SANDBOX__/site/java/org/joist/help/Help.properties servlet.View.code=org.joist.publish.View servlet.org.joist.publish.View.initArgs=propertiesFile=__SANDBOX__/site/java/org/joist/publish/View.properties servlet.View.initArgs=propertiesFile=__SANDBOX__/site/java/org/joist/publish/View.properties servlet.Wrap.code=org.joist.publish.Wrap servlet.org.joist.publish.Wrap.initArgs=propertiesFile=__SANDBOX__/site/java/org/joist/publish/Wrap.properties servlet.Wrap.initArgs=propertiesFile=__SANDBOX__/site/java/org/joist/publish/Wrap.properties servlet.Noodle.code=org.joist.publish.Noodle servlet.org.joist.publish.Noodle.initArgs=propertiesFile=__SANDBOX__/site/java/org/joist/publish/Noodle.properties servlet.Noodle.initArgs=propertiesFile=__SANDBOX__/site/java/org/joist/publish/Noodle.properties servlet.ErrorPage.code=org.joist.security.ErrorPage servlet.org.joist.security.ErrorPage.initArgs=propertiesFile=__SANDBOX__/site/java/org/joist/security/ErrorPage.properties servlet.ErrorPage.initArgs=propertiesFile=__SANDBOX__/site/java/org/joist/security/ErrorPage.properties servlet.Login.code=org.joist.security.Login servlet.org.joist.security.Login.initArgs=propertiesFile=__SANDBOX__/site/java/org/joist/security/Login.properties servlet.Login.initArgs=propertiesFile=__SANDBOX__/site/java/org/joist/security/Login.properties servlet.Logout.code=org.joist.security.Logout servlet.org.joist.security.Logout.initArgs=propertiesFile=__SANDBOX__/site/java/org/joist/security/Logout.properties servlet.Logout.initArgs=propertiesFile=__SANDBOX__/site/java/org/joist/security/Logout.properties servlet.PermissionSelection.code=org.joist.security.PermissionSelection servlet.org.joist.security.PermissionSelection.initArgs=propertiesFile=__SANDBOX__/site/java/org/joist/security/PermissionSelection.properties servlet.PermissionSelection.initArgs=propertiesFile=__SANDBOX__/site/java/org/joist/security/PermissionSelection.properties servlet.RolePermissionMaintenance.code=org.joist.security.RolePermissionMaintenance servlet.org.joist.security.RolePermissionMaintenance.initArgs=propertiesFile=__SANDBOX__/site/java/org/joist/security/RolePermissionMaintenance.properties servlet.RolePermissionMaintenance.initArgs=propertiesFile=__SANDBOX__/site/java/org/joist/security/RolePermissionMaintenance.properties servlet.UnauthorizedAccess.code=org.joist.security.UnauthorizedAccess servlet.org.joist.security.UnauthorizedAccess.initArgs=propertiesFile=__SANDBOX__/site/java/org/joist/security/UnauthorizedAccess.properties servlet.UnauthorizedAccess.initArgs=propertiesFile=__SANDBOX__/site/java/org/joist/security/UnauthorizedAccess.properties 1.1 joist/conf/30joist.zone.properties.in Index: 30joist.zone.properties.in =================================================================== # # Site-wide properties for joist # servlets.default.initArgs=MAIL_USER=__MAIL_ACCOUNT__ servlets.default.initArgs=MAIL_HOST=__MAIL_HOST__ servlets.default.initArgs=MAIL_LIST=__MAIL_LIST__

« Previous message in topic | 1 of 1 | Next message in topic »

Messages

Show all messages in topic

CVS update: joist/conf 30joist.servlets.in 30joist.zone.properties.in Makefile Makefile.config servlets.joist.in zone.properties.joist.in ed Ed Korthof 2000-08-28 11:03:32 PDT
Messages per page: